Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (86f9f35ab35f8215b973823018133b3d06671409)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (86f9f35ab35f8215b973823018133b3d06671409)
  • Date: Tue, 8 Jan 2013 17:13:05 -0600

GIT changes to devel-xorg-modular grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

dev/null |binary
e-17/e17/BUILD | 1
e-17/e17/CONFIGURE | 2
e-17/e17/DEPENDS | 58
+++++--
e-17/e17/DETAILS | 14 +
e-17/e17/HISTORY | 14 +
e-17/e17/INSTALL | 6
e-17/e17/PREPARE | 2
e-17/e17/PRE_BUILD | 19 +-
e-17/e17/enlightenment-0.17.0.tar.bz2.sig |binary
e-17/e_dbus/CONFIGURE | 4
e-17/e_dbus/DEPENDS | 7
e-17/e_dbus/DETAILS | 4
e-17/e_dbus/HISTORY | 11 +
e-17/e_dbus/e_dbus-1.0.1.tar.gz.sig | 0
e-17/e_dbus/e_dbus-1.7.5.tar.bz2.sig |binary
e-17/ecore/CONFIGURE | 20 +-
e-17/ecore/CONFLICTS | 1
e-17/ecore/DEPENDS | 76
++++++----
e-17/ecore/DETAILS | 18 --
e-17/ecore/HISTORY | 18 ++
e-17/ecore/PREPARE | 2
e-17/ecore/PRE_BUILD | 12 -
e-17/ecore/PRE_SUB_DEPENDS | 6
e-17/ecore/REPAIR^none^PRE_SUB_DEPENDS | 6
e-17/ecore/SUB_DEPENDS | 6
e-17/ecore/ecore-1.0.1.tar.gz.sig | 0
e-17/ecore/ecore-1.7.5.tar.bz2.sig |binary
e-17/edje/CONFLICTS | 4
e-17/edje/DEPENDS | 27 +++
e-17/edje/DETAILS | 4
e-17/edje/HISTORY | 15 +
e-17/edje/edje-1.0.1.tar.gz.sig | 0
e-17/edje/edje-1.7.5.tar.bz2.sig |binary
e-17/eet/DEPENDS | 4
e-17/eet/DETAILS | 16 --
e-17/eet/HISTORY | 5
e-17/eet/PREPARE | 2
e-17/eet/PRE_BUILD | 12 -
e-17/eet/eet-1.4.1.tar.bz2.sig | 0
e-17/eet/eet-1.7.5.tar.bz2.sig |binary
e-17/eeze/DEPENDS | 12 -
e-17/eeze/DETAILS | 17 --
e-17/eeze/HISTORY | 9 +
e-17/eeze/PREPARE | 6
e-17/eeze/PRE_BUILD | 5
e-17/eeze/eeze-1.0.2.tar.gz.sig | 0
e-17/eeze/eeze-1.7.5.tar.bz2.sig |binary
e-17/efreet/DEPENDS | 17 +-
e-17/efreet/DETAILS | 20 --
e-17/efreet/HISTORY | 10 +
e-17/efreet/PREPARE | 6
e-17/efreet/PRE_BUILD | 10 -
e-17/efreet/efreet-1.0.1.tar.gz.sig | 0
e-17/efreet/efreet-1.7.5.tar.bz2.sig |binary
e-17/eina/DETAILS | 4
e-17/eina/HISTORY | 3
e-17/eina/eina-1.7.4.tar.gz.sig | 0
e-17/eina/eina-1.7.5.tar.bz2.sig |binary
e-17/eio/CONFIGURE | 2
e-17/eio/CONFLICTS | 1
e-17/eio/DEPENDS | 10 +
e-17/eio/DETAILS | 15 -
e-17/eio/HISTORY | 10 +
e-17/eio/PREPARE | 2
e-17/eio/PRE_BUILD | 4
e-17/eio/eio-1.7.5.tar.bz2.sig |binary
e-17/elementary/DEPENDS | 8 -
e-17/elementary/DETAILS | 14 +
e-17/elementary/HISTORY | 8 +
e-17/elementary/PREPARE | 9 -
e-17/elementary/PRE_BUILD | 7
e-17/elementary/elementary-1.7.5.tar.bz2.sig |binary
e-17/embryo/DEPENDS | 7
e-17/embryo/DETAILS | 21 --
e-17/embryo/HISTORY | 6
e-17/embryo/PREPARE | 2
e-17/embryo/PRE_BUILD | 11 -
e-17/embryo/embryo-1.7.5.tar.bz2.sig |binary
e-17/emotion/DEPENDS | 9 -
e-17/emotion/DETAILS | 9 -
e-17/emotion/HISTORY | 8 +
e-17/emotion/emotion-1.7.5.tar.bz2.sig |binary
e-17/ethumb/DEPENDS | 21 ++
e-17/ethumb/DETAILS | 14 +
e-17/ethumb/HISTORY | 9 +
e-17/ethumb/PREPARE | 9 -
e-17/ethumb/PRE_BUILD | 7
e-17/ethumb/ethumb-1.7.5.tar.bz2.sig |binary
e-17/evas/BUILD | 14 +
e-17/evas/CONFIGURE | 21 +-
e-17/evas/DEPENDS | 31 +---
e-17/evas/DETAILS | 18 --
e-17/evas/HISTORY | 13 +
e-17/evas/PREPARE | 2
e-17/evas/PRE_BUILD | 11 -
e-17/evas/evas-1.0.1.tar.gz.sig | 0
e-17/evas/evas-1.7.5.tar.bz2.sig |binary
e-17/evas_generic_loaders/DEPENDS | 4
e-17/evas_generic_loaders/DETAILS | 14 +
e-17/evas_generic_loaders/HISTORY | 7
e-17/evas_generic_loaders/PREPARE | 2
e-17/evas_generic_loaders/PRE_BUILD | 6
e-17/evas_generic_loaders/evas_generic_loaders-1.7.5.tar.bz2.sig |binary
e-17/expedite/DEPENDS | 7
e-17/expedite/DETAILS | 14 +
e-17/expedite/HISTORY | 7
e-17/expedite/PREPARE | 9 -
e-17/expedite/PRE_BUILD | 6
e-17/expedite/expedite-1.7.5.tar.bz2.sig |binary
e-17/exquisite/DEPENDS | 11 -
e-17/exquisite/DETAILS | 14 +
e-17/exquisite/HISTORY | 4
e-17/exquisite/PREPARE | 9 -
e-17/exquisite/PRE_BUILD | 6
e-17/exquisite/exquisite-1.0.0.tar.bz2.sig |binary
e-17/terminology/DEPENDS | 10 +
e-17/terminology/DETAILS | 14 +
e-17/terminology/HISTORY | 6
e-17/terminology/PREPARE | 2
e-17/terminology/PRE_BUILD | 6
e-17/terminology/terminology-0.2.0.tar.bz2.sig |binary
122 files changed, 613 insertions(+), 393 deletions(-)

New commits:
commit c122c06c1648dfc0aad2f4768383f6835a9f53e4
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

elementary: Updated stable branch to 1.7.5

commit 22280b53e883d289484bcbfa3fb1220bf0a6a2b9
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ethumb: Updated stable branch to 1.7.5

commit 6facf18b7971b9563f018dab328753c80c36ab03
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

emotion: Updated stable branch to 1.7.5

commit d77d7737b34a8197573225044f15c1eab7674be8
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

eio: Updated stable branch to 1.7.5

commit 568009442abf265df0c0b2eb60c943679aa33493
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

evas_generic_loaders: Updated stable branch to 1.7.5

commit 1135f6a974d4bdda82cc637740490192e22d8053
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

expedite: Updated stable branch to 1.7.5

commit cfa8267333e32293f575aa1b59aab86506350f5c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

eeze: Updated stable branch to 1.7.5

commit d702512c88b827fcbd8c47c4d60cbef9d5441415
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

e_dbus: Updated stable branch to 1.7.5

commit 7c9c170ed29452608db3bb45dd20365051fabd52
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

efreet: Updated stable branch to 1.7.5

commit ae1719707bcc4d4169fef79e61379ffa6b51f4a7
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

edje: Updated stable branch to 1.7.5

commit 0f5c85a40bb2729c075ffa4140010163942b79fc
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

embryo: Updated stable branch to 1.7.5

commit 78e280be3ccff431ca9b9702a726d2423d2eb15d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ecore: Updated stable branch to 1.7.5

commit bd3d32efff037661624edd3cc78194f0f50b0d36
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

evas: Updated stable branch to 1.7.5

commit e7b06718e33c9751f05fb2463c3c899f0843036b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

eina: Updated stable branch to 1.7.5

commit d616a963c7c9bd32620a862e6832e6bcd86d374b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

eet: Updated stable branch to 1.7.5

commit 9bd7b14b6697278e042884e775a10514b3a3b0ab
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

terminology: Add stable branch 0.2.0
Only SCM branch depends on efl
SCM branch depends on subversion
Stable branch depends on edje, eet, efreet, and eina

commit a3875128d0702bb7ea7c4c96560c3d115277cd42
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ecore: Add all evas flags for evas optional dependency to SUB_DEPENDS

commit 9a84379b45a728f934f25428d0d4061819e6a152
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

evas: X11 and XCB are mutually exclusive

commit 064fe1a615f9c5de1ccd0545bd497103813e09be
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

e17: Depends on ecore built with evas support

commit 901fe2cad16d4968ab56b136a4bc5084cf77d7a0
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ecore: Add all evas flags for evas optional dependency

commit 228da32457ca010049ba49bbc900ac2f5d9226ea
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

evas: eet is required, not optional

commit 3babf5eeff37c8bdfa873209a67c0cf408775702
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

evas: --disable-images-loader-eet -> --disable-image-loader-eet

commit 0c4ecb5f12747fea6e97526606ca1002e9965c81
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

evas_generic_loaders: Added stable 1.7.4 branch
SCM version depends on subversion

commit 1867571c6f3610e5a5b1501e77bd9eb4fb19dc8f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ethumb: Cleanup formatting

commit e1cf587d0c24138d042cafea4381d81756c37406
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ethumb: Add stable 1.7.4 branch
Only SCM branch depends on efl and subversion
e_dbus for stable and edbus for SCM
Optionally depends on doxygen

commit 955f5ce20cb2c45fb43f9559dbd567ccf3fc3db6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

edje: Depends on eet and eina

commit 5b441d5161a27df95a334647c1d43b612ae88aa0
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

exquisite: Add stable 1.0.0 branch
Only SCM branch depends on efl and subversion

commit cb28b03367a3068e896d115798eeb73f973aa29f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

expedite: Add stable 1.7.4 branch
Only SCM branch depends on subversion

commit 454a636c777a7916f1cc07f5bebc19f5be688d28
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

elementary: EDJE_BRANCH -> ELEMENTARY_BRANCH

commit 05ffefaaac1838bcaa301e067ff5f13d93a28ffd
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

evas: Switch SOURCE from .gz -> .bz2

commit 33099b75a82e01238504d6899860d3063d4f4ec7
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

embryo: Switch SOURCE from .gz -> .bz2

commit 665d7370c2140f654657fc2686e74cfc40f256af
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

eina: Switch SOURCE from .gz -> .bz2

commit 41ce5f265a0a03dde102721cb5806737206a19f8
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

efreet: Switch SOURCE from .gz -> .bz2

commit a886e85f8536554679dba8ce9cab69a040c7c833
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

eeze: Switch SOURCE from .gz -> .bz2

commit 2e42b0952b19bc9314a3cc6137ed56be8552b9dc
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

edje: Switch SOURCE from .gz -> .bz2

commit 19d4f427f26139daa2355b27be8facd97435d1a6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ecore: Switch SOURCE from .gz -> .bz2

commit 19a598a08fa9878c32d259880cb4ddb2da35a2a1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

e_dbus: Switch SOURCE from .gz -> .bz2

commit 16c378a4a533797f6d692fae18b0bb22a8ac66c7
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

e17: Switch SOURCE from .gz -> .bz2

commit 46b076680a1fe34032f7f9a31b9b3b99fe8828d0
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

e17: Fix trailing &&

commit 8a695d78316107b5bc5437542fd0c143676b135e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

e17: Cleanup formatting

commit 20479cb8302d20c8ed4b7cbbb900b50435764a6d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

eio: Cleanup formatting

commit 693ff1936d163fa3f23d95c35a394ab557fd1091
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

e17: Optionally depends on gettext, elementary, and emotion

commit 34b4df317e3609d5495d70f5dc5643b04eddcf13
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

elementary: Added stable 1.7.4 release
Only SCM branch depends on subversion
Stable branch depends on eio edje

commit 0ccfeef8bbe4d9a138da0bda83c0b64b58f3ad13
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

eio: Depends on eet and eina

commit cf755a836c1adfa0cef58601949501223f874d3f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

e_dbus: Fix ./configure flags for connman and eofono

--disable-ofono -> --disable-eofono
*-connman -> *-connman0_7x

commit c3b1a7999cd569bb7e07b6c5eaaf9630ddcbebc5
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

emotion: Updated stable to 1.7.4
Optionally depends on doxygen
VLC is now under "generic" (--enable-generic-vlc)

commit 2f64263931759acf8c96f62c0ea4fb57a3aafd7f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

e17: dd stable 0.17.0 branch
SCM depends on efl, subversion, and edbus; stable does not
exchange and bluez are no longer options
Stable depends on e_dbus ecore edje efreet eina eio evas
xcb-util-keysyms
Stable optionally depends on eeze
Only install e17update for SCM version

commit c148d3741ac4bb1a41b22c4d42a19a287bded24e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

eio: Removed SCM option, included in efl
Updated stable to 1.7.4
Conflicts with efl
Optionally depends on doxygen

commit 4faef88bf9fd9045659a7f4326c70aa41beafb9c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

e_dbus: Cleanup formatting

commit 8ac6072de2f8c903693399bd2f11704b9f924704
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

e_dbus: Updated stable branch to 1.7.4
Stable branch does not use efl, only SCM branch

commit c4f5594d31e67df1e724d3e92c76149304542ac1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

edje: Depends on ecore built with evas support (ecore-evas)

commit 3051c929dc92e688ce6f4aff65e8321930098ae9
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ecore: Allow forcing using evas

commit 9d876cbf6c7cbe257812ef35a6c1c4923672d1b7
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

eeze: Stable version updated to 1.7.4
Removed svn version, included in efl package
Depends on eet
Optionally depends on doxygen

commit 640d50d57de26547561d7e28a63e2b02a858d344
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ecore: Depends on eina

commit fe1586f75e730abbf124fb6f5a40bee645371e3e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

efreet: Stable version updated to 1.7.4
Removed svn version, included in efl package
Removed efl dependency (not for stable)
Does not depend on edbus nor e_dbus
Depends on eet and eina

commit b763fc82f34cd06d9abaf61e3e315455fba05490
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

edje: Updated stable to 1.7.4
SCM branch only depends on efl package
SCM branch conflicts with ecore (provided by required efl)
Stable depends on ecore embryo
Optionally depends on doxygen, LIBAVCODEC, and alsa-lib
Stable branch only conflicts with efl package

commit 38750be9e5d730214f0ad42d411d4216e4c73e69
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

embryo: Updated stable to 1.7.4
Removed svn version, included in efl package
Optionally depends on doxygen

commit 5c50fc5cb37879c5d0fbf5bf28de106366f6fd91
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ecore: Optionally depends on evas (auto-detect what evas supports)

commit eaa4e728bc3470dccafa4c6a8bb28c2228d1c9e8
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ecore: Cleanup formatting

commit 89b9aac1b31cb9c174dee27ddcf6ee9fe2dc38e2
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

evas: Cleanup formatting

commit 3612b165c1aa1441bcc6bc40dc9bd3c5de1ccf7e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

evas: Updated stable to 1.7.4
Removed svn version, included in efl package
Expand pixman flags
Optionally depends on doxygen

commit 12248197d9a4d88ef43d39a97d9263ab6d85a633
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

ecore: Updated stable to 1.7.4
Removed svn support, included in efl package
Stable version does not depend on efl (conflicts!)
Optionally depends on libxcomposite and libxp
Add '--enable*' options for other optional dependencies
Replace 'xorg-libs' optional dependency with libx11

commit 83f8584c8afc30cf8d2808f44d1c09ac9492707d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

eet: Updated stable to 1.7.4
Removed svn option, included in efl package

diff --git a/e-17/e17/BUILD b/e-17/e17/BUILD
index eadce86..2b18913 100755
--- a/e-17/e17/BUILD
+++ b/e-17/e17/BUILD
@@ -11,4 +11,3 @@ OPTS="$E17_RANDR $E17_ENOTIFY $E17_IBAR $E17_DROPSHADOW
$E17_CLOCK \
$OPTS" &&

default_build
-
diff --git a/e-17/e17/CONFIGURE b/e-17/e17/CONFIGURE
index b05451f..9b663c2 100755
--- a/e-17/e17/CONFIGURE
+++ b/e-17/e17/CONFIGURE
@@ -122,5 +122,5 @@ config_query_option E17_PATHS "Enable conf-paths module?"
y \
"--enable-conf-paths" "--disable-conf-paths" &&

config_query_option E17_INTERACTION "Enable conf-interaction module?" y
\
- "--enable-conf-interaction" "--disable-conf-interaction"

+ "--enable-conf-interaction" "--disable-conf-interaction"

diff --git a/e-17/e17/DEPENDS b/e-17/e17/DEPENDS
index 56153de..85b164b 100755
--- a/e-17/e17/DEPENDS
+++ b/e-17/e17/DEPENDS
@@ -1,8 +1,3 @@
-depends subversion &&
-depends efl &&
-depends edbus &&
-depends edje &&
-depends efreet &&
depends imlib2 &&
depends libxcursor &&
depends libxdamage &&
@@ -10,6 +5,30 @@ depends libxinerama &&
depends libxrandr &&
depends xorg-libs &&

+if [[ "x${E17_BRANCH}" == "xscm" ]]; then
+ depends edbus &&
+ depends efl &&
+ depends subversion
+else
+ depends e_dbus &&
+ depends -sub 'EVAS' ecore &&
+ depends edje &&
+ depends efreet &&
+ depends eina &&
+ depends eio &&
+ depends evas &&
+ depends xcb-util-keysyms &&
+
+ optional_depends eeze \
+ "--enable-mount-eeze" "--disable-mount-eeze" \
+ "Enable eeze mounting support?"
+fi &&
+
+optional_depends gettext \
+ '--enable-nls' \
+ '--disable-nls' \
+ 'for Native Language Support (recommended)' &&
+
optional_depends linux-pam \
"--enable-pam" "--disable-pam" \
"Enable PAM support?" &&
@@ -27,30 +46,29 @@ optional_depends udisks
\
"--enable-mount-udisks" "--disable-mount-udisks" \
"Enable udisks mounting support?" &&

-optional_depends eeze \
- "--enable-mount-eeze" "--disable-mount-eeze" \
- "Enable eeze mounting support?" &&
-
optional_depends alsa-lib
\
'--enable-mixer' '--disable-mixer'
\
'for Advanced Linux Sound Architecture sound driver
support' &&

-optional_depends exchange \
- "--enable-exchange" "--disable-exchange" \
- "Enable Exchange support?" &&
-
-optional_depends bluez \
- "--enable-bluez" "--disable-bluez" \
- "Enable bluez bluetooth module support?" &&
-
optional_depends connman
\
"--enable-connman" "--disable-connman"
\
- 'for conneman network configuration daemon support
(connamn module)' &&
+ 'for conneman network configuration daemon support
(connamn module)' &&

optional_depends dejavu-ttf \
'' \
'' \
- 'for the Enlightenment default font'
+ 'for the Enlightenment default font' &&
+
+optional_depends emotion \
+ '--enable-emotion' \
+ '--disable-emotion' \
+ 'enable Enlightenment video/codec API' &&
+
+optional_depends elementary \
+ '--enable-elementary' \
+ '--disable-elementary' \
+ 'for Enlightenment widget toolkit (recommended)'
+

# Comment these out till figure out how to get them to work
#optional_depends e17-theme-b_and_w \
@@ -61,4 +79,4 @@ optional_depends dejavu-ttf \
#optional_depends e17-theme-blingbling \
# '' \
# '' \
-# 'for the bling theme'
+# 'for the bling theme'
diff --git a/e-17/e17/DETAILS b/e-17/e17/DETAILS
index 06ab780..3ced946 100755
--- a/e-17/e17/DETAILS
+++ b/e-17/e17/DETAILS
@@ -1,16 +1,24 @@
SPELL=e17
-if [[ "$E17_AUTOUPDATE" == "y" ]]; then
+if [[ "$E17_BRANCH" == "scm" ]]; then
+ if [[ "$E17_AUTOUPDATE" == "y" ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=svn
-fi
+ fi
SOURCE=enlightenment-0.17-svn.tar.bz2
+ PATCHLEVEL=6
FORCE_DOWNLOAD=on
SOURCE_DIRECTORY=$BUILD_DIRECTORY/enlightenment-0.17-svn
SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/e:e
SOURCE_IGNORE=volatile
+else
+ VERSION=0.17.0
+ SOURCE=enlightenment-${VERSION}.tar.bz2
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+ SOURCE_URL=http://download.enlightenment.org/releases/${SOURCE}
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/enlightenment-${VERSION}
+fi
LICENSE[0]=BSD
- PATCHLEVEL=6
WEB_SITE=http://www.enlightenment.org/
KEYWORDS="e17 enlightenment wm windowmanager"
ENTERED=20010922
diff --git a/e-17/e17/HISTORY b/e-17/e17/HISTORY
index aef5f9c..d635913 100644
--- a/e-17/e17/HISTORY
+++ b/e-17/e17/HISTORY
@@ -1,3 +1,15 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on ecore built with evas support
+
+2013-01-07 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS, PREPARE, PRE_BUILD: Add stable 0.17.0 branch
+ * DEPENDS: SCM depends on efl, subversion, and edbus; stable does not
+ exchange and bluez are no longer options
+ Stable depends on e_dbus ecore edje efreet eina eio evas
xcb-util-keysyms
+ Stable optionally depends on eeze
+ Optionally depends on gettext, elementary, and emotion
+ * INSTALL: Only install e17update for SCM version
+
2012-11-24 Robin Cook <rcook AT wyrms.net>
* DEPENDS: changed e_dbus to edbus

@@ -19,7 +31,7 @@
* PRE_BUILD: we need .svn directory #15777

2010-02-26 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
- * DEPENDS : adding optional dep on connman
+ * DEPENDS : adding optional dep on connman

2009-11-03 Arjan Bouter <abouter AT sourcemage.org>
* DEPENDS,PRE_BUILD: removed old deps on CVS and automake-1.9
diff --git a/e-17/e17/INSTALL b/e-17/e17/INSTALL
index 351e37e..f63c6b0 100755
--- a/e-17/e17/INSTALL
+++ b/e-17/e17/INSTALL
@@ -2,5 +2,7 @@ default_install &&

install_wmfiles &&

-install -m 755 $SCRIPT_DIRECTORY/e17update \
- $INSTALL_ROOT/usr/sbin
+if [[ "x${E17_BRANCH}" == "xscm" ]]; then
+ install -m 755 $SCRIPT_DIRECTORY/e17update \
+ $INSTALL_ROOT/usr/sbin
+fi
diff --git a/e-17/e17/PREPARE b/e-17/e17/PREPARE
index f8b7d7e..8655f6f 100755
--- a/e-17/e17/PREPARE
+++ b/e-17/e17/PREPARE
@@ -1,2 +1,2 @@
. ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch
+prepare_select_branch 0.17 scm
diff --git a/e-17/e17/PRE_BUILD b/e-17/e17/PRE_BUILD
index 8acd7ec..bb2afa4 100755
--- a/e-17/e17/PRE_BUILD
+++ b/e-17/e17/PRE_BUILD
@@ -1,10 +1,13 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-#
-# Remove .svn directories, otherwise they get installed
-#
-# #15777 find . -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true &&

-#sedit "s/; aclocal/; aclocal-1.9/" autogen.sh &&
-#sedit "s/; automake/; automake-1.9/" autogen.sh &&
-NOCONFIGURE=ON ./autogen.sh
+if [[ "x${E17_BRANCH}" == "xscm" ]]; then
+ cd $SOURCE_DIRECTORY &&
+ #
+ # Remove .svn directories, otherwise they get installed
+ #
+ # #15777 find . -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true
&&
+
+ #sedit "s/; aclocal/; aclocal-1.9/" autogen.sh &&
+ #sedit "s/; automake/; automake-1.9/" autogen.sh &&
+ NOCONFIGURE=ON ./autogen.sh
+fi
diff --git a/e-17/e17/enlightenment-0.17.0.tar.bz2.sig
b/e-17/e17/enlightenment-0.17.0.tar.bz2.sig
new file mode 100644
index 0000000..f53fe2a
Binary files /dev/null and b/e-17/e17/enlightenment-0.17.0.tar.bz2.sig differ
diff --git a/e-17/e_dbus/CONFIGURE b/e-17/e_dbus/CONFIGURE
index c3f11f7..9ab88b2 100755
--- a/e-17/e_dbus/CONFIGURE
+++ b/e-17/e_dbus/CONFIGURE
@@ -11,10 +11,10 @@ config_query_option EDBUS_EBLUEZ "Enable bluetooth
support?" n \
"--enable-ebluez" "--disable-ebluez" &&

config_query_option EDBUS_ECONNMAN "Enable connman support?" n \
- "--enable-econnman" "--disable-econnman" &&
+ "--enable-econnman0_7x" "--disable-econnman0_7x" &&

config_query_option EDBUS_EOFONO "Enable ofono support?" n \
- "--enable-eofono" "--disable-ofono"
+ "--enable-eofono" "--disable-eofono"

# --disable-edbus-bluez-test
# disable building of edbus_bluez_test
diff --git a/e-17/e_dbus/DEPENDS b/e-17/e_dbus/DEPENDS
index ab2e645..a730133 100755
--- a/e-17/e_dbus/DEPENDS
+++ b/e-17/e_dbus/DEPENDS
@@ -1,3 +1,6 @@
depends dbus &&
-depends efl &&
-depends ecore
+depends ecore &&
+
+if [ "$E_DBUS_CVS" == "y" ]; then
+ depends efl
+fi
diff --git a/e-17/e_dbus/DETAILS b/e-17/e_dbus/DETAILS
index 7c42902..5f4987d 100755
--- a/e-17/e_dbus/DETAILS
+++ b/e-17/e_dbus/DETAILS
@@ -12,8 +12,8 @@ if [ "$E_DBUS_CVS" == "y" ]; then
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
PATCHLEVEL=2
else
- VERSION=1.0.1
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=1.7.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
diff --git a/e-17/e_dbus/HISTORY b/e-17/e_dbus/HISTORY
index f85bb53..6330f69 100644
--- a/e-17/e_dbus/HISTORY
+++ b/e-17/e_dbus/HISTORY
@@ -1,3 +1,12 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.5
+
+2013-01-07 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated stable branch to 1.7.4
+ Stable branch does not use efl, only SCM branch
+ * CONFIGURE: --disable-ofono -> --disable-eofono
+ *-connman -> *-connman0_7x
+
2012-11-24 Robin Cook <rcook AT wyrms.net>
* DEPENDS: change to using efl

@@ -22,7 +31,7 @@
* PREPARE: adding cvs compile question
* PRE_BUILD: adding CVS build check

-*2010-07-26 Ladislav Hagara <hgr AT vabo.cz>
+2010-07-26 Ladislav Hagara <hgr AT vabo.cz>
* PRE_BUILD: we need .svn directory #15777

2008-10-14 Eric Sandall <sandalle AT sourcemage.org>
diff --git a/e-17/e_dbus/e_dbus-1.0.1.tar.gz.sig
b/e-17/e_dbus/e_dbus-1.0.1.tar.gz.sig
deleted file mode 100644
index 1841e59..0000000
Binary files a/e-17/e_dbus/e_dbus-1.0.1.tar.gz.sig and /dev/null differ
diff --git a/e-17/e_dbus/e_dbus-1.7.5.tar.bz2.sig
b/e-17/e_dbus/e_dbus-1.7.5.tar.bz2.sig
new file mode 100644
index 0000000..0609a82
Binary files /dev/null and b/e-17/e_dbus/e_dbus-1.7.5.tar.bz2.sig differ
diff --git a/e-17/ecore/CONFIGURE b/e-17/ecore/CONFIGURE
index 6f2791b..79de94c 100755
--- a/e-17/ecore/CONFIGURE
+++ b/e-17/ecore/CONFIGURE
@@ -1,15 +1,15 @@
-config_query_option ECORE_PTHREADS "Enable POSIX thread code?" y
\
- "--enable-posix-threads" "--disable-posix-threads"
&&
+config_query_option ECORE_PTHREADS "Enable POSIX thread code?" y \
+ "--enable-posix-threads" "--disable-posix-threads" &&

-config_query_option ECORE_THREAD_SAFETY "Enable thread safety?" n
\
- "--enable-thread-safety" "--disable-thread-safety"
&&
+config_query_option ECORE_THREAD_SAFETY "Enable thread safety?" n \
+ "--enable-thread-safety" "--disable-thread-safety" &&

config_query_option ECORE_FB "Build Ecore_fb module for linux framebuffer?"
n \
- "--enable-ecore-fb --enable-ecore-evas-fb"
\
- "--disable-ecore-fb --disable-ecore-evas-fb"
&&
+ "--enable-ecore-fb --enable-ecore-evas-fb" \
+ "--disable-ecore-fb --disable-ecore-evas-fb" &&

-config_query_option ECORE_IPV6 "Enable IPv6 functionality?" n
\
- "--enable-ipv6" "--disable-ipv6"
&&
+config_query_option ECORE_IPV6 "Enable IPv6 functionality?" n \
+ "--enable-ipv6" "--disable-ipv6" &&

-config_query_list ECORE_CRYPTO "Use which cryptographic library?"
\
- gnutls openssl none

+config_query_list ECORE_CRYPTO "Use which cryptographic library?" \
+ gnutls openssl none
diff --git a/e-17/ecore/CONFLICTS b/e-17/ecore/CONFLICTS
new file mode 100755
index 0000000..a33a547
--- /dev/null
+++ b/e-17/ecore/CONFLICTS
@@ -0,0 +1 @@
+conflicts efl
diff --git a/e-17/ecore/DEPENDS b/e-17/ecore/DEPENDS
index e29fb94..638a0e1 100755
--- a/e-17/ecore/DEPENDS
+++ b/e-17/ecore/DEPENDS
@@ -1,68 +1,95 @@
depends curl '--enable-curl' &&
depends dbus &&
-depends efl &&
+depends eina &&

-if [ "$ECORE_BRANCH" = "scm" ]; then
- depends subversion &&
- depends libtool &&
- depends automake &&
- depends subversion
-fi &&
+optional_depends evas \
+ '--enable-ecore-evas --enable-ecore-evas-software-buffer
--enable-ecore-evas-software-x11 --enable-ecore-evas-software-16-x11
--enable-ecore-evas-software-8-x11' \
+ '--disable-ecore-evas' \
+ 'for ecore_evas hardware acceleartion module' &&

optional_depends glib2 \
- "" "--disable-glib" \
+ "--enable-glib" \
+ "--disable-glib" \
"Enable glib support?"
&&

-optional_depends xorg-libs \
- "--enable-ecore-x" "--disable-ecore-x" \
+optional_depends gettext \
+ '--enable-nls' \
+ '--disable-nls' \
+ 'for Native Language Support (recommended)'
&&
+
+optional_depends libx11 \
+ "--with-x --enable-ecore-x" \
+ "--without-x --disable-ecore-x" \
"for X11 ecore_x module"
&&

+optional_depends libxcomposite \
+ "--enable-ecore-x-composite" \
+ "--disable-ecore-x-composite" \
+ "Enable ecore_x support for Xcomposite extension?"
&&
+
optional_depends libxcursor \
- "" "--disable-ecore-x-cursor" \
+ "--enable-ecore-x-cursor" \
+ "--disable-ecore-x-cursor" \
"Enable ecore_x support for Xcursor extension?"
&&

optional_depends libxdamage \
- "" "--disable-ecore-x-damage" \
+ "--enable-ecore-x-damage" \
+ "--disable-ecore-x-damage" \
"Enable ecore_x support for Xdamage extension?"
&&

optional_depends libxrender \
- "" "--disable-ecore-x-render" \
+ "--enable-ecore-x-render" \
+ "--disable-ecore-x-render" \
"Enable ecore_x support for Xrender extension?"
&&

optional_depends libxrandr \
- "" "--disable-ecore-x-randr" \
+ "--enable-ecore-x-randr" \
+ "--disable-ecore-x-randr" \
"Enable ecore_x support for Xrandr extension?"
&&

optional_depends libxscrnsaver \
- "" "--disable-ecore-x-screensaver" \
+ "--enable-ecore-x-screensaver" \
+ "--disable-ecore-x-screensaver" \
"Enable ecore_x support for Xscreensaver?"
&&

optional_depends libxfixes \
- "" "--disable-ecore-x-xfixes" \
+ "--enable-ecore-x-xfixes" \
+ "--disable-ecore-x-xfixes" \
"Enable ecore_x support for Xfixes extension?"
&&

optional_depends libxinerama \
- "" "--disable-ecore-x-xinerama" \
+ "--enable-ecore-x-xinerama" \
+ "--disable-ecore-x-xinerama" \
"Enable ecore_x support for Xinerama extension?"
&&

+optional_depends libxp \
+ "--enable-ecore-x-xprint" \
+ "--disable-ecore-x-xprint" \
+ "Enable ecore_x support for Xprint extension?"
&&
+
optional_depends libxtst \
- "" "--disable-ecore-x-xtest" \
+ "--enable-ecore-x-xtest" \
+ "--disable-ecore-x-xtest" \
"Enable ecore_x support for Xtest extension?"
&&

optional_depends libxi \
- "" "--disable-ecore-x-input" \
+ "--enable-ecore-x-input" \
+ "--disable-ecore-x-input" \
"Enable ecore_x support for Xinput/Xinput2 extension?"
&&

optional_depends libxdmcp \
- "" "--disable-ecore-x-dpms" \
+ "--enable-ecore-x-dpms" \
+ "--disable-ecore-x-dpms" \
"Enable ecore_x support for Xdpms extension?"
&&

optional_depends libdrm \
- "" "--disable-ecore-x-dri" \
+ "--enable-ecore-x-dri" \
+ "--disable-ecore-x-dri" \
"Enable ecore_x support for DRI extension?"
&&

optional_depends libxcb \
- "--enable-ecore-x-xcb" "" \
+ "--enable-ecore-x-xcb" \
+ "--disable-ecore-x-xcb" \
"Enable ecore_x module with XCB backend?"
&&

optional_depends directfb \
@@ -76,11 +103,12 @@ optional_depends OPENGL
\
"Enable OpenGL Xlib support in ecore_evas?"
&&

optional_depends sdl \
- "--enable-ecore-sdl" "--disable-ecore-sdl" \
+ "--enable-ecore-sdl" \
+ "--disable-ecore-sdl" \
"Enable SDL ecore_sdl module?"
&&

if [ "$ECORE_CRYPTO" == "gnutls" ]; then
depends gnutls "--enable-gnutls --disable-openssl"
elif [ "$ECORE_CRYPTO" == "openssl" ]; then
depends openssl "--enable-openssl --disable-gnutls"
-fi
+fi
diff --git a/e-17/ecore/DETAILS b/e-17/ecore/DETAILS
index e999a90..5921668 100755
--- a/e-17/ecore/DETAILS
+++ b/e-17/ecore/DETAILS
@@ -1,24 +1,10 @@
SPELL=ecore
-if [ "$ECORE_BRANCH" == "scm" ]; then
- if [ "$ECORE_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
- SOURCE=$SPELL-svn.tar.bz2
- FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
- SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/$SPELL:$SPELL
- SOURCE_IGNORE=volatile
- PATCHLEVEL=1
-else
- VERSION=1.0.1
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=1.7.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
#
SOURCE_HASH=sha512:e4739f43abbbce8e78ad739fab9cedb1a6bcf1684958a17b5490f3b7fe00ae90177d26365d43d10708d3a31bfb255991f7be72442f8101840f8cbac8de842cb5
-fi
LICENSE[0]=BSD
WEB_SITE=http://enlightenment.org/Libraries/Ecore/
ENTERED=20011101
diff --git a/e-17/ecore/HISTORY b/e-17/ecore/HISTORY
index b6f3f7e..be47689 100644
--- a/e-17/ecore/HISTORY
+++ b/e-17/ecore/HISTORY
@@ -1,3 +1,21 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.5
+ * DEPENDS, SUB_DEPENDS: Add all evas flags for evas optional
dependency
+
+2013-01-07 Eric Sandall <sandalle AT sourcemage.org>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: Allow forcing using evas
+
+2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
+ * Removed svn support, included in efl package
+ * DETAILS: Updated stable to 1.7.4
+ * DEPENDS: Stable version does not depend on efl (conflicts!)
+ Optionally depends on libxcomposite and libxp
+ Add '--enable*' options for other optional dependencies
+ Replace 'xorg-libs' optional dependency with libx11
+ Optionally depends on evas (auto-detect what evas supports)
+ Depends on eina
+ * CONFLICTS: Conflicts with efl
+
2012-11-24 Robin Cook <rcook AT wyrms.net>
* DEPENDS: change to using efl

diff --git a/e-17/ecore/PREPARE b/e-17/ecore/PREPARE
deleted file mode 100755
index 98d27e4..0000000
--- a/e-17/ecore/PREPARE
+++ /dev/null
@@ -1,2 +0,0 @@
-. ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch stable scm
diff --git a/e-17/ecore/PRE_BUILD b/e-17/ecore/PRE_BUILD
deleted file mode 100755
index 8e591a1..0000000
--- a/e-17/ecore/PRE_BUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-default_pre_build &&
-
-if [ "$ECORE_BRANCH" == "scm" ]; then
- cd $SOURCE_DIRECTORY &&
-
- #
- # Remove .svn directories, otherwise they get installed
- # Don't do it #15777
- # find . -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true &&
-
- NOCONFIGURE=ON ./autogen.sh
-fi
diff --git a/e-17/ecore/PRE_SUB_DEPENDS b/e-17/ecore/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..564aa3f
--- /dev/null
+++ b/e-17/ecore/PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ EVAS) is_depends_enabled $SPELL evas && return 0;;
+ *) echo "unknown sub_depends!" ;;
+esac
+return 1
+
diff --git a/e-17/ecore/REPAIR^none^PRE_SUB_DEPENDS
b/e-17/ecore/REPAIR^none^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..564aa3f
--- /dev/null
+++ b/e-17/ecore/REPAIR^none^PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ EVAS) is_depends_enabled $SPELL evas && return 0;;
+ *) echo "unknown sub_depends!" ;;
+esac
+return 1
+
diff --git a/e-17/ecore/SUB_DEPENDS b/e-17/ecore/SUB_DEPENDS
new file mode 100755
index 0000000..b2c7520
--- /dev/null
+++ b/e-17/ecore/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+ EVAS) echo "evas support requested, forcing evas dependency." &&
+ depends evas '--enable-ecore-evas
--enable-ecore-evas-software-buffer --enable-ecore-evas-software-x11
--enable-ecore-evas-software-16-x11 --enable-ecore-evas-software-8-x11'
+ ;;
+ *) echo "unknown sub_depends $THIS_SUB_DEPENDS"; return 1 ;;
+esac
diff --git a/e-17/ecore/ecore-1.0.1.tar.gz.sig
b/e-17/ecore/ecore-1.0.1.tar.gz.sig
deleted file mode 100644
index fe283c5..0000000
Binary files a/e-17/ecore/ecore-1.0.1.tar.gz.sig and /dev/null differ
diff --git a/e-17/ecore/ecore-1.7.5.tar.bz2.sig
b/e-17/ecore/ecore-1.7.5.tar.bz2.sig
new file mode 100644
index 0000000..7f0122f
Binary files /dev/null and b/e-17/ecore/ecore-1.7.5.tar.bz2.sig differ
diff --git a/e-17/edje/CONFLICTS b/e-17/edje/CONFLICTS
new file mode 100755
index 0000000..cb61eb5
--- /dev/null
+++ b/e-17/edje/CONFLICTS
@@ -0,0 +1,4 @@
+if [[ "x${EDJE_BRANCH}" != "xscm" ]]
+then
+ conflicts efl
+fi
diff --git a/e-17/edje/DEPENDS b/e-17/edje/DEPENDS
index 0749c5c..46c107c 100755
--- a/e-17/edje/DEPENDS
+++ b/e-17/edje/DEPENDS
@@ -1,10 +1,29 @@
-depends efl &&
-depends ecore &&
-depends lua51 &&
+depends lua51 &&

if [[ "$EDJE_BRANCH" == "scm" ]]; then
+ depends efl &&
depends subversion
-fi
+else
+ depends -sub 'EVAS' ecore &&
+ depends eet &&
+ depends eina &&
+ depends embryo
+fi &&
+
+optional_depends alsa-lib \
+ '--enable-alsa' \
+ '--disable-alsa' \
+ 'for ALSA sound support' &&
+
+optional_depends doxygen \
+ '--enable-doc' \
+ '--disable-doc' \
+ 'to build documentation' &&
+
+optional_depends LIBAVCODEC \
+ '--enable-flac' \
+ '--disable-flac' \
+ 'for FLAC audio codec support' &&

optional_depends libsndfile \
"--enable-sndfile" "--disable-sndfile" \
diff --git a/e-17/edje/DETAILS b/e-17/edje/DETAILS
index 9ba123a..315a4d6 100755
--- a/e-17/edje/DETAILS
+++ b/e-17/edje/DETAILS
@@ -12,8 +12,8 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
SOURCE_IGNORE=volatile
PATCHLEVEL=1
else
- VERSION=1.0.1
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=1.7.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
diff --git a/e-17/edje/HISTORY b/e-17/edje/HISTORY
index a67f5b4..3d48b2e 100644
--- a/e-17/edje/HISTORY
+++ b/e-17/edje/HISTORY
@@ -1,3 +1,18 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.5
+
+2013-01-07 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on ecore built with evas support (ecore-evas)
+ Depends on eet and eina
+
+2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated stable to 1.7.4
+ * DEPENDS: SCM branch only depends on efl package
+ SCM branch conflicts with ecore (provided by required efl)
+ Stable depends on ecore embryo
+ Optionally depends on doxygen, LIBAVCODEC, and alsa-lib
+ * CONFLICTS: Stable branch only conflicts with efl package
+
2012-11-24 Robin Cook <rcook AT wyrms.net>
* DEPENDS: change to using efl

diff --git a/e-17/edje/edje-1.0.1.tar.gz.sig b/e-17/edje/edje-1.0.1.tar.gz.sig
deleted file mode 100644
index cf5bdac..0000000
Binary files a/e-17/edje/edje-1.0.1.tar.gz.sig and /dev/null differ
diff --git a/e-17/edje/edje-1.7.5.tar.bz2.sig
b/e-17/edje/edje-1.7.5.tar.bz2.sig
new file mode 100644
index 0000000..19f3003
Binary files /dev/null and b/e-17/edje/edje-1.7.5.tar.bz2.sig differ
diff --git a/e-17/eet/DEPENDS b/e-17/eet/DEPENDS
index 525f615..c5afa2c 100755
--- a/e-17/eet/DEPENDS
+++ b/e-17/eet/DEPENDS
@@ -3,10 +3,6 @@ depends JPEG &&
depends zlib &&
depends libgcrypt &&

-if [[ $EET_BRANCH == scm ]]; then
- depends subversion
-fi &&
-
if [ "$EET_CRYPTO" == "gnutls" ]; then
depends gnutls "--enable-gnutls --disable-openssl --enable-cipher
--enable-signature"
elif [ "$EET_CRYPTO" == "openssl" ]; then
diff --git a/e-17/eet/DETAILS b/e-17/eet/DETAILS
index 6d6fa3b..3393a14 100755
--- a/e-17/eet/DETAILS
+++ b/e-17/eet/DETAILS
@@ -1,24 +1,10 @@
SPELL=eet
-if [[ $EET_BRANCH == scm ]]; then
- if [[ $EET_AUTOUPDATE == y ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
- SOURCE=$SPELL-svn.tar.bz2
- FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
- SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/$SPELL:$SPELL
- SOURCE_IGNORE=volatile
- PATCHLEVEL=1
-else
- VERSION=1.4.1
+ VERSION=1.7.5
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL=http://download.enlightenment.org/releases/$SOURCE
#
SOURCE_HASH=sha512:fd2143755ab1649928bda92b707ad2ecb87d0a15a942d21dcfb83fa59eb1040943db1bf72c829f1149ba11ec9601543528019928aef7a46271a021c321917e4f
-fi
LICENSE[0]=BSD
WEB_SITE=http://enlightenment.org/Libraries/Eet/
ENTERED=20040311
diff --git a/e-17/eet/HISTORY b/e-17/eet/HISTORY
index 040fdfb..44ae094 100644
--- a/e-17/eet/HISTORY
+++ b/e-17/eet/HISTORY
@@ -1,4 +1,9 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.5
+
2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
+ * Removed svn option, included in efl package
+ * DETAILS: Updated stable to 1.7.4
* CONFLICTS: Conflicts with efl

2011-11-12 Robin Cook <rcook AT wyrms.net>
diff --git a/e-17/eet/PREPARE b/e-17/eet/PREPARE
deleted file mode 100755
index 98d27e4..0000000
--- a/e-17/eet/PREPARE
+++ /dev/null
@@ -1,2 +0,0 @@
-. ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch stable scm
diff --git a/e-17/eet/PRE_BUILD b/e-17/eet/PRE_BUILD
deleted file mode 100755
index 747d7f9..0000000
--- a/e-17/eet/PRE_BUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-default_pre_build &&
-
-if [[ $EET_BRANCH == scm ]]; then
- cd $SOURCE_DIRECTORY &&
-
- #
- # Remove .svn directories, otherwise they get installed
- #
- # #15777 find . -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true
&&
-
- NOCONFIGURE=ON ./autogen.sh
-fi
diff --git a/e-17/eet/eet-1.4.1.tar.bz2.sig b/e-17/eet/eet-1.4.1.tar.bz2.sig
deleted file mode 100644
index 4a2d384..0000000
Binary files a/e-17/eet/eet-1.4.1.tar.bz2.sig and /dev/null differ
diff --git a/e-17/eet/eet-1.7.5.tar.bz2.sig b/e-17/eet/eet-1.7.5.tar.bz2.sig
new file mode 100644
index 0000000..f4fe30c
Binary files /dev/null and b/e-17/eet/eet-1.7.5.tar.bz2.sig differ
diff --git a/e-17/eeze/DEPENDS b/e-17/eeze/DEPENDS
index 701f878..0b3c470 100755
--- a/e-17/eeze/DEPENDS
+++ b/e-17/eeze/DEPENDS
@@ -1,10 +1,10 @@
depends util-linux &&
-depends efl &&
depends ecore &&
+depends eet &&
depends udev &&

-if [ "$EEZE_CVS" = "y" ]; then
- depends subversion &&
- depends libtool &&
- depends automake
-fi
+optional_depends doxygen \
+ '--enable-doc' \
+ '--disable-doc' \
+ 'to build documentation'
+
diff --git a/e-17/eeze/DETAILS b/e-17/eeze/DETAILS
index eae4d0e..ed58166 100755
--- a/e-17/eeze/DETAILS
+++ b/e-17/eeze/DETAILS
@@ -1,23 +1,10 @@
SPELL=eeze
-if [ "$EEZE_CVS" == "y" ]; then
- if [ "$EEZE_CVS_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
- SOURCE=$SPELL-svn.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
- SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/$SPELL:$SPELL
- FORCE_DOWNLOAD="on"
- SOURCE_IGNORE=volatile
-else
- VERSION=1.0.2
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=1.7.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
#
SOURCE_HASH=sha512:629da8b5506581940b74ec638c3bf49514e626719b9a12dbd08dc098ac50fd3f1ff3fb893495dbbb5574290a75956448d889136b9bb766f6ddd719451f6f6f63
-fi
WEB_SITE=http://enlightenment.org/
ENTERED=20100520
LICENSE[0]=BSD
diff --git a/e-17/eeze/HISTORY b/e-17/eeze/HISTORY
index 8d5b346..4561c50 100644
--- a/e-17/eeze/HISTORY
+++ b/e-17/eeze/HISTORY
@@ -1,3 +1,12 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.5
+
+2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
+ * Removed svn version, included in efl package
+ * DETAILS: Stable version updated to 1.7.4
+ * DEPENDS: Depends on eet
+ Optionally depends on doxygen
+
2012-11-24 Robin Cook <rcook AT wyrms.net>
* DEPENDS: change to using efl

diff --git a/e-17/eeze/PREPARE b/e-17/eeze/PREPARE
deleted file mode 100755
index fec02a6..0000000
--- a/e-17/eeze/PREPARE
+++ /dev/null
@@ -1,6 +0,0 @@
-config_query EEZE_CVS "Build SCM (subversion) version?" y &&
-
-if [ "$EEZE_CVS" == "y" ]; then
- config_query EEZE_CVS_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
diff --git a/e-17/eeze/PRE_BUILD b/e-17/eeze/PRE_BUILD
deleted file mode 100755
index bf9a048..0000000
--- a/e-17/eeze/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-if [ "$EEZE_CVS" == "y" ]; then
- cd $SOURCE_DIRECTORY &&
- NOCONFIGURE=ON ./autogen.sh
-fi
diff --git a/e-17/eeze/eeze-1.0.2.tar.gz.sig b/e-17/eeze/eeze-1.0.2.tar.gz.sig
deleted file mode 100644
index 579f18a..0000000
Binary files a/e-17/eeze/eeze-1.0.2.tar.gz.sig and /dev/null differ
diff --git a/e-17/eeze/eeze-1.7.5.tar.bz2.sig
b/e-17/eeze/eeze-1.7.5.tar.bz2.sig
new file mode 100644
index 0000000..d4c3e7b
Binary files /dev/null and b/e-17/eeze/eeze-1.7.5.tar.bz2.sig differ
diff --git a/e-17/efreet/DEPENDS b/e-17/efreet/DEPENDS
index 8092e87..6db4f8c 100755
--- a/e-17/efreet/DEPENDS
+++ b/e-17/efreet/DEPENDS
@@ -1,4 +1,13 @@
-depends subversion &&
-depends efl &&
-depends ecore &&
-depends edbus
+depends ecore &&
+depends eet &&
+depends eina &&
+
+optional_depends doxygen \
+ '--enable-doc' \
+ '--disable-doc' \
+ 'to build documentation' &&
+
+optional_depends gettext \
+ '--enable-nls' \
+ '--disable-nls' \
+ 'for Native Language Support (recommended)'
diff --git a/e-17/efreet/DETAILS b/e-17/efreet/DETAILS
index 41f0478..889872f 100755
--- a/e-17/efreet/DETAILS
+++ b/e-17/efreet/DETAILS
@@ -1,26 +1,10 @@
SPELL=efreet
-if [ "$EFREET_CVS" == "y" ]; then
- if [ "$EFREET_CVS_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
-
- SOURCE=$SPELL-svn.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
- SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/$SPELL:$SPELL
- FORCE_DOWNLOAD=on
- SOURCE_IGNORE=volatile
- PATCHLEVEL=1
-
-else
- VERSION=1.0.1
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=1.7.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
#
SOURCE_HASH=sha512:d29d24d10648bd01caa5a61a8401e1875b958eb2bbb0d7f116d2dd0938a9a418d3a715d0985bd73f0de8b88152405c9e7a186abc4510f3fa17e2c4fedaf06190
-fi
WEB_SITE=http://enlightenment.org/
ENTERED=20070205
LICENSE[0]=BSD
diff --git a/e-17/efreet/HISTORY b/e-17/efreet/HISTORY
index dc481a3..e31d30a 100644
--- a/e-17/efreet/HISTORY
+++ b/e-17/efreet/HISTORY
@@ -1,3 +1,13 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.5
+
+2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
+ * Removed svn version, included in efl package
+ * DETAILS: Stable version updated to 1.7.4
+ * DEPENDS: Removed efl dependency (not for stable)
+ Does not depend on edbus nor e_dbus
+ Depends on eet and eina
+
2012-11-24 Robin Cook <rcook AT wyrms.net>
* DEPENDS: changed to using efl

diff --git a/e-17/efreet/PREPARE b/e-17/efreet/PREPARE
deleted file mode 100755
index 2bc8a1f..0000000
--- a/e-17/efreet/PREPARE
+++ /dev/null
@@ -1,6 +0,0 @@
-config_query EFREET_CVS "Build SCM (subversion) version?" y &&
-
-if [ "$EFREET_CVS" == "y" ]; then
- config_query EFREET_CVS_AUTOUPDATE \
- "Automatically update on every system update?" n
-fi
diff --git a/e-17/efreet/PRE_BUILD b/e-17/efreet/PRE_BUILD
deleted file mode 100755
index c5c37af..0000000
--- a/e-17/efreet/PRE_BUILD
+++ /dev/null
@@ -1,10 +0,0 @@
-default_pre_build &&
-if [ "$EFREET_CVS" == "y" ]; then
- cd $SOURCE_DIRECTORY &&
- #
- # Remove .svn directories, otherwise they get installed
- #
- # #15777 find . -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true
&&
-
- NOCONFIGURE=ON ./autogen.sh
-fi
diff --git a/e-17/efreet/efreet-1.0.1.tar.gz.sig
b/e-17/efreet/efreet-1.0.1.tar.gz.sig
deleted file mode 100644
index 74fd2ac..0000000
Binary files a/e-17/efreet/efreet-1.0.1.tar.gz.sig and /dev/null differ
diff --git a/e-17/efreet/efreet-1.7.5.tar.bz2.sig
b/e-17/efreet/efreet-1.7.5.tar.bz2.sig
new file mode 100644
index 0000000..b2eaf12
Binary files /dev/null and b/e-17/efreet/efreet-1.7.5.tar.bz2.sig differ
diff --git a/e-17/eina/DETAILS b/e-17/eina/DETAILS
index d3891d0..1d0f4d4 100755
--- a/e-17/eina/DETAILS
+++ b/e-17/eina/DETAILS
@@ -1,6 +1,6 @@
SPELL=eina
- VERSION=1.7.4
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=1.7.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
diff --git a/e-17/eina/HISTORY b/e-17/eina/HISTORY
index 631a315..d411d54 100644
--- a/e-17/eina/HISTORY
+++ b/e-17/eina/HISTORY
@@ -1,3 +1,6 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.5
+
2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated stable to 1.7.4
Remove SVN option, this code is now in the efl package
diff --git a/e-17/eina/eina-1.7.4.tar.gz.sig b/e-17/eina/eina-1.7.4.tar.gz.sig
deleted file mode 100644
index f5848af..0000000
Binary files a/e-17/eina/eina-1.7.4.tar.gz.sig and /dev/null differ
diff --git a/e-17/eina/eina-1.7.5.tar.bz2.sig
b/e-17/eina/eina-1.7.5.tar.bz2.sig
new file mode 100644
index 0000000..a4a8ee8
Binary files /dev/null and b/e-17/eina/eina-1.7.5.tar.bz2.sig differ
diff --git a/e-17/eio/CONFIGURE b/e-17/eio/CONFIGURE
index c7cdd11..f712171 100755
--- a/e-17/eio/CONFIGURE
+++ b/e-17/eio/CONFIGURE
@@ -2,4 +2,4 @@ config_query_option EIO_PTHREADS "Enable POSIX thread code?"
y \
"--enable-posix-threads" "--disable-posix-threads" &&

config_query_option EIO_INOTIFY "Enable inotify" y \
- "--enable-inotify" "--disable-inotify"
+ "--enable-inotify" "--disable-inotify"
diff --git a/e-17/eio/CONFLICTS b/e-17/eio/CONFLICTS
new file mode 100755
index 0000000..f1d168d
--- /dev/null
+++ b/e-17/eio/CONFLICTS
@@ -0,0 +1 @@
+conflicts efl
diff --git a/e-17/eio/DEPENDS b/e-17/eio/DEPENDS
index 5c420d4..f525a45 100755
--- a/e-17/eio/DEPENDS
+++ b/e-17/eio/DEPENDS
@@ -1,2 +1,8 @@
-depends efl &&
-depends ecore
+depends ecore &&
+depends eet &&
+depends eina &&
+
+optional_depends doxygen \
+ '--enable-doc' \
+ '--disable-doc' \
+ 'to build documentation'
diff --git a/e-17/eio/DETAILS b/e-17/eio/DETAILS
index 3fa6f20..a881dc5 100755
--- a/e-17/eio/DETAILS
+++ b/e-17/eio/DETAILS
@@ -1,14 +1,9 @@
SPELL=eio
-if [ "$EIO_CVS_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=svn
-fi
- SOURCE=$SPELL-svn.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
- SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/$SPELL:$SPELL
- FORCE_DOWNLOAD=on
- SOURCE_IGNORE=volatile
+ VERSION=1.7.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
WEB_SITE=http://www.enlightenment.org/
ENTERED=20100722
LICENSE[0]=LGPL
diff --git a/e-17/eio/HISTORY b/e-17/eio/HISTORY
index 25fb180..e0d056a 100644
--- a/e-17/eio/HISTORY
+++ b/e-17/eio/HISTORY
@@ -1,3 +1,13 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.5
+
+2013-01-07 Eric Sandall <sandalle AT sourcemage.org>
+ * Removed SCM option, included in efl
+ * DETAILS: Updated stable to 1.7.4
+ * CONFLICTS, DEPENDS: Conflicts with efl
+ Optionally depends on doxygen
+ Depends on eet and eina
+
2012-11-24 Robin Cook <rcook AT wyrms.net>
* DEPENDS: change to using efl

diff --git a/e-17/eio/PREPARE b/e-17/eio/PREPARE
deleted file mode 100755
index b1e4c65..0000000
--- a/e-17/eio/PREPARE
+++ /dev/null
@@ -1,2 +0,0 @@
-config_query EIO_CVS_AUTOUPDATE \
- "Automatically update on every system update?" n
diff --git a/e-17/eio/PRE_BUILD b/e-17/eio/PRE_BUILD
deleted file mode 100755
index 1af1b77..0000000
--- a/e-17/eio/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-NOCONFIGURE=ON ./autogen.sh
diff --git a/e-17/eio/eio-1.7.5.tar.bz2.sig b/e-17/eio/eio-1.7.5.tar.bz2.sig
new file mode 100644
index 0000000..8e7adfb
Binary files /dev/null and b/e-17/eio/eio-1.7.5.tar.bz2.sig differ
diff --git a/e-17/elementary/DEPENDS b/e-17/elementary/DEPENDS
index 0f0adcb..b22e205 100755
--- a/e-17/elementary/DEPENDS
+++ b/e-17/elementary/DEPENDS
@@ -1,5 +1,9 @@
-depends subversion &&
-depends eio &&
+if [ "x${ELEMENTARY_BRANCH}" == "xscm" ]; then
+ depends subversion
+else
+ depends edje &&
+ depends eio
+fi &&

optional_depends fbset "" "--disable-ecore-fb" \
"Enable Linux Framebuffer support?" &&
diff --git a/e-17/elementary/DETAILS b/e-17/elementary/DETAILS
index f087865..908da8b 100755
--- a/e-17/elementary/DETAILS
+++ b/e-17/elementary/DETAILS
@@ -1,14 +1,22 @@
SPELL=elementary
-if [ "$ELEMENTARY_CVS_AUTOUPDATE" == "y" ]; then
+if [ "x${ELEMENTARY_BRANCH}" == "xscm" ]; then
+ if [ "$ELEMENTARY_CVS_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
-else
+ else
VERSION=svn
-fi
+ fi
SOURCE=$SPELL-svn.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn

SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/$SPELL:$SPELL-svn
FORCE_DOWNLOAD="on"
SOURCE_IGNORE=volatile
+else
+ VERSION=1.7.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
+fi
WEB_SITE=http://trac.enlightenment.org/e/wiki/Elementary
ENTERED=20091022
LICENSE[0]=BSD
diff --git a/e-17/elementary/HISTORY b/e-17/elementary/HISTORY
index 3ff122c..266b5d1 100644
--- a/e-17/elementary/HISTORY
+++ b/e-17/elementary/HISTORY
@@ -1,3 +1,11 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.5
+
+2013-01-07 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS, PREPARE: Added stable 1.7.4 release
+ * DEPENDS: Only SCM branch depends on subversion
+ Stable branch depends on eio edje
+
2012-11-24 Robin Cook <rcook AT wyrms.net>
* DEPENDS: changed e_dbus to edbus

diff --git a/e-17/elementary/PREPARE b/e-17/elementary/PREPARE
index 1481b24..abdc854 100755
--- a/e-17/elementary/PREPARE
+++ b/e-17/elementary/PREPARE
@@ -1,2 +1,7 @@
-config_query ELEMENTARY_CVS_AUTOUPDATE \
- "Automatically update $SPELL on system-update?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm &&
+
+if [ "x${ELEMENTARY_BRANCH}" == "xscm" ]; then
+ config_query ELEMENTARY_CVS_AUTOUPDATE \
+ "Automatically update $SPELL on system-update?" n
+fi
diff --git a/e-17/elementary/PRE_BUILD b/e-17/elementary/PRE_BUILD
index 0f559b1..f354f52 100755
--- a/e-17/elementary/PRE_BUILD
+++ b/e-17/elementary/PRE_BUILD
@@ -1,3 +1,6 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-NOCONFIGURE=ON ./autogen.sh
+
+if [ "x${ELEMENTARY_BRANCH}" == "xscm" ]; then
+ cd $SOURCE_DIRECTORY &&
+ NOCONFIGURE=ON ./autogen.sh
+fi
diff --git a/e-17/elementary/elementary-1.7.5.tar.bz2.sig
b/e-17/elementary/elementary-1.7.5.tar.bz2.sig
new file mode 100644
index 0000000..78cef8d
Binary files /dev/null and b/e-17/elementary/elementary-1.7.5.tar.bz2.sig
differ
diff --git a/e-17/embryo/DEPENDS b/e-17/embryo/DEPENDS
index b2f216c..2e5d32d 100755
--- a/e-17/embryo/DEPENDS
+++ b/e-17/embryo/DEPENDS
@@ -2,6 +2,7 @@ depends automake &&
depends libtool &&
depends eina &&

-if [[ "$EMBRYO_BRANCH" == "scm" ]]; then
- depends subversion
-fi
+optional_depends doxygen \
+ '--enable-doc' \
+ '--disable-doc' \
+ 'to build documentation'
diff --git a/e-17/embryo/DETAILS b/e-17/embryo/DETAILS
index 9fa354d..664fe43 100755
--- a/e-17/embryo/DETAILS
+++ b/e-17/embryo/DETAILS
@@ -1,23 +1,10 @@
SPELL=embryo
-if [[ "$EMBRYO_BRANCH" == "scm" ]]; then
- if [[ "$EMBRYO_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
- SOURCE=$SPELL-svn.tar.bz2
- FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
- SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/$SPELL:$SPELL
- SOURCE_IGNORE=volatile
- PATCHLEVEL=1
-else
- VERSION=1.0.0
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=1.7.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
-
SOURCE_HASH=sha512:9d311d4c78d717458b471c49e3cc3a15aaba501e1fef718d43117d241766b25169e7909be182b68015b86c754663e25bbb3cdcd6a37c4df8b6962cb31c8649c8
-fi
+#
SOURCE_HASH=sha512:9d311d4c78d717458b471c49e3cc3a15aaba501e1fef718d43117d241766b25169e7909be182b68015b86c754663e25bbb3cdcd6a37c4df8b6962cb31c8649c8
LICENSE[0]=BSD
WEB_SITE=http://enlightenment.org/Libraries/Embryo/
ENTERED=20040324
diff --git a/e-17/embryo/HISTORY b/e-17/embryo/HISTORY
index 4df0ba1..779aa0e 100644
--- a/e-17/embryo/HISTORY
+++ b/e-17/embryo/HISTORY
@@ -1,4 +1,10 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.5
+
2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
+ * Removed svn version, included in efl package
+ * DETAILS: Updated stable to 1.7.4
+ * DEPENDS: Optionally depends on doxygen
* CONFLICTS: Conflicts with efl

2011-11-12 Robin Cook <rcook AT wyrms.net>
diff --git a/e-17/embryo/PREPARE b/e-17/embryo/PREPARE
deleted file mode 100755
index 98d27e4..0000000
--- a/e-17/embryo/PREPARE
+++ /dev/null
@@ -1,2 +0,0 @@
-. ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch stable scm
diff --git a/e-17/embryo/PRE_BUILD b/e-17/embryo/PRE_BUILD
deleted file mode 100755
index dff047c..0000000
--- a/e-17/embryo/PRE_BUILD
+++ /dev/null
@@ -1,11 +0,0 @@
-default_pre_build &&
-
-if [ "$EMBRYO_BRANCH" == "scm" ]; then
- cd $SOURCE_DIRECTORY &&
- #
- # Remove .svn directories, otherwise they get installed
- #
- # #15777 find . -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true
&&
-
- NOCONFIGURE=ON ./autogen.sh
-fi
diff --git a/e-17/embryo/embryo-1.7.5.tar.bz2.sig
b/e-17/embryo/embryo-1.7.5.tar.bz2.sig
new file mode 100644
index 0000000..f3034bc
Binary files /dev/null and b/e-17/embryo/embryo-1.7.5.tar.bz2.sig differ
diff --git a/e-17/emotion/DEPENDS b/e-17/emotion/DEPENDS
index 7df4e40..65b926b 100755
--- a/e-17/emotion/DEPENDS
+++ b/e-17/emotion/DEPENDS
@@ -1,5 +1,10 @@
depends edje &&

+optional_depends 'doxygen' \
+ '--enable-doc' \
+ '--disable-doc' \
+ 'to build documentation' &&
+
optional_depends 'gst-ffmpeg' \
'--enable-gstreamer' \
'--disable-gstreamer' \
@@ -12,8 +17,8 @@ optional_depends 'xine-lib' \
'for Xine backend support' &&

optional_depends 'vlc' \
- '--enable-vlc' \
- '--disable-vlc' &&
+ '--enable-generic-vlc' \
+ '--disable-generic-vlc' &&

optional_depends -sub 'LIBCDIO' 'gst-plugins-ugly' \
'' \
diff --git a/e-17/emotion/DETAILS b/e-17/emotion/DETAILS
index 8b4ca80..ff8b368 100755
--- a/e-17/emotion/DETAILS
+++ b/e-17/emotion/DETAILS
@@ -11,11 +11,12 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/emotion:emotion
SOURCE_IGNORE=volatile
else
- VERSION=0.0.1
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=1.7.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/enlightenment/$SOURCE
-
SOURCE_HASH=sha512:8596d842078f0735040de30cee9cb3ad7e8ac5efd25b5eb5857263d7b646d1070b6e97c4fc097c5c9ebd4f1da565aa201ab91ba6c318ec11c7bc86a93939c3a1
+ SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
+#
SOURCE_HASH=sha512:8596d842078f0735040de30cee9cb3ad7e8ac5efd25b5eb5857263d7b646d1070b6e97c4fc097c5c9ebd4f1da565aa201ab91ba6c318ec11c7bc86a93939c3a1
fi
LICENSE[0]=BSD
WEB_SITE=http://enlightenment.org/Libraries/Emotion/index.html
diff --git a/e-17/emotion/HISTORY b/e-17/emotion/HISTORY
index 15fb415..1f3b9e5 100644
--- a/e-17/emotion/HISTORY
+++ b/e-17/emotion/HISTORY
@@ -1,3 +1,11 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.5
+
+2013-01-07 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated stable to 1.7.4
+ * DEPENDS: Optionally depends on doxygen
+ VLC is now under "generic" (--enable-generic-vlc)
+
2011-11-13 Robin Cook <rcook AT wyrms.net>
* DETAILS: Renamed e-emotion emotion, Use prepare_select_branch
* PREPARE PRE_BUILD DEPENDS: Use prepare_select_branch
diff --git a/e-17/emotion/emotion-1.7.5.tar.bz2.sig
b/e-17/emotion/emotion-1.7.5.tar.bz2.sig
new file mode 100644
index 0000000..d24697f
Binary files /dev/null and b/e-17/emotion/emotion-1.7.5.tar.bz2.sig differ
diff --git a/e-17/ethumb/DEPENDS b/e-17/ethumb/DEPENDS
index d1a5625..e4d24e6 100755
--- a/e-17/ethumb/DEPENDS
+++ b/e-17/ethumb/DEPENDS
@@ -1,10 +1,21 @@
-depends subversion &&
-depends efl &&
+if [ "x${ETHUMB_BRANCH}" == "xscm" ]; then
+ depends subversion &&
+ depends efl &&
+
+ optional_depends edbus \
+ "--enable-ethumbd" "--disable-ethumbd"
+else
+ optional_depends e_dbus \
+ "--enable-ethumbd" "--disable-ethumbd"
+fi &&
+
depends ecore &&
depends edje &&

-optional_depends edbus \
- "--enable-ethumbd" "--disable-ethumbd" &&
+optional_depends doxygen \
+ '--enable-doc' \
+ '--disable-doc' \
+ 'to build documentation' &&

optional_depends emotion \
"--enable-emotion" "--disable-emotion" \
@@ -16,4 +27,4 @@ optional_depends epdf \

optional_depends libexif \
"--enable-libexif" "--disable-libexif" \
- "Enable libexif module?"
+ "Enable libexif module?"
diff --git a/e-17/ethumb/DETAILS b/e-17/ethumb/DETAILS
index 6089c61..4b144f8 100755
--- a/e-17/ethumb/DETAILS
+++ b/e-17/ethumb/DETAILS
@@ -1,14 +1,22 @@
SPELL=ethumb
-if [ "$ETHUMB_CVS_AUTOUPDATE" == "y" ]; then
+if [ "x${ETHUMB_BRANCH}" == "xscm" ]; then
+ if [ "$ETHUMB_CVS_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
-else
+ else
VERSION=svn
-fi
+ fi
SOURCE=$SPELL-svn.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/$SPELL:$SPELL
FORCE_DOWNLOAD=on
SOURCE_IGNORE=volatile
+else
+ VERSION=1.7.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
+fi
WEB_SITE=http://trac.enlightenment.org/e/wiki/Ethumb
ENTERED=20091022
LICENSE[0]=BSD
diff --git a/e-17/ethumb/HISTORY b/e-17/ethumb/HISTORY
index a7c0895..6d849cf 100644
--- a/e-17/ethumb/HISTORY
+++ b/e-17/ethumb/HISTORY
@@ -1,3 +1,12 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.5
+
+2013-01-07 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS, PREPARE: Add stable 1.7.4 branch
+ * DEPENDS: Only SCM branch depends on efl and subversion
+ e_dbus for stable and edbus for SCM
+ Optionally depends on doxygen
+
2012-11-24 Robin Cook <rcook AT wyrms.net>
* DEPENDS: changed e_dbus to edbus
changed to using efl
diff --git a/e-17/ethumb/PREPARE b/e-17/ethumb/PREPARE
index e77214d..cc62d7e 100755
--- a/e-17/ethumb/PREPARE
+++ b/e-17/ethumb/PREPARE
@@ -1,2 +1,7 @@
-config_query ETHUMB_CVS_AUTOUPDATE \
- "Automatically update $SPELL on system-update?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm &&
+
+if [ "x${ETHUMB_BRANCH}" == "xscm" ]; then
+ config_query ETHUMB_CVS_AUTOUPDATE \
+ "Automatically update $SPELL on system-update?" n
+fi
diff --git a/e-17/ethumb/PRE_BUILD b/e-17/ethumb/PRE_BUILD
index 0f559b1..a11245b 100755
--- a/e-17/ethumb/PRE_BUILD
+++ b/e-17/ethumb/PRE_BUILD
@@ -1,3 +1,6 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-NOCONFIGURE=ON ./autogen.sh
+
+if [ "x${ETHUMB_BRANCH}" == "xscm" ]; then
+ cd $SOURCE_DIRECTORY &&
+ NOCONFIGURE=ON ./autogen.sh
+fi
diff --git a/e-17/ethumb/ethumb-1.7.5.tar.bz2.sig
b/e-17/ethumb/ethumb-1.7.5.tar.bz2.sig
new file mode 100644
index 0000000..25f30a1
Binary files /dev/null and b/e-17/ethumb/ethumb-1.7.5.tar.bz2.sig differ
diff --git a/e-17/evas/BUILD b/e-17/evas/BUILD
index 9102a90..c795dcb 100755
--- a/e-17/evas/BUILD
+++ b/e-17/evas/BUILD
@@ -1,7 +1,7 @@
if [[ $(get_spell_provider $SPELL OPENGL) ]] && is_depends_enabled $SPELL
sdl; then
- EVAS_GL_SDL="--enable-gl-sdl --enable-sdl-primitive"
+ EVAS_GL_SDL="--enable-gl-sdl --enable-sdl-primitive"
else
- EVAS_GL_SDL="--disable-gl-sdl --disable-sdl-primitive"
+ EVAS_GL_SDL="--disable-gl-sdl --disable-sdl-primitive"
fi &&

OPTS="$EVAS_GL_SDL $EVAS_PMAPS $OPTS" &&
@@ -42,7 +42,15 @@ fi &&

if is_depends_enabled $SPELL fribidi && is_depends_enabled fribidi glib2 ;
then
CFLAGS="$CFLAGS -I/usr/include/glib-2.0"
-fi
+fi &&
+
+if [[ "x${EVAS_X11XCB}" == "xnone" ]]; then
+ OPTS="--disable-software-xlib \
+ --without-x \
+ --disable-software-xcb \
+ --disable-async-events \
+ $OPTS"
+fi &&

# We don't have wayland spells yet, http://wayland.freedesktop.org/
OPTS="--disable-wayland-shm --disable-wayland-egl $OPTS" &&
diff --git a/e-17/evas/CONFIGURE b/e-17/evas/CONFIGURE
index c4414a7..e78a841 100755
--- a/e-17/evas/CONFIGURE
+++ b/e-17/evas/CONFIGURE
@@ -1,13 +1,16 @@
-config_query EVAS_BUFFER "Enable memory buffer rendering?" y
&&
-config_query EVAS_SCALE_SAMPLE "Enable sampling scalar code?" y
&&
-config_query EVAS_SCALE_SMOOTH "Enable smooth scalar code?" y
&&
-config_query EVAS_YUV "Enable YUV converter code?" y
&&
-config_query EVAS_DITHER_MASK "Enable small dither mask code?" n
&&
+config_query EVAS_BUFFER "Enable memory buffer rendering?" y &&
+config_query EVAS_SCALE_SAMPLE "Enable sampling scalar code?" y &&
+config_query EVAS_SCALE_SMOOTH "Enable smooth scalar code?" y &&
+config_query EVAS_YUV "Enable YUV converter code?" y &&
+config_query EVAS_DITHER_MASK "Enable small dither mask code?" n &&
config_query EVAS_ASYNC_RENDER "Enable asynchrone render?(use
carefully!!)" n &&

-config_query_option EVAS_PMAPS "Enable portable pixmap support?" y
\
- '--enable-image-loader-pmaps'
'--disable-image-loader-pmaps' &&
+config_query_list EVAS_X11XCB "Use X11 (recommended) or XCB software
rendering?" \
+ x11 xcb none

-config_query_option EVAS_PTHREADS "Enable threaded rendering?" y
\
- "--enable-pthreads" "--disable-pthreads"
+config_query_option EVAS_PMAPS "Enable portable pixmap support?" y \
+ '--enable-image-loader-pmaps' '--disable-image-loader-pmaps' &&
+
+config_query_option EVAS_PTHREADS "Enable threaded rendering?" y \
+ "--enable-pthreads" "--disable-pthreads"

diff --git a/e-17/evas/DEPENDS b/e-17/evas/DEPENDS
index a562d12..07b588a 100755
--- a/e-17/evas/DEPENDS
+++ b/e-17/evas/DEPENDS
@@ -1,13 +1,21 @@
depends automake &&
+depends eet "--enable-image-loader-eet --enable-font-loader-eet" &&
depends eina &&
depends libtool &&
depends freetype2 &&

-if [[ "$EVAS_BRANCH" == "scm" ]]; then
- depends subversion
- depends eobj
+if [[ "x${EVAS_X11XCB}" == "xx11" ]]; then
+ depends xorg-libs "--enable-software-xlib --with-x"
+elif [[ "x${EVAS_X11XCB}" == "xxcb" ]]; then
+ depends libxcb "--enable-software-xcb --enable-async-events"
+# else "none" handled in BUILD
fi &&

+optional_depends doxygen \
+ '--enable-doc' \
+ '--disable-doc' \
+ 'build documentation' &&
+
optional_depends fontconfig \
"--enable-fontconfig" \
"--disable-fontconfig" \
@@ -24,7 +32,7 @@ optional_depends fribidi \
"Enable bidirectional text support?" &&

optional_depends pixman \
- "--enable-pixman" \
+ "--enable-pixman --enable-pixman-font --enable-pixman-rect
--enable-pixman-line --enable-pixman-poly --enable-pixman-image
--enable-pixman-image-scale-sample" \
"--disable-pixman" \
"Enable pixman for software rendering?" &&

@@ -43,26 +51,11 @@ optional_depends sdl
\
"--disable-software-16-sdl" \
"Enable software 16bit SDL rendering backend?" &&

-optional_depends xorg-libs \
- "--enable-software-xlib --with-x" \
- "--disable-software-xlib --without-x" \
- "for software X11 rendering backend" &&
-
-optional_depends libxcb \
- "--enable-software-xcb --enable-async-events" \
- "--disable-software-xcb --disable-async-events" \
- "Enable software XCB engine and rendering backend?" &&
-
optional_depends OPENGL \
"--enable-gl-xlib" \
"--disable-gl-xlib" \
"for OpenGL X11 display engine" &&

-optional_depends eet \
- "--enable-image-loader-eet --enable-font-loader-eet" \
- "--disable-images-loader-eet --disable-font-loader-eet" \
- "for eet images and font loader support" &&
-
optional_depends giflib \
'--enable-image-loader-gif' \
'--disable-image-loader-gif' \
diff --git a/e-17/evas/DETAILS b/e-17/evas/DETAILS
index baaa5a0..74f13bc 100755
--- a/e-17/evas/DETAILS
+++ b/e-17/evas/DETAILS
@@ -1,24 +1,10 @@
SPELL=evas
-if [[ "$EVAS_BRANCH" == "scm" ]]; then
- if [[ "$EVAS_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
- SOURCE=$SPELL-svn.tar.bz2
- FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
- SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/$SPELL:$SPELL
- SOURCE_IGNORE=volatile
- PATCHLEVEL=1
-else
- VERSION=1.0.1
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=1.7.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
#
SOURCE_HASH=sha512:4db153568433db2bc131713b8b11961ff874de56cb0e398976830ab82681173008d3a487e187343c4e81e7fcd85b7fd23e17c6b9cba8b1a6b006283c420237d0
-fi
WEB_SITE=http://enlightenment.org/Libraries/Evas/
ENTERED=20011101
UPDATED=20020509
diff --git a/e-17/evas/HISTORY b/e-17/evas/HISTORY
index 0985e7d..02cd7fa 100644
--- a/e-17/evas/HISTORY
+++ b/e-17/evas/HISTORY
@@ -1,4 +1,13 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.5
+ * BUILD, CONFIGURE, DEPENDS: X11 and XCB are mutually exclusive
+ * DEPENDS: eet is required, not optional
+
2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
+ * Removed svn version, included in efl package
+ * DETAILS: Updated stable to 1.7.4
+ * DEPENDS: Expand pixman flags
+ Optionally depends on doxygen
* CONFLICTS: Conflicts with efl

2012-10-14 Robin Cook <rcook AT wyrms.net>
@@ -11,7 +20,7 @@
* BUILD: --disable-wayland-{shm,egl} added

2011-11-26 Robin Cook <rcook AT wyrms.net>
- * BUILD: added CFLAGS include if fribidi is enabled and compiled with
+ * BUILD: added CFLAGS include if fribidi is enabled and compiled with
glib2

2011-11-14 Robin Cook <rcook AT wyrms.net>
@@ -24,7 +33,7 @@
config_query_option
* DEPENDS: corrected changed switches, changed some depends to
optional
added optional depends
-
+
2011-11-03 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.0.1

diff --git a/e-17/evas/PREPARE b/e-17/evas/PREPARE
deleted file mode 100755
index 98d27e4..0000000
--- a/e-17/evas/PREPARE
+++ /dev/null
@@ -1,2 +0,0 @@
-. ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch stable scm
diff --git a/e-17/evas/PRE_BUILD b/e-17/evas/PRE_BUILD
deleted file mode 100755
index e4c19d5..0000000
--- a/e-17/evas/PRE_BUILD
+++ /dev/null
@@ -1,11 +0,0 @@
-default_pre_build &&
-
-if [[ "$EVAS_BRANCH" == "scm" ]]; then
- cd $SOURCE_DIRECTORY &&
- #
- # Remove .svn directories, otherwise they get installed
- #
- # #15777 find . -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true
&&
-
- NOCONFIGURE=ON ./autogen.sh
-fi
diff --git a/e-17/evas/evas-1.0.1.tar.gz.sig b/e-17/evas/evas-1.0.1.tar.gz.sig
deleted file mode 100644
index 91cbad0..0000000
Binary files a/e-17/evas/evas-1.0.1.tar.gz.sig and /dev/null differ
diff --git a/e-17/evas/evas-1.7.5.tar.bz2.sig
b/e-17/evas/evas-1.7.5.tar.bz2.sig
new file mode 100644
index 0000000..d23fd5d
Binary files /dev/null and b/e-17/evas/evas-1.7.5.tar.bz2.sig differ
diff --git a/e-17/evas_generic_loaders/DEPENDS
b/e-17/evas_generic_loaders/DEPENDS
index b938afd..f2701df 100755
--- a/e-17/evas_generic_loaders/DEPENDS
+++ b/e-17/evas_generic_loaders/DEPENDS
@@ -1 +1,5 @@
+if [ "x${EVAS_GENERIC_LOADERS_BRANCH}" == "xscm" ]; then
+ depends subversion
+fi &&
+
depends evas
diff --git a/e-17/evas_generic_loaders/DETAILS
b/e-17/evas_generic_loaders/DETAILS
index d1066d9..955150e 100755
--- a/e-17/evas_generic_loaders/DETAILS
+++ b/e-17/evas_generic_loaders/DETAILS
@@ -1,15 +1,23 @@
SPELL=evas_generic_loaders
PATCHLEVEL=0
-if [ "$EVAS_GENERIC_LOADERS_AUTOUPDATE" == "y" ]; then
+if [ "x${EVAS_GENERIC_LOADERS_BRANCH}" == "xscm" ]; then
+ if [ "$EVAS_GENERIC_LOADERS_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
-else
+ else
VERSION=svn
-fi
+ fi
SOURCE=$SPELL-svn.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/$SPELL:$SPELL
FORCE_DOWNLOAD=on
SOURCE_IGNORE=volatile
+else
+ VERSION=1.7.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
+fi
WEB_SITE=http://www.enlightenment.org/
ENTERED=20120812
LICENSE[0]=GPL
diff --git a/e-17/evas_generic_loaders/HISTORY
b/e-17/evas_generic_loaders/HISTORY
index f6d94c0..bdbe264 100644
--- a/e-17/evas_generic_loaders/HISTORY
+++ b/e-17/evas_generic_loaders/HISTORY
@@ -1,2 +1,9 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.5
+
+2013-01-07 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS, PREPARE: Added stable 1.7.4 branch
+ * DEPENDS: SCM version depends on subversion
+
2012-08-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, DEPENDS, PREPARE, PRE_BUILD: spell created
diff --git a/e-17/evas_generic_loaders/PREPARE
b/e-17/evas_generic_loaders/PREPARE
index f8b7d7e..98d27e4 100755
--- a/e-17/evas_generic_loaders/PREPARE
+++ b/e-17/evas_generic_loaders/PREPARE
@@ -1,2 +1,2 @@
. ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch
+prepare_select_branch stable scm
diff --git a/e-17/evas_generic_loaders/PRE_BUILD
b/e-17/evas_generic_loaders/PRE_BUILD
index 1af1b77..48d6d12 100755
--- a/e-17/evas_generic_loaders/PRE_BUILD
+++ b/e-17/evas_generic_loaders/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&

-NOCONFIGURE=ON ./autogen.sh
+if [ "x${EVAS_GENERIC_LOADERS_BRANCH}" == "xscm" ]; then
+ cd $SOURCE_DIRECTORY &&
+ NOCONFIGURE=ON ./autogen.sh
+fi
diff --git a/e-17/evas_generic_loaders/evas_generic_loaders-1.7.5.tar.bz2.sig
b/e-17/evas_generic_loaders/evas_generic_loaders-1.7.5.tar.bz2.sig
new file mode 100644
index 0000000..7745260
Binary files /dev/null and
b/e-17/evas_generic_loaders/evas_generic_loaders-1.7.5.tar.bz2.sig differ
diff --git a/e-17/expedite/DEPENDS b/e-17/expedite/DEPENDS
index f21f7e5..097a507 100755
--- a/e-17/expedite/DEPENDS
+++ b/e-17/expedite/DEPENDS
@@ -1,2 +1,5 @@
-depends evas &&
-depends subversion
+if [ "x${EXPEDITE_BRANCH}" == "xscm" ]; then
+ depends subversion
+fi &&
+
+depends evas
diff --git a/e-17/expedite/DETAILS b/e-17/expedite/DETAILS
index c65c9a1..99e749c 100755
--- a/e-17/expedite/DETAILS
+++ b/e-17/expedite/DETAILS
@@ -1,14 +1,22 @@
SPELL=expedite
-if [ "$EXPEDITE_CVS_AUTOUPDATE" == "y" ]; then
+if [ "x${EXPEDITE_BRANCH}" == "xscm" ]; then
+ if [ "$EXPEDITE_CVS_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
-else
+ else
VERSION=svn
-fi
+ fi
SOURCE=$SPELL-svn.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/$SPELL:$SPELL
FORCE_DOWNLOAD=on
SOURCE_IGNORE=volatile
+else
+ VERSION=1.7.5
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
+fi
WEB_SITE=http://enlightenment.sourceforge.net/
ENTERED=20070430
LICENSE[0]=BSD
diff --git a/e-17/expedite/HISTORY b/e-17/expedite/HISTORY
index d69731d..47b645c 100644
--- a/e-17/expedite/HISTORY
+++ b/e-17/expedite/HISTORY
@@ -1,3 +1,10 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 1.7.5
+
+2013-01-07 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS, PREPARE: Add stable 1.7.4 branch
+ * DEPENDS: Only SCM branch depends on subversion
+
2008-09-11 Ladislav Hagara <hgr AT vabo.cz>
* *: cvs -> svn (subversion)

diff --git a/e-17/expedite/PREPARE b/e-17/expedite/PREPARE
index e80c04f..d52f2b7 100755
--- a/e-17/expedite/PREPARE
+++ b/e-17/expedite/PREPARE
@@ -1,2 +1,7 @@
-config_query EXPEDITE_CVS_AUTOUPDATE \
- "Automatically update on every system update?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm &&
+
+if [ "x${EXPEDITE_BRANCH}" == "xscm" ]; then
+ config_query EXPEDITE_CVS_AUTOUPDATE \
+ "Automatically update on every system update?" n
+fi
diff --git a/e-17/expedite/PRE_BUILD b/e-17/expedite/PRE_BUILD
index 4524f3f..f2b86d8 100755
--- a/e-17/expedite/PRE_BUILD
+++ b/e-17/expedite/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&

-NOCONFIGURE=ON ./autogen.sh
+if [ "x${EXPEDITE_BRANCH}" == "xscm" ]; then
+ cd $SOURCE_DIRECTORY &&
+ NOCONFIGURE=ON ./autogen.sh
+fi
diff --git a/e-17/expedite/expedite-1.7.5.tar.bz2.sig
b/e-17/expedite/expedite-1.7.5.tar.bz2.sig
new file mode 100644
index 0000000..6d48a00
Binary files /dev/null and b/e-17/expedite/expedite-1.7.5.tar.bz2.sig differ
diff --git a/e-17/exquisite/DEPENDS b/e-17/exquisite/DEPENDS
index dd8299e..a9a0de3 100755
--- a/e-17/exquisite/DEPENDS
+++ b/e-17/exquisite/DEPENDS
@@ -1,4 +1,7 @@
-depends efl &&
-depends ecore &&
-depends edje &&
-depends subversion
+if [ "x${EXQUISITE_BRANCH}" == "xscm" ]; then
+ depends efl &&
+ depends subversion
+fi &&
+
+depends ecore &&
+depends edje
diff --git a/e-17/exquisite/DETAILS b/e-17/exquisite/DETAILS
index 134bab6..3f078a8 100755
--- a/e-17/exquisite/DETAILS
+++ b/e-17/exquisite/DETAILS
@@ -1,14 +1,22 @@
SPELL=exquisite
-if [ "$EXQUISITE_CVS_AUTOUPDATE" == "y" ]; then
+if [ "x${EXQUISITE_BRANCH}" == "xscm" ]; then
+ if [ "$EXQUISITE_CVS_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
-else
+ else
VERSION=svn
-fi
+ fi
SOURCE=$SPELL-svn.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/$SPELL:$SPELL
FORCE_DOWNLOAD=on
SOURCE_IGNORE=volatile
+else
+ VERSION=1.0.0
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
+fi
WEB_SITE=http://enlightenment.sourceforge.net/
ENTERED=20080106
LICENSE[0]=BSD
diff --git a/e-17/exquisite/HISTORY b/e-17/exquisite/HISTORY
index 513f486..b67ce0a 100644
--- a/e-17/exquisite/HISTORY
+++ b/e-17/exquisite/HISTORY
@@ -1,3 +1,7 @@
+2013-01-07 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS, PREPARE: Add stable 1.0.0 branch
+ * DEPENDS: Only SCM branch depends on efl and subversion
+
2012-11-24 Robin Cook <rcook AT wyrms.net>
* DEPENDS: changed to using efl

diff --git a/e-17/exquisite/PREPARE b/e-17/exquisite/PREPARE
index bcf5323..e7db2fc 100755
--- a/e-17/exquisite/PREPARE
+++ b/e-17/exquisite/PREPARE
@@ -1,2 +1,7 @@
-config_query EXQUISITE_CVS_AUTOUPDATE \
- "Automatically update on every system update?" n
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm &&
+
+if [ "x${EXQUISITE_BRANCH}" == "xscm" ]; then
+ config_query EXQUISITE_CVS_AUTOUPDATE \
+ "Automatically update on every system update?" n
+fi
diff --git a/e-17/exquisite/PRE_BUILD b/e-17/exquisite/PRE_BUILD
index 4524f3f..4e84baf 100755
--- a/e-17/exquisite/PRE_BUILD
+++ b/e-17/exquisite/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&

-NOCONFIGURE=ON ./autogen.sh
+if [ "x${EXQUISITE_BRANCH}" == "xscm" ]; then
+ cd $SOURCE_DIRECTORY &&
+ NOCONFIGURE=ON ./autogen.sh
+fi
diff --git a/e-17/exquisite/exquisite-1.0.0.tar.bz2.sig
b/e-17/exquisite/exquisite-1.0.0.tar.bz2.sig
new file mode 100644
index 0000000..876c5ea
Binary files /dev/null and b/e-17/exquisite/exquisite-1.0.0.tar.bz2.sig differ
diff --git a/e-17/terminology/DEPENDS b/e-17/terminology/DEPENDS
index b3fb2e5..f9925f7 100755
--- a/e-17/terminology/DEPENDS
+++ b/e-17/terminology/DEPENDS
@@ -1,4 +1,12 @@
-depends efl &&
+if [[ "x${TERMINOLOGY_BRANCH}" == "xscm" ]]; then
+ depends efl &&
+ depends subversion
+fi &&
+
depends ecore &&
+depends edje &&
+depends eet &&
+depends efreet &&
+depends eina &&
depends emotion &&
depends elementary
diff --git a/e-17/terminology/DETAILS b/e-17/terminology/DETAILS
index 34a4d3b..9c8f26c 100755
--- a/e-17/terminology/DETAILS
+++ b/e-17/terminology/DETAILS
@@ -1,15 +1,23 @@
SPELL=terminology
+if [[ "x${TERMINOLOGY_BRANCH}" == "xscm" ]]; then
PATCHLEVEL=0
-if [ "$TERMINOLOGY_AUTOUPDATE" == "y" ]; then
+ if [ "$TERMINOLOGY_AUTOUPDATE" == "y" ]; then
VERSION=$(date +%Y%m%d)
-else
+ else
VERSION=svn
-fi
+ fi
SOURCE=$SPELL-svn.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
SOURCE_URL[0]=svn_http://svn.enlightenment.org/svn/e/trunk/$SPELL:$SPELL
FORCE_DOWNLOAD=on
SOURCE_IGNORE=volatile
+else
+ VERSION=0.2.0
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://download.enlightenment.org/releases/$SOURCE
+fi
WEB_SITE=http://www.enlightenment.org/
ENTERED=20120712
LICENSE[0]=BSD
diff --git a/e-17/terminology/HISTORY b/e-17/terminology/HISTORY
index 6170fda..498af30 100644
--- a/e-17/terminology/HISTORY
+++ b/e-17/terminology/HISTORY
@@ -1,3 +1,9 @@
+2013-01-08 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS, PREPARE: Add stable branch 0.2.0
+ * DEPENDS: Only SCM branch depends on efl
+ SCM branch depends on subversion
+ Stable branch depends on edje, eet, efreet, and eina
+
2012-11-24 Robin Cook <rcook AT wyrms.net>
* DEPENDS: changed to using efl

diff --git a/e-17/terminology/PREPARE b/e-17/terminology/PREPARE
index f8b7d7e..98d27e4 100755
--- a/e-17/terminology/PREPARE
+++ b/e-17/terminology/PREPARE
@@ -1,2 +1,2 @@
. ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch
+prepare_select_branch stable scm
diff --git a/e-17/terminology/PRE_BUILD b/e-17/terminology/PRE_BUILD
index 1af1b77..03a1185 100755
--- a/e-17/terminology/PRE_BUILD
+++ b/e-17/terminology/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&

-NOCONFIGURE=ON ./autogen.sh
+if [[ "x${TERMINOLOGY_BRANCH}" == "xscm" ]]; then
+ cd $SOURCE_DIRECTORY &&
+ NOCONFIGURE=ON ./autogen.sh
+fi
diff --git a/e-17/terminology/terminology-0.2.0.tar.bz2.sig
b/e-17/terminology/terminology-0.2.0.tar.bz2.sig
new file mode 100644
index 0000000..55e22e5
Binary files /dev/null and b/e-17/terminology/terminology-0.2.0.tar.bz2.sig
differ



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (86f9f35ab35f8215b973823018133b3d06671409), Eric Sandall, 01/08/2013

Archive powered by MHonArc 2.6.24.

Top of Page