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>
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
# 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 &&
-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