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

15 files changed, 39 insertions, 14 deletions

diff --git a/crypto/pkcs11-helper/DETAILS b/crypto/pkcs11-helper/DETAILS
index d0a7fea76f..89ecbe7a56 100755
--- a/crypto/pkcs11-helper/DETAILS
+++ b/crypto/pkcs11-helper/DETAILS
@@ -1,11 +1,11 @@
            SPELL=pkcs11-helper
-         VERSION=1.07
+         VERSION=1.08
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://www.opensc-project.org/files/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:188288b6bd85e026e6ba7c406056c1c66a46e6f5019cb22b5432e7346dd72186638192e0237e0888bf5f0a21210de28cbd045422a0eea40736efe66979d6539f
+     SOURCE_HASH=sha512:800d756ea7be25c5ebf62de16fd58feae425ddb0161647c4122cdc64dce6ddf720ec669edbae14b5cd994b009c7266ff0f6726e0cc4575068701da030d02d331
       LICENSE[0]=BSD
-        WEB_SITE=http://www.opensc-project.org/pkcs11-helper/
+        WEB_SITE=http://www.opensc-project.org/opensc/wiki/pkcs11-helper
          ENTERED=20090103
         KEYWORDS="crypto"
            SHORT="a library that simplifies the interaction with PKCS#11 providers"
diff --git a/crypto/pkcs11-helper/HISTORY b/crypto/pkcs11-helper/HISTORY
index f639842855..8c9f4bd95b 100644
--- a/crypto/pkcs11-helper/HISTORY
+++ b/crypto/pkcs11-helper/HISTORY
@@ -1,3 +1,6 @@
+2011-04-01 Julien "_kaze_" ROZO <julien@rozo.org>
+	* DETAILS: updated version to 1.08, fixed WEB_SITE
+
 2009-03-09 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 1.07
 
diff --git a/ftp/aria2/DETAILS b/ftp/aria2/DETAILS
index 7e564592cc..3e2069eb54 100755
--- a/ftp/aria2/DETAILS
+++ b/ftp/aria2/DETAILS
@@ -1,6 +1,6 @@
            SPELL=aria2
-         VERSION=1.11.0
-     SOURCE_HASH=sha512:d5867df7be488957c9d48db6a50f7629cdcf628fac3a14a19988a5be8811aeea273fb3ab0197eb554b65bc80c0a1c40a36d6feae6e6a535c4b1dfd2505e03e26
+         VERSION=1.11.1
+     SOURCE_HASH=sha512:cd4d69cb33df22e07a823eac72f65825af55d323946a718256829740516b14b81cc00aef042ef7d658eacd09e78a33d8bcf070422d2702dbc85eeeda8b75a916
           SOURCE=${SPELL}-$VERSION.tar.bz2
    SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/ftp/aria2/HISTORY b/ftp/aria2/HISTORY
index 0417bdb796..085f3f2f8e 100644
--- a/ftp/aria2/HISTORY
+++ b/ftp/aria2/HISTORY
@@ -1,3 +1,6 @@
+2011-03-31 Bor Kraljič <pyrobor@ver.si>
+	* DETAILS: updated spell to 1.11.1
+
 2011-03-19 Bor Kraljič <pyrobor@ver.si>
 	* DETAILS: updated spell to 1.11.0
 
diff --git a/graphics-libs/poppler/DEPENDS b/graphics-libs/poppler/DEPENDS
index a2db546049..ff2abb2e03 100755
--- a/graphics-libs/poppler/DEPENDS
+++ b/graphics-libs/poppler/DEPENDS
@@ -36,6 +36,12 @@ optional_depends gtk+2 \
                  "--disable-poppler-glib" \
                  "for glib wrapper" &&
 
+optional_depends gobject-introspection \
+                 "--enable-introspection=yes" \
+                 "--enable-introspection=no" \
+                 "for introspection support" &&
+
+
 optional_depends -sub "TOOLS" qt4 \
                  "--enable-poppler-qt4" \
                  "--disable-poppler-qt4" \
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index cd2abf98ea..7fa679381b 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,6 @@
+2011-04-01 Bor Kraljič <pyrobor@ver.si>
+	* DEPENDS: added optional dependency to gobject-introspection
+
 2011-03-31 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 0.16.4
 
diff --git a/printer/ghostscript/DETAILS b/printer/ghostscript/DETAILS
index 59c29689e6..c4c758e40b 100755
--- a/printer/ghostscript/DETAILS
+++ b/printer/ghostscript/DETAILS
@@ -1,10 +1,10 @@
            SPELL=ghostscript
-         VERSION=9.01
-     SOURCE_HASH=sha512:6ae7088843c5233f0e2a8723004f49181674e0fa4e6d8372562ec706732aacdecb0e88a2523c515080555391ede90a9f61888c4a51e57b85c53448a93c4ee753
+         VERSION=9.02
+     SOURCE_HASH=sha512:a25d65b60b1be8b81de1d7cb55b256c0de883b21b65a7ff241e36a6baf5ec5efbd166031f24e25864417245774a523a0795948c763559875e0b22caa5a61cf5e
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://www.ghostscript.com/
-   SOURCE_URL[0]=$WEB_SITE/releases/$SOURCE
+   SOURCE_URL[0]=http://downloads.ghostscript.com/public/$SOURCE
       LICENSE[0]=GPL
          ENTERED=20010922
         KEYWORDS="interpreter postscript printer"
diff --git a/printer/ghostscript/HISTORY b/printer/ghostscript/HISTORY
index e94763567a..e4f5aef9f6 100644
--- a/printer/ghostscript/HISTORY
+++ b/printer/ghostscript/HISTORY
@@ -1,3 +1,7 @@
+2011-04-01 Treeve Jelbert <treeve@sourcemage.org>
+	* DETAILS: version 9.02
+	  new url
+
 2011-02-10 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 9.01
 
diff --git a/video/handbrake/DEPENDS b/video/handbrake/DEPENDS
index 37b33171cf..3bbc29524f 100755
--- a/video/handbrake/DEPENDS
+++ b/video/handbrake/DEPENDS
@@ -1,9 +1,6 @@
 depends  $HANDBRAKE_FETCH  "--fetch=$HANDBRAKE_FETCH" &&
 depends  python &&
 depends  hal    &&
-depends  gstreamer &&
-depends  gst-plugins-base &&
-depends  webkitgtk &&
 
 optional_depends  'gtk+2'  \
                   '--enable-gtk'  \
diff --git a/video/handbrake/DETAILS b/video/handbrake/DETAILS
index 0c2e68ef7e..34fca7126e 100755
--- a/video/handbrake/DETAILS
+++ b/video/handbrake/DETAILS
@@ -1,5 +1,5 @@
            SPELL=handbrake
-         VERSION=0.9.4
+         VERSION=0.9.5
           SOURCE=HandBrake-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/HandBrake-$VERSION
    SOURCE_URL[0]=http://handbrake.fr/rotation.php?file=$SOURCE
diff --git a/video/handbrake/HISTORY b/video/handbrake/HISTORY
index 103f0ada72..cdf1c5885b 100644
--- a/video/handbrake/HISTORY
+++ b/video/handbrake/HISTORY
@@ -1,5 +1,5 @@
-2010-10-24 Jeremy Blosser <jblosser-smgl@firinn.org>
-	* DEPENDS: Needs gstreamer, gst-plugins-base, and webkit to build.
+2011-03-31 Eric Sandall <sandalle@sourcemage.org>
+	* DETAILS: Updated to 0.9.5
 
 2010-06-27 Eric Sandall <sandalle@sourcemage.org>
 	* DEPENDS: Suggest libdvdcss for decrypting DVDs
diff --git a/video/handbrake/HandBrake-0.9.4.tar.bz2.sig b/video/handbrake/HandBrake-0.9.4.tar.bz2.sig
deleted file mode 100644
index 47e3e0c1f1..0000000000
--- a/video/handbrake/HandBrake-0.9.4.tar.bz2.sig
+++ /dev/null
diff --git a/video/handbrake/HandBrake-0.9.5.tar.bz2.sig b/video/handbrake/HandBrake-0.9.5.tar.bz2.sig
new file mode 100644
index 0000000000..9966466fee
--- /dev/null
+++ b/video/handbrake/HandBrake-0.9.5.tar.bz2.sig
diff --git a/x11/xdesktopwaves/HISTORY b/x11/xdesktopwaves/HISTORY
index aa14a93c8b..bbe807eee4 100644
--- a/x11/xdesktopwaves/HISTORY
+++ b/x11/xdesktopwaves/HISTORY
@@ -1,3 +1,6 @@
+2011-04-01 Arjan Bouter <abouter@sourcemage.org>
+	* PRE_BUILD: added, fix dir locations
+
 2008-03-18 Eric Sandall <sandalle@sourcemage.org>
 	* DEPENDS: Switch X11-LIBS to the one and only xorg-libs
 
diff --git a/x11/xdesktopwaves/PRE_BUILD b/x11/xdesktopwaves/PRE_BUILD
new file mode 100755
index 0000000000..de657f6d9c
--- /dev/null
+++ b/x11/xdesktopwaves/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+sedit 's#/usr/X11R6/include#/usr/include/X11#' Makefile &&
+sedit 's#/usr/X11R6/lib#/usr/lib/X11#' Makefile &&
+sedit 's#/usr/X11R6/bin#/usr/bin#' Makefile &&
+sedit 's#/usr/X11R6/man#/usr/share/man#' Makefile