Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire

28 files changed, 60 insertions, 44 deletions

diff --git a/audio-players/ncmpcpp/BUILD b/audio-players/ncmpcpp/BUILD
index f87bd7858a..db47218f41 100755
--- a/audio-players/ncmpcpp/BUILD
+++ b/audio-players/ncmpcpp/BUILD
@@ -1,11 +1,3 @@
-if [[ $NCMPCPP_UNICODE == "y" ]]; then
-    OPTS="$OPTS --enable-unicode"
-else
-    OPTS="$OPTS --disable-unicode"
-fi &&
-if [[ $NCMPCPP_CLOCK == "y" ]]; then
-    OPTS="$OPTS --enable-clock"
-else
-    OPTS="$OPTS --disable-clock"
-fi &&
+OPTS="$NCMPCPP_OPTS $OPTS" &&
+
 default_build
diff --git a/audio-players/ncmpcpp/CONFIGURE b/audio-players/ncmpcpp/CONFIGURE
new file mode 100755
index 0000000000..1bc039542e
--- /dev/null
+++ b/audio-players/ncmpcpp/CONFIGURE
@@ -0,0 +1,19 @@
+config_query_option NCMPCPP_OPTS \
+                    "Do you want support for unicode?" \
+                    ${NCMPCPP_UNICODE:-y} \
+                    "--enable-unicode" \
+                    "--disable-unicode" &&
+config_query_option NCMPCPP_OPTS \
+                    "Do you want ncmpcpp to display a clock?" \
+                    ${NCMPCPP_CLOCK:-n} \
+                    "--enable-clock" \
+                    "--disable-clock" &&
+config_query_option NCMPCPP_OPTS \
+                    "Do you want to enable the output screen?" \
+                    n \
+                    "--enable-outputs" \
+                    "--disable-outputs"
+
+# deprecation of old variables
+persistent_remove NCMPCPP_UNICODE
+persistent_remove NCMPCPP_CLOCK
diff --git a/audio-players/ncmpcpp/DEPENDS b/audio-players/ncmpcpp/DEPENDS
index 4454e8215c..bb5fb3fb91 100755
--- a/audio-players/ncmpcpp/DEPENDS
+++ b/audio-players/ncmpcpp/DEPENDS
@@ -6,4 +6,8 @@ optional_depends curl \
 optional_depends taglib \
                  "--with-taglib" \
                  "--without-taglib" \
-                 "enable tag editor" 
+                 "enable tag editor" &&
+optional_depends fftw \
+                 "--with-fftw --enable-visualizer" \
+                 "--without-fftw --disable-visualizer" \
+                 "enable music visualizer"
diff --git a/audio-players/ncmpcpp/DETAILS b/audio-players/ncmpcpp/DETAILS
index 6b94384dc8..013d505cee 100755
--- a/audio-players/ncmpcpp/DETAILS
+++ b/audio-players/ncmpcpp/DETAILS
@@ -1,8 +1,8 @@
            SPELL=ncmpcpp
-         VERSION=0.3.4
+         VERSION=0.4
           SOURCE="${SPELL}-${VERSION}.tar.bz2"
    SOURCE_URL[0]=http://unkart.ovh.org/${SPELL}/${SOURCE}
-     SOURCE_HASH=sha512:73572055ce01fd08f2082ca8fb7b4bdc6ad96fba1aae803951f8ca83806a6ffd60d46178668168292b1e9167af9e5008b7c3ac2e796344d1bd11a30fc6b94fe6
+     SOURCE_HASH=sha512:dc9eb9b1ce799eefbf9a7bc3fe4e8fed768d9207a470ff975fc20b7d32fdf9916a3e5396b62e829dbcff6d4468d44373a1dde2d0775f6dc938426bb291f7cfe9
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://unkart.ovh.org/ncmpcpp/"
       LICENSE[0]=GPL
diff --git a/audio-players/ncmpcpp/HISTORY b/audio-players/ncmpcpp/HISTORY
index 69641fcef7..421cd19402 100644
--- a/audio-players/ncmpcpp/HISTORY
+++ b/audio-players/ncmpcpp/HISTORY
@@ -1,3 +1,7 @@
+2009-09-27 Remko van der Vossen <wich@sourcemage.org>
+	* DETAILS: version 0.4
+	* PREPARE, CONFIGURE, BUILD: fixed abuse of PREPARE
+
 2009-05-24 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
 	* DETAILS: updated to 0.3.4
 	* PREPARE, BUILD: query the user if he wants unicode and a clock
diff --git a/audio-players/ncmpcpp/PREPARE b/audio-players/ncmpcpp/PREPARE
deleted file mode 100755
index 76224e9221..0000000000
--- a/audio-players/ncmpcpp/PREPARE
+++ /dev/null
@@ -1,2 +0,0 @@
-config_query NCMPCPP_UNICODE "Do you want support for unicode?" n &&
-config_query NCMPCPP_CLOCK "Do you want ncmpcpp to display a clock?" n
diff --git a/gnome2-apps/file-roller/DETAILS b/gnome2-apps/file-roller/DETAILS
index 694d9ee99f..07c8d9420f 100755
--- a/gnome2-apps/file-roller/DETAILS
+++ b/gnome2-apps/file-roller/DETAILS
@@ -1,5 +1,5 @@
            SPELL=file-roller
-         VERSION=2.26.2
+         VERSION=2.28.0
           BRANCH=`echo $VERSION | cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/file-roller/HISTORY b/gnome2-apps/file-roller/HISTORY
index 94b2820f35..35013dbf74 100644
--- a/gnome2-apps/file-roller/HISTORY
+++ b/gnome2-apps/file-roller/HISTORY
@@ -1,3 +1,6 @@
+2009-09-27 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 2.28.0
+
 2009-07-25 Arjan Bouter <abouter@sourcemage.org>
 	* DEPENDS: made rarian optional,
 	  added missing dep on gnome-doc-utils
diff --git a/gnome2-apps/file-roller/file-roller-2.26.2.tar.gz.sig b/gnome2-apps/file-roller/file-roller-2.26.2.tar.gz.sig
deleted file mode 100644
index c7e3a64733..0000000000
--- a/gnome2-apps/file-roller/file-roller-2.26.2.tar.gz.sig
+++ /dev/null
diff --git a/gnome2-apps/file-roller/file-roller-2.28.0.tar.gz.sig b/gnome2-apps/file-roller/file-roller-2.28.0.tar.gz.sig
new file mode 100644
index 0000000000..3789708d63
--- /dev/null
+++ b/gnome2-apps/file-roller/file-roller-2.28.0.tar.gz.sig
diff --git a/gnome2-apps/gok/DETAILS b/gnome2-apps/gok/DETAILS
index 12baaa6701..1d7f8ab026 100755
--- a/gnome2-apps/gok/DETAILS
+++ b/gnome2-apps/gok/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gok
-         VERSION=2.26.0
+         VERSION=2.28.0
 	  BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/gok/HISTORY b/gnome2-apps/gok/HISTORY
index 423c6fe499..6f1e5009df 100644
--- a/gnome2-apps/gok/HISTORY
+++ b/gnome2-apps/gok/HISTORY
@@ -1,3 +1,6 @@
+2009-09-27 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 2.28.0
+
 2009-03-28 Robin Cook <rcook@wyrms.net>
 	* DETAILS: updated VERSION to 2.26.0
 
diff --git a/gnome2-apps/gok/gok-2.26.0.tar.bz2.sig b/gnome2-apps/gok/gok-2.26.0.tar.bz2.sig
deleted file mode 100644
index 36ae07412d..0000000000
--- a/gnome2-apps/gok/gok-2.26.0.tar.bz2.sig
+++ /dev/null
diff --git a/gnome2-apps/gok/gok-2.28.0.tar.bz2.sig b/gnome2-apps/gok/gok-2.28.0.tar.bz2.sig
new file mode 100644
index 0000000000..2baa852c2d
--- /dev/null
+++ b/gnome2-apps/gok/gok-2.28.0.tar.bz2.sig
diff --git a/gnome2-apps/orca/DETAILS b/gnome2-apps/orca/DETAILS
index f2e51e593a..d3eb1bf487 100755
--- a/gnome2-apps/orca/DETAILS
+++ b/gnome2-apps/orca/DETAILS
@@ -1,5 +1,5 @@
            SPELL=orca
-         VERSION=2.26.0
+         VERSION=2.28.0
 	  BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-apps/orca/HISTORY b/gnome2-apps/orca/HISTORY
index b1ba92180f..77a60475f3 100644
--- a/gnome2-apps/orca/HISTORY
+++ b/gnome2-apps/orca/HISTORY
@@ -1,3 +1,6 @@
+2009-09-27 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 2.28.0
+
 2009-03-28 Robin Cook <rcook@wyrms.net>
 	* DETAILS: updated VERSION to 2.26.0
 
diff --git a/gnome2-apps/orca/orca-2.26.0.tar.bz2.sig b/gnome2-apps/orca/orca-2.26.0.tar.bz2.sig
deleted file mode 100644
index 406f1d0c65..0000000000
--- a/gnome2-apps/orca/orca-2.26.0.tar.bz2.sig
+++ /dev/null
diff --git a/gnome2-apps/orca/orca-2.28.0.tar.bz2.sig b/gnome2-apps/orca/orca-2.28.0.tar.bz2.sig
new file mode 100644
index 0000000000..0bce0f383a
--- /dev/null
+++ b/gnome2-apps/orca/orca-2.28.0.tar.bz2.sig
diff --git a/gnome2-apps/tomboy/DETAILS b/gnome2-apps/tomboy/DETAILS
index e2a76753a5..2de50db602 100755
--- a/gnome2-apps/tomboy/DETAILS
+++ b/gnome2-apps/tomboy/DETAILS
@@ -1,9 +1,9 @@
            SPELL=tomboy
-         VERSION=0.15.0
+         VERSION=1.0.0
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=${SPELL}-${VERSION}.tar.gz
    SOURCE_URL[0]=${GNOME_URL}/sources/${SPELL}/${BRANCH}/${SOURCE}
-      SOURCE_HASH=sha512:e27e65c9b0e171596986cb263d7911c77c40cb006c71f2401d314458761da773e472e7b6b6169764f6d59192110ffa7db84bc4b12e1fd25c1bbd1abf98ffe0b3
+      SOURCE_HASH=sha512:c5b3f07a03cee02aa056c1f99d17235f2acb325d5c2078c21030628e2663407180dabfb5f839740cb0a13edebffb2602fa999f65e626e4bfb34ea9742c04a33d
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
       LICENSE[0]=GPL
          ENTERED=20040920
diff --git a/gnome2-apps/tomboy/HISTORY b/gnome2-apps/tomboy/HISTORY
index 4e92a931c5..52f10f5177 100644
--- a/gnome2-apps/tomboy/HISTORY
+++ b/gnome2-apps/tomboy/HISTORY
@@ -1,3 +1,6 @@
+2009-09-27 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 1.0.0
+
 2009-07-07 Bearcat M. Sandor <sourcemage@feline-soul.com>
 	* DETAILS: 0.15.0, changed from gpg to hash
 
diff --git a/gnome2-libs/bug-buddy2/DETAILS b/gnome2-libs/bug-buddy2/DETAILS
index 7cf97e4a5e..baac91cd8d 100755
--- a/gnome2-libs/bug-buddy2/DETAILS
+++ b/gnome2-libs/bug-buddy2/DETAILS
@@ -1,5 +1,5 @@
            SPELL=bug-buddy2
-         VERSION=2.26.0
+         VERSION=2.28.0
 	  BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=bug-buddy-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/bug-buddy-$VERSION
diff --git a/gnome2-libs/bug-buddy2/HISTORY b/gnome2-libs/bug-buddy2/HISTORY
index 4e8ce41f2d..919a42f66a 100644
--- a/gnome2-libs/bug-buddy2/HISTORY
+++ b/gnome2-libs/bug-buddy2/HISTORY
@@ -1,3 +1,6 @@
+2009-09-27 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 2.28.0
+
 2009-05-28 Eric Sandall <sandalle@sourcemage.org>
 	* DEPENDS: May use either provider of LIBELF
 
diff --git a/gnome2-libs/bug-buddy2/bug-buddy-2.26.0.tar.bz2.sig b/gnome2-libs/bug-buddy2/bug-buddy-2.26.0.tar.bz2.sig
deleted file mode 100644
index 34c289a259..0000000000
--- a/gnome2-libs/bug-buddy2/bug-buddy-2.26.0.tar.bz2.sig
+++ /dev/null
diff --git a/gnome2-libs/bug-buddy2/bug-buddy-2.28.0.tar.bz2.sig b/gnome2-libs/bug-buddy2/bug-buddy-2.28.0.tar.bz2.sig
new file mode 100644
index 0000000000..001e55059e
--- /dev/null
+++ b/gnome2-libs/bug-buddy2/bug-buddy-2.28.0.tar.bz2.sig
diff --git a/python-pypi/pyinotify/DETAILS b/python-pypi/pyinotify/DETAILS
index cd78746f97..74aa0e165b 100755
--- a/python-pypi/pyinotify/DETAILS
+++ b/python-pypi/pyinotify/DETAILS
@@ -1,9 +1,9 @@
            SPELL=pyinotify
-         VERSION=0.8.6
-      PATCHLEVEL=1
+         VERSION=0.8.7
+      PATCHLEVEL=0
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://seb.dbzteam.org/pub/pyinotify/releases/$SOURCE
-     SOURCE_HASH=sha512:0316fb16d4dec80f064599cb4a88293317e281ca16114f1328a8cfbeaa7640ba00aea169f60f99af90e105381a888d5a3f7c6f333d4578d620a442fbaef06243
+     SOURCE_HASH=sha512:7b638d6c9be6e347e75a2af558df30226b510bbdde0606c3fb846d9c2d0fa6ba3b202db1cd2f3ad01c7a8e3ae56ce7380c088d0a593743ce0c2b52c3b2884630
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
         WEB_SITE=http://trac.dbzteam.org/pyinotify
       LICENSE[0]=PYTHON
diff --git a/python-pypi/pyinotify/HISTORY b/python-pypi/pyinotify/HISTORY
index e6bd140a01..f7f514a7d2 100644
--- a/python-pypi/pyinotify/HISTORY
+++ b/python-pypi/pyinotify/HISTORY
@@ -1,3 +1,7 @@
+2009-09-27 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 0.8.7
+	* PRE_BUILD, pyinotify.patch: removed
+
 2009-06-09 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: PATCHLEVEL=1
 	* PRE_BUILD, pyinotify.patch: added patch to fix glibc 2.10.1 problem
diff --git a/python-pypi/pyinotify/PRE_BUILD b/python-pypi/pyinotify/PRE_BUILD
deleted file mode 100755
index 3c64b10cd4..0000000000
--- a/python-pypi/pyinotify/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/pyinotify.patch
diff --git a/python-pypi/pyinotify/pyinotify.patch b/python-pypi/pyinotify/pyinotify.patch
deleted file mode 100644
index 5c9b0214c4..0000000000
--- a/python-pypi/pyinotify/pyinotify.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/pyinotify.py
-+++ b/pyinotify.py
-@@ -95,12 +95,14 @@ __metaclass__ = type  # Use new-style classes by default
- # load libc
- LIBC = ctypes.cdll.LoadLibrary(ctypes.util.find_library('c'))
-
--# the libc version check.
-+# the libc version > 2.4 check.
- # XXX: Maybe it is better to check if the libc has the needed functions inside?
- #      Because there are inotify patches for libc 2.3.6.
- LIBC.gnu_get_libc_version.restype = ctypes.c_char_p
- LIBC_VERSION = LIBC.gnu_get_libc_version()
--if LIBC_VERSION < '2.4':
-+if (int(LIBC_VERSION.split('.')[0]) < 2 or
-+    (int(LIBC_VERSION.split('.')[0]) == 2 and
-+     int(LIBC_VERSION.split('.')[1]) < 4)):
-     raise UnsupportedLibcVersionError(LIBC_VERSION)