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

6 files changed, 44 insertions, 11 deletions

diff --git a/e-17/ethumb/DEPENDS b/e-17/ethumb/DEPENDS
index d1a562585e..87f2f8daca 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"  \
diff --git a/e-17/ethumb/DETAILS b/e-17/ethumb/DETAILS
index 6089c61f85..99f51559bf 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.4
+          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 a7c0895728..beab115f8d 100644
--- a/e-17/ethumb/HISTORY
+++ b/e-17/ethumb/HISTORY
@@ -1,3 +1,9 @@
+2013-01-07 Eric Sandall <sandalle@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@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 e77214dcf1..cc62d7e092 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 0f559b187c..a11245b502 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.4.tar.bz2.sig b/e-17/ethumb/ethumb-1.7.4.tar.bz2.sig
new file mode 100644
index 0000000000..0126acf95e
--- /dev/null
+++ b/e-17/ethumb/ethumb-1.7.4.tar.bz2.sig