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

35 files changed, 88 insertions, 35 deletions

diff --git a/audio-drivers/pulseaudio/DETAILS b/audio-drivers/pulseaudio/DETAILS
index 3f840375c8..b86300bf57 100755
--- a/audio-drivers/pulseaudio/DETAILS
+++ b/audio-drivers/pulseaudio/DETAILS
@@ -1,5 +1,5 @@
            SPELL=pulseaudio
-         VERSION=0.9.18
+         VERSION=0.9.19
           SOURCE=${SPELL}-${VERSION}.tar.gz
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
       SOURCE_URL=http://0pointer.de/lennart/projects/${SPELL}/${SOURCE}
diff --git a/audio-drivers/pulseaudio/HISTORY b/audio-drivers/pulseaudio/HISTORY
index 6a957a47b9..1c5376ffb2 100644
--- a/audio-drivers/pulseaudio/HISTORY
+++ b/audio-drivers/pulseaudio/HISTORY
@@ -1,3 +1,6 @@
+2009-10-01 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 0.9.19
+
 2009-09-19 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 0.9.18
 
diff --git a/audio-drivers/pulseaudio/pulseaudio-0.9.18.tar.gz.sig b/audio-drivers/pulseaudio/pulseaudio-0.9.18.tar.gz.sig
deleted file mode 100644
index c46e6602be..0000000000
--- a/audio-drivers/pulseaudio/pulseaudio-0.9.18.tar.gz.sig
+++ /dev/null
diff --git a/audio-drivers/pulseaudio/pulseaudio-0.9.19.tar.gz.sig b/audio-drivers/pulseaudio/pulseaudio-0.9.19.tar.gz.sig
new file mode 100644
index 0000000000..d4116034c9
--- /dev/null
+++ b/audio-drivers/pulseaudio/pulseaudio-0.9.19.tar.gz.sig
diff --git a/devel/vala/DETAILS b/devel/vala/DETAILS
index 70af8efc54..0f33b560e9 100755
--- a/devel/vala/DETAILS
+++ b/devel/vala/DETAILS
@@ -1,6 +1,6 @@
            SPELL=vala
-         VERSION=0.7.6
-     SOURCE_HASH=sha512:499cc3a08f5ebb2ac14c64ad5f58f91749b6641e2cef2a305c47087cd8af7926fb4958724ca2aaa5179cffce1aa11ae122e9624565d6a55abdff8ff033704490
+         VERSION=0.7.7
+     SOURCE_HASH=sha512:139a7d6226599ae537ea36b6943c34a34f9eec3d56cdafad8383082dcee658e6127e77aca9b02f9e03b0abd78e4d34328f19e2f94849f7c1c70d356dd241060d
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/devel/vala/HISTORY b/devel/vala/HISTORY
index cf4e253de5..0f783de6ec 100644
--- a/devel/vala/HISTORY
+++ b/devel/vala/HISTORY
@@ -1,3 +1,6 @@
+2009-10-01 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 0.7.7
+
 2009-09-19 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 0.7.6
 
diff --git a/gnome2-libs/glib2/DETAILS b/gnome2-libs/glib2/DETAILS
index ce5df8c1ec..a979a9c295 100755
--- a/gnome2-libs/glib2/DETAILS
+++ b/gnome2-libs/glib2/DETAILS
@@ -1,11 +1,11 @@
            SPELL=glib2 
 if [[ $GLIB_VER == devel ]];then
-         VERSION=2.22.0
+         VERSION=2.22.1
 #     SOURCE_HASH=sha512:1dae2011390fdc708dee5a79d04c1e799c0ac8a209c98bad47f12f314496180a1af46e24392c6971ed95d69a3ada2d0806b2af5e9ef40f1cdb0b6f6419900cdb
           SOURCE=glib-$VERSION.tar.bz2
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
 else
-         VERSION=2.22.0
+         VERSION=2.22.1
   SECURITY_PATCH=1
           SOURCE=glib-$VERSION.tar.bz2
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/gnome2-libs/glib2/HISTORY b/gnome2-libs/glib2/HISTORY
index 34bc13c219..eca8daa64d 100644
--- a/gnome2-libs/glib2/HISTORY
+++ b/gnome2-libs/glib2/HISTORY
@@ -1,3 +1,6 @@
+2009-10-01 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 2.22.1
+
 2009-09-22 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 2.22.0
 
diff --git a/gnome2-libs/glib2/glib-2.22.0.tar.bz2.sig b/gnome2-libs/glib2/glib-2.22.0.tar.bz2.sig
deleted file mode 100644
index 3f16a8ee88..0000000000
--- a/gnome2-libs/glib2/glib-2.22.0.tar.bz2.sig
+++ /dev/null
diff --git a/gnome2-libs/glib2/glib-2.22.1.tar.bz2.sig b/gnome2-libs/glib2/glib-2.22.1.tar.bz2.sig
new file mode 100644
index 0000000000..66cbe789f8
--- /dev/null
+++ b/gnome2-libs/glib2/glib-2.22.1.tar.bz2.sig
diff --git a/gnome2-libs/vte/DETAILS b/gnome2-libs/vte/DETAILS
index b9144463bf..8e0d3b8ac8 100755
--- a/gnome2-libs/vte/DETAILS
+++ b/gnome2-libs/vte/DETAILS
@@ -1,5 +1,5 @@
            SPELL=vte
-         VERSION=0.22.1
+         VERSION=0.22.2
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/gnome2-libs/vte/HISTORY b/gnome2-libs/vte/HISTORY
index 7722ebd60a..be43985626 100644
--- a/gnome2-libs/vte/HISTORY
+++ b/gnome2-libs/vte/HISTORY
@@ -1,3 +1,6 @@
+2009-10-01 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 0.22.2
+
 2009-09-26 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 0.22.1
 
diff --git a/gnome2-libs/vte/vte-0.22.1.tar.bz2.sig b/gnome2-libs/vte/vte-0.22.1.tar.bz2.sig
deleted file mode 100644
index a5ef2ad1b7..0000000000
--- a/gnome2-libs/vte/vte-0.22.1.tar.bz2.sig
+++ /dev/null
diff --git a/gnome2-libs/vte/vte-0.22.2.tar.bz2.sig b/gnome2-libs/vte/vte-0.22.2.tar.bz2.sig
new file mode 100644
index 0000000000..07ca1d06e9
--- /dev/null
+++ b/gnome2-libs/vte/vte-0.22.2.tar.bz2.sig
diff --git a/graphics/f-spot/DETAILS b/graphics/f-spot/DETAILS
index 69e82bb22c..7307146abb 100755
--- a/graphics/f-spot/DETAILS
+++ b/graphics/f-spot/DETAILS
@@ -1,5 +1,5 @@
            SPELL=f-spot
-         VERSION=0.6.1.2
+         VERSION=0.6.1.3
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/graphics/f-spot/HISTORY b/graphics/f-spot/HISTORY
index 7c6c3dd4bf..ec5c9a188a 100644
--- a/graphics/f-spot/HISTORY
+++ b/graphics/f-spot/HISTORY
@@ -1,3 +1,6 @@
+2009-10-01 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 0.6.1.3
+
 2009-09-16 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 0.6.1.2
 
diff --git a/graphics/f-spot/f-spot-0.6.1.2.tar.bz2.sig b/graphics/f-spot/f-spot-0.6.1.2.tar.bz2.sig
deleted file mode 100644
index 0eceb62921..0000000000
--- a/graphics/f-spot/f-spot-0.6.1.2.tar.bz2.sig
+++ /dev/null
diff --git a/graphics/f-spot/f-spot-0.6.1.3.tar.bz2.sig b/graphics/f-spot/f-spot-0.6.1.3.tar.bz2.sig
new file mode 100644
index 0000000000..f63e1920cd
--- /dev/null
+++ b/graphics/f-spot/f-spot-0.6.1.3.tar.bz2.sig
diff --git a/http/arora/BUILD b/http/arora/BUILD
index 8e70f9d64a..eec3de4651 100755
--- a/http/arora/BUILD
+++ b/http/arora/BUILD
@@ -1,7 +1 @@
-QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"  &&
-PATH="$QTDIR/bin/qt4:$PATH"          &&
-
-cd  "$SOURCE_DIRECTORY"              &&
-
-qmake &&
-make
+qt4_build
diff --git a/http/arora/DETAILS b/http/arora/DETAILS
index f3061a79c3..8e40bfb0e7 100755
--- a/http/arora/DETAILS
+++ b/http/arora/DETAILS
@@ -13,10 +13,10 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
    SOURCE_IGNORE=volatile
   FORCE_DOWNLOAD=1
 else
-         VERSION=0.9.0
+         VERSION=0.10.0
           SOURCE=$SPELL-$VERSION.tar.gz
-      SOURCE_URL=http://arora.googlecode.com/files/$SOURCE
-     SOURCE_HASH=sha512:3542b38931038c47759c9d3a886adcfa008d097a3439f0dd0f4ab5801993455fc2a1643c2ba1d52360366b6f09a86597c3b447c0b05e4214178ede3931f07bbd
+   SOURCE_URL[0]=http://arora.googlecode.com/files/$SOURCE
+     SOURCE_HASH=sha512:90bd3eb5e6a808f5b257a62d102c50377d954089249e4d53650d5e35b030d0c77027529bc9285926424e1fd96f17ec80148430cc75e5f9f415870a81b16f79c0
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
 fi
         WEB_SITE=http://code.google.com/p/arora/
diff --git a/http/arora/HISTORY b/http/arora/HISTORY
index 11bb69f655..004ff2a05f 100644
--- a/http/arora/HISTORY
+++ b/http/arora/HISTORY
@@ -1,3 +1,10 @@
+2009-10-01 Bor Kraljič <pyrobor@ver.si>
+	* DETAILS: Fixed SOURCE_URL[0]
+	  updated spell to 0.10.0
+	* desktop/arora.desktop: removed, no longer needed
+	* BUILD: changed to use qt4_build
+	* INSTALL: removed. not needed. it installs everything by default
+
 2009-08-31 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 0.9.0
 
diff --git a/http/arora/INSTALL b/http/arora/INSTALL
deleted file mode 100755
index 93b07c74ed..0000000000
--- a/http/arora/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-cp  "$SOURCE_DIRECTORY/arora"  "$INSTALL_ROOT/usr/bin/"
diff --git a/http/arora/desktop/arora.desktop b/http/arora/desktop/arora.desktop
deleted file mode 100644
index 077fd81ca0..0000000000
--- a/http/arora/desktop/arora.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Arora
-Exec=arora
-Icon=
-Terminal=false
-Type=Application
-Categories=Application;Network;
diff --git a/http/nginx/HISTORY b/http/nginx/HISTORY
index e2e5e4e785..7d8ff6d4e3 100644
--- a/http/nginx/HISTORY
+++ b/http/nginx/HISTORY
@@ -1,3 +1,6 @@
+2009-10-01 Vlad Glagolev <stealth@sourcemage.org>
+	* INSTALL: fixed default rights for cache dir
+
 2009-09-15 Vlad Glagolev <stealth@sourcemage.org>
 	* DETAILS: updated spell to 0.6.39, 0.7.62; SECURITY_PATCH++
 	  (http://www.securityfocus.com/bid/36384)
diff --git a/http/nginx/INSTALL b/http/nginx/INSTALL
index e0eb1a6c4c..18dfe57530 100755
--- a/http/nginx/INSTALL
+++ b/http/nginx/INSTALL
@@ -2,4 +2,4 @@ make_single &&
 default_install &&
 make_normal &&
 
-install -vm 770 -d -o nginx -g nginx "$TEMP_DIR"
+install -vm 775 -d -o nginx -g nginx "$TEMP_DIR"
diff --git a/python-pypi/bpython/DETAILS b/python-pypi/bpython/DETAILS
index 3238841bf0..fa23515834 100755
--- a/python-pypi/bpython/DETAILS
+++ b/python-pypi/bpython/DETAILS
@@ -1,8 +1,8 @@
            SPELL=bpython
-         VERSION=0.9.5.1
+         VERSION=0.9.5.2
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://www.bpython-interpreter.org/releases/$SOURCE
-     SOURCE_HASH=sha512:0f8c31d9b3a3a7bad8204db5b005cdd5adef52dc12e6472320a420b7deaacbc4dfd63a57f9d01ed108376ccef9a40012798825b76a97c146402bca4d3d55ccb6
+     SOURCE_HASH=sha512:c87f19b4256987025b9b828b7d30b732532c14b84fdbd1a0bb6d1a0732da6b030d1adb4d7d66b9267aa1db73661ac644b68df95b1cb310bbef81638e5f72be24
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://www.bpython-interpreter.org/
       LICENSE[0]=MIT
diff --git a/python-pypi/bpython/HISTORY b/python-pypi/bpython/HISTORY
index 98a9d4ebac..995a02495f 100644
--- a/python-pypi/bpython/HISTORY
+++ b/python-pypi/bpython/HISTORY
@@ -1,3 +1,6 @@
+2009-10-01 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 0.9.5.2
+
 2009-09-22 Vlad Glagolev <stealth@sourcemage.org>
 	* DETAILS: updated spell to 0.9.5.1
 
diff --git a/video/ffmpeg/DETAILS b/video/ffmpeg/DETAILS
index 53dd95ed75..9b61a97709 100755
--- a/video/ffmpeg/DETAILS
+++ b/video/ffmpeg/DETAILS
@@ -1,7 +1,7 @@
            SPELL=ffmpeg
          VERSION=0.5
           SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://ffmpeg.org/releases/$SOURCE
      SOURCE_HASH=sha512:46e0c04939bdfd9aaa3ac622952c0eaf15bfd1b971f08591ee6e216bc218237d92844f173782e4ca81a224e39ca5c5ff2b1f30411728508db4d5bad3dc50c0d2
 #case $FFAMR in 
@@ -26,10 +26,10 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
 #esac
         WEB_SITE=http://ffmpeg.sourceforge.net
          ENTERED=20030514
-      PATCHLEVEL=1
+      PATCHLEVEL=2
       LICENSE[0]=GPL
         KEYWORDS="video"
-           SHORT="ffmpeg is complete video and audio broadcasting solution"
+           SHORT="complete video and audio broadcasting solution"
 cat << EOF
 FFMpeg is a complete and free Internet live audio and video
 broadcasting solution for Linux/Unix. It also includes a digital VCR. 
diff --git a/video/ffmpeg/HISTORY b/video/ffmpeg/HISTORY
index d74cc7d97c..eec68b3ba2 100644
--- a/video/ffmpeg/HISTORY
+++ b/video/ffmpeg/HISTORY
@@ -1,3 +1,8 @@
+2009-10-01 Vlad Glagolev <stealth@sourcemage.org>
+	* PRE_BUILD: apply the patch
+	* DETAILS: quoting paths; PATCHLEVEL+=1
+	* libmp3lame.patch: added, fixes ffmpeg Issue803
+
 2009-08-23 Treeve Jelbert <treeve@sourcemage.org>
 	* TRIGGERS: added, for x264
 
diff --git a/video/ffmpeg/PRE_BUILD b/video/ffmpeg/PRE_BUILD
index 0de9ae5062..559b8344b0 100755
--- a/video/ffmpeg/PRE_BUILD
+++ b/video/ffmpeg/PRE_BUILD
@@ -1,5 +1,8 @@
 default_pre_build          &&
-cd $SOURCE_DIRECTORY 	   &&
+cd $SOURCE_DIRECTORY       &&
+
+patch -p0 < "$SPELL_DIRECTORY/libmp3lame.patch" &&
+
 #fix bad pkg-config files
 sed -i \
 -e '/^pkg.*{/,/^}/ s|\$libdir|\$\{prefix\}/lib|;s|\$incdir|\$\{prefix\}/include|'\
diff --git a/video/ffmpeg/libmp3lame.patch b/video/ffmpeg/libmp3lame.patch
new file mode 100644
index 0000000000..4838700ebd
--- /dev/null
+++ b/video/ffmpeg/libmp3lame.patch
@@ -0,0 +1,29 @@
+--- libavcodec/libmp3lame.c.orig 2008-08-09 21:37:36.000000000 +0400
++++ libavcodec/libmp3lame.c 2009-02-03 11:22:37.000000000 +0300
+@@ -34,6 +34,7 @@
+     int stereo;
+     uint8_t buffer[BUFFER_SIZE];
+     int buffer_index;
++    int flushed;
+ } Mp3AudioContext;
+ 
+ static av_cold int MP3lame_encode_init(AVCodecContext *avctx)
+@@ -166,12 +167,18 @@
+                 BUFFER_SIZE - s->buffer_index
+                 );
+         }
++        s->flushed = 0;
+     }else{
++        if (s->flushed)
++            lame_result = 0;
++        else {
++            s->flushed = 1;
+         lame_result= lame_encode_flush(
+                 s->gfp,
+                 s->buffer + s->buffer_index,
+                 BUFFER_SIZE - s->buffer_index
+                 );
++        }
+     }
+ 
+     if(lame_result==-1) {
diff --git a/x11-toolkits/gtk+2/DETAILS b/x11-toolkits/gtk+2/DETAILS
index 2b28d445f2..939f250560 100755
--- a/x11-toolkits/gtk+2/DETAILS
+++ b/x11-toolkits/gtk+2/DETAILS
@@ -1,11 +1,11 @@
            SPELL=gtk+2
 if [[ $GTK_VER == devel ]];then
-         VERSION=2.18.0
+         VERSION=2.18.1
 #     SOURCE_HASH=sha512:bd7c12135f516dce462f3c85500bc83990c36dd1fff83acc2b627f0c18c52a0cde9f296d9f46f0a86c730644b5baa1bb8ef2e60305938290fb50e7a94e8c6b90
           SOURCE=gtk+-$VERSION.tar.bz2
       SOURCE_GPG=gurus.gpg:$SOURCE.sig
 else
-         VERSION=2.18.0
+         VERSION=2.18.1
           SOURCE=gtk+-$VERSION.tar.bz2
       SOURCE_GPG=gurus.gpg:$SOURCE.sig
 fi
diff --git a/x11-toolkits/gtk+2/HISTORY b/x11-toolkits/gtk+2/HISTORY
index 1fee9b8b06..cd924fa067 100644
--- a/x11-toolkits/gtk+2/HISTORY
+++ b/x11-toolkits/gtk+2/HISTORY
@@ -1,3 +1,6 @@
+2009-10-01 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 2.18.1
+
 2009-09-23 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 2.18.0 (devel)
 
diff --git a/x11-toolkits/gtk+2/gtk+-2.18.0.tar.bz2.sig b/x11-toolkits/gtk+2/gtk+-2.18.0.tar.bz2.sig
deleted file mode 100644
index dafb849e84..0000000000
--- a/x11-toolkits/gtk+2/gtk+-2.18.0.tar.bz2.sig
+++ /dev/null
diff --git a/x11-toolkits/gtk+2/gtk+-2.18.1.tar.bz2.sig b/x11-toolkits/gtk+2/gtk+-2.18.1.tar.bz2.sig
new file mode 100644
index 0000000000..59d392a122
--- /dev/null
+++ b/x11-toolkits/gtk+2/gtk+-2.18.1.tar.bz2.sig