Source Mage code commit list

[Andraž Levstik <scm AT sourcemage.org>]

GIT changes to master grimoire by Andraž Levstik 
<ruskie+2054d253 AT codemages.net>:

 gnome2-libs/devicekit/DEPENDS                |   12 +++++--
 gnome2-libs/devicekit/DeviceKit-no-doc.patch |   46 
+++++++++++++++++++++++++++
 gnome2-libs/devicekit/HISTORY                |    5 ++
 gnome2-libs/devicekit/PRE_BUILD              |    4 +-
 http/elog/CONFIGURE                          |    2 -
 http/elog/DEPENDS                            |    2 -
 http/elog/DETAILS                            |    4 +-
 http/elog/HISTORY                            |    7 ++++
 http/elog/Makefile.diff                      |   36 ---------------------
 http/elog/PRE_BUILD                          |    2 -
 10 files changed, 75 insertions(+), 45 deletions(-)

New commits:
commit 6895bb8b30c02b43814febf765e96119e09afe23
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

    devicekit: made gtk-doc optional, libxslt as well(needed for manpages)

commit c5d4083410d901a07f20ca8e5833ac472b3030d3
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

    elog: update to 0.7.6-1

diff --git a/gnome2-libs/devicekit/DEPENDS b/gnome2-libs/devicekit/DEPENDS
index 5309726..654a636 100755
--- a/gnome2-libs/devicekit/DEPENDS
+++ b/gnome2-libs/devicekit/DEPENDS
@@ -1,6 +1,12 @@
 depends dbus       &&
 depends dbus-glib  &&
-depends gtk-doc    &&
-depends libxslt    &&
 depends pkgconfig  &&
-depends udev
+depends udev       &&
+optional_depends libxslt \
+                 "--enable-man-pages" \
+                 "--disable-man-pages" \
+                 "Build and install man pages?" &&
+optional_depends gtk-doc \
+                 "--enable-gtk-doc" \
+                 "--disable-gtk-doc" \
+                 "Build and install API docs?"
diff --git a/gnome2-libs/devicekit/DeviceKit-no-doc.patch 
b/gnome2-libs/devicekit/DeviceKit-no-doc.patch
new file mode 100644
index 0000000..2959d82
--- /dev/null
+++ b/gnome2-libs/devicekit/DeviceKit-no-doc.patch
@@ -0,0 +1,46 @@
+diff -Nuar DeviceKit-003/autogen.sh DeviceKit-003.mod/autogen.sh
+--- DeviceKit-003/autogen.sh   2009-03-02 21:01:50.000000000 +0100
++++ DeviceKit-003.mod/autogen.sh       2009-04-20 07:49:18.000000000 +0200
+@@ -31,13 +31,6 @@
+   }
+ }
+ 
+-(gtkdocize --flavour no-tmpl) < /dev/null > /dev/null 2>&1 || {
+-      echo
+-      echo "You must have gtk-doc installed to compile $PROJECT."
+-      echo "Install the appropriate package for your distribution,"
+-      echo "or get the source tarball at 
http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/";
+-      DIE=1
+-}
+ 
+ (automake --version) < /dev/null > /dev/null 2>&1 || {
+   echo
+@@ -92,7 +85,7 @@
+       echo "Running autoconf ..."
+       autoconf
+ 
+-conf_flags="--enable-maintainer-mode --enable-gtk-doc"
++conf_flags="--enable-maintainer-mode"
+ 
+ if test x$NOCONFIGURE = x; then
+   echo "Running $srcdir/configure $conf_flags $@ ..."
+diff -Nuar DeviceKit-003/doc/Makefile.am DeviceKit-003.mod/doc/Makefile.am
+--- DeviceKit-003/doc/Makefile.am      2009-03-02 21:01:50.000000000 +0100
++++ DeviceKit-003.mod/doc/Makefile.am  2009-04-20 07:41:35.000000000 +0200
+@@ -60,14 +60,8 @@
+ 
+ # Extra options to supply to gtkdoc-fixref
+ FIXXREF_OPTIONS=
+-
+-if ENABLE_GTK_DOC
+-include $(top_srcdir)/gtk-doc.make
+-else
+-EXTRA_DIST =
+-CLEANFILES =
+-endif
+-
++EXTRA_DIST=
++CLEANFILES=
+ # Version information for marking the documentation
+ EXTRA_DIST += version.xml.in
+ 
diff --git a/gnome2-libs/devicekit/HISTORY b/gnome2-libs/devicekit/HISTORY
index 1781fef..7535b7f 100644
--- a/gnome2-libs/devicekit/HISTORY
+++ b/gnome2-libs/devicekit/HISTORY
@@ -1,3 +1,8 @@
+2009-04-20 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+       * DeviceKit-no-doc.patch: #15189 is optional, just needs some tweaking
+       * DEPENDS: gtk-doc(api docs) and libxslt(man pages) are both optional
+       * PRE_BUILD: patch for gtk-doc
+
 2009-04-19 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Make SHORT more descriptive
        * DEPENDS: gtk-doc is not optional, but required
diff --git a/gnome2-libs/devicekit/PRE_BUILD b/gnome2-libs/devicekit/PRE_BUILD
index c9e8d6e..f4d1a24 100755
--- a/gnome2-libs/devicekit/PRE_BUILD
+++ b/gnome2-libs/devicekit/PRE_BUILD
@@ -1,4 +1,6 @@
 default_pre_build     &&
 cd $SOURCE_DIRECTORY  &&
-
+if ! is_depends_enabled $SPELL gtk-doc ; then
+patch -p1 < $SPELL_DIRECTORY/DeviceKit-no-doc.patch
+fi &&
 NOCONFIGURE=Y ./autogen.sh
diff --git a/http/elog/CONFIGURE b/http/elog/CONFIGURE
index 5c2f0d4..88500b8 100755
--- a/http/elog/CONFIGURE
+++ b/http/elog/CONFIGURE
@@ -1,2 +1,2 @@
 config_query_option ELOG_CRYPT "Do you want crypt() support" \
-                    n "USE_CRYPT=1" ""
+                    n "USE_CRYPT=1" "USE_CRYPT="
diff --git a/http/elog/DEPENDS b/http/elog/DEPENDS
index ddd01ab..6147863 100755
--- a/http/elog/DEPENDS
+++ b/http/elog/DEPENDS
@@ -1,5 +1,5 @@
 optional_depends openssl \
                  "USE_SSL=1" \
-                 "" \
+                 "USE_SSL=" \
                  "HTTPS support"
 
diff --git a/http/elog/DETAILS b/http/elog/DETAILS
index 8c8e684..6b69b76 100755
--- a/http/elog/DETAILS
+++ b/http/elog/DETAILS
@@ -1,8 +1,8 @@
            SPELL=elog
-         VERSION=2.7.5-4
+         VERSION=2.7.6-1
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=https://midas.psi.ch/${SPELL}/download/tar/${SOURCE}
-     
SOURCE_HASH=sha512:c127c720c406710a4ea908741b92c3251f61935941d44c1369abf9d8e7b71f8e0ff15f27194b239c3ed2f8606aa7fc97c1bbd132d572f47b97956742a5b40cb2
+     
SOURCE_HASH=sha512:c72846bc5648910cdec74b5ced9668bb960af128cc89f86a637142d88f720d6766ed68a2b55ba39553f8cdbf861abb17de5a9a1fd758742bf2c6ff6e5315e0e4
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION:0:5}"
         WEB_SITE="http://midas.psi.ch/elog/ "
       LICENSE[0]=GPL
diff --git a/http/elog/HISTORY b/http/elog/HISTORY
index 19118c1..f529cce 100644
--- a/http/elog/HISTORY
+++ b/http/elog/HISTORY
@@ -1,3 +1,10 @@
+2009-04-16 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+       * DETAILS: updated spell to 2.7.6-1
+       * Makefile.diff: removed, upstream accepted modifications
+       * DEPENDS: updated
+       * CONFIGURE: updated
+       * PRE_BUILD: updated
+
 2009-03-11 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
        * BUILD, DEPENDS, DETAILS: spell created
        * PRE_BUILD, INSTALL, CONFIGURE: spell created
diff --git a/http/elog/Makefile.diff b/http/elog/Makefile.diff
deleted file mode 100644
index 6836c77..0000000
--- a/http/elog/Makefile.diff
+++ /dev/null
@@ -1,36 +0,0 @@
---- Makefile.ori       2009-03-11 12:59:26.000000000 +0100
-+++ Makefile   2009-03-11 13:00:02.000000000 +0100
-@@ -16,13 +16,20 @@
- MANDIR     = $(ROOT)$(PREFIX)/man
- endif
- 
--ELOGDIR    = $(ROOT)$(PREFIX)/elog
-+ELOGDIR    = $(ROOT)$(PREFIX)/share/elog
- DESTDIR    = $(ROOT)$(PREFIX)/bin
- SDESTDIR   = $(ROOT)$(PREFIX)/sbin
- RCDIR      = $(ROOT)/etc/rc.d/init.d
- 
- # flag for SSL support
-+ifdef USE_SSL
- USE_SSL    = 1
-+endif
-+
-+# support for crypt()
-+ifdef USE_CRYPT
-+USE_CRYPT  = 1
-+endif
- 
- #############################################################
- 
-@@ -76,6 +83,11 @@
- LIBS += -lssl
- endif 
- 
-+ifdef USE_CRYPT
-+CFLAGS += -DHAVE_CRYPT
-+LIBS += -lcrypt
-+endif 
-+
- WHOAMI = $(shell whoami)
- ifeq ($(WHOAMI),root)
- BINFLAGS = -o ${BINOWNER} -g ${BINGROUP}
diff --git a/http/elog/PRE_BUILD b/http/elog/PRE_BUILD
index 83d9284..aa0c453 100755
--- a/http/elog/PRE_BUILD
+++ b/http/elog/PRE_BUILD
@@ -1,3 +1,3 @@
 default_pre_build &&
 cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/Makefile.diff
+sed -i -e "s:ELOGDIR    = \$(ROOT)\$(PREFIX)/elog:ELOGDIR    = 
\$(ROOT)\$(PREFIX)/share/elog:" Makefile