summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeve Jelbert2008-01-04 18:08:52 +0100
committerTreeve Jelbert2008-01-04 18:08:52 +0100
commita3948845d2d5d9fe66c567ff48892e5889cc204c (patch)
treed5e098b03f4928988a6598a0363eb4e2daeb97d1
parente504713fed9ce344d1c2263ccac31d1961724ca3 (diff)
parenta995636ceb9a44565670d2734f33920ca8f5ebf4 (diff)
Merge branch 'master' of ssh://treeve@scm.sourcemage.org/smgl/grimoire
-rwxr-xr-xcrypto/gss/DETAILS2
-rw-r--r--crypto/gss/HISTORY3
-rwxr-xr-xftp/transmission/DEPENDS5
-rwxr-xr-xftp/transmission/DETAILS2
-rw-r--r--ftp/transmission/HISTORY4
-rw-r--r--ftp/transmission/transmission-0.96.tar.bz2.sigbin280 -> 0 bytes
-rw-r--r--ftp/transmission/transmission-1.00.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xgnome2-libs/pygobject/DETAILS4
-rw-r--r--gnome2-libs/pygobject/HISTORY4
-rw-r--r--gnome2-libs/pygobject/pygobject-2.14.0.tar.bz2.sigbin287 -> 0 bytes
-rw-r--r--gnome2-libs/pygobject/pygobject-2.14.1.tar.bz2.sigbin0 -> 287 bytes
-rwxr-xr-xhttp/webkitgtk/DETAILS4
-rw-r--r--http/webkitgtk/HISTORY3
-rwxr-xr-xlibs/sdl/DEPENDS5
-rwxr-xr-xlibs/sdl/DETAILS7
-rw-r--r--libs/sdl/HISTORY5
-rwxr-xr-xlibs/sdl/PRE_BUILD2
-rw-r--r--libs/sdl/no-yasm.patch26
-rwxr-xr-xlibs/sdl_image/DEPENDS18
-rwxr-xr-xlibs/sdl_image/DETAILS6
-rw-r--r--libs/sdl_image/HISTORY5
-rwxr-xr-xlibs/sdl_mixer/DETAILS10
-rw-r--r--libs/sdl_mixer/HISTORY3
-rw-r--r--libs/sdl_mixer/timidity.tar.gz.sigbin536 -> 287 bytes
-rwxr-xr-xmail/dovecot/DETAILS8
-rw-r--r--mail/dovecot/HISTORY4
-rwxr-xr-xwindowmanagers/sawfish/DEPENDS14
-rwxr-xr-xx11-toolkits/pygtk2/CONFLICTS2
-rwxr-xr-xx11-toolkits/pygtk2/DEPENDS16
-rwxr-xr-xx11-toolkits/pygtk2/DETAILS10
-rw-r--r--x11-toolkits/pygtk2/HISTORY3
-rw-r--r--x11-toolkits/pygtk2/pygtk-2.12.0.tar.bz2.sigbin536 -> 0 bytes
-rw-r--r--x11-toolkits/pygtk2/pygtk-2.12.1.tar.bz2.sigbin0 -> 287 bytes
33 files changed, 94 insertions, 81 deletions
diff --git a/crypto/gss/DETAILS b/crypto/gss/DETAILS
index 35603268c6..cd73a39f49 100755
--- a/crypto/gss/DETAILS
+++ b/crypto/gss/DETAILS
@@ -1,5 +1,5 @@
SPELL=gss
- VERSION=0.0.22
+ VERSION=0.0.23
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/crypto/gss/HISTORY b/crypto/gss/HISTORY
index 04bf774f21..4b0e4fee84 100644
--- a/crypto/gss/HISTORY
+++ b/crypto/gss/HISTORY
@@ -1,3 +1,6 @@
+2008-01-03 Ladislav Hagara <hgr@vabo.cz>
+ * DETAILS: 0.0.23
+
2007-07-12 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
* B565716F.gpg: added gpg keyring
* DETAILS: updated spell to 0.0.22
diff --git a/ftp/transmission/DEPENDS b/ftp/transmission/DEPENDS
index 50170dcaeb..498ebaab89 100755
--- a/ftp/transmission/DEPENDS
+++ b/ftp/transmission/DEPENDS
@@ -1,6 +1,3 @@
depends openssl &&
-optional_depends gtk+2 \
- "--with-gtk" \
- "" \
- "for the GUI"
+optional_depends gtk+2 "--with-gtk" "" "for GTK+2 client"
diff --git a/ftp/transmission/DETAILS b/ftp/transmission/DETAILS
index 11c723dbd8..3e783c5b49 100755
--- a/ftp/transmission/DETAILS
+++ b/ftp/transmission/DETAILS
@@ -1,5 +1,5 @@
SPELL=transmission
- VERSION=0.96
+ VERSION=1.00
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://download.m0k.org/$SPELL/files/$SOURCE
SOURCE_GPG=gurus.gpg:$SOURCE.sig
diff --git a/ftp/transmission/HISTORY b/ftp/transmission/HISTORY
index 829a3155cb..43b56218d0 100644
--- a/ftp/transmission/HISTORY
+++ b/ftp/transmission/HISTORY
@@ -1,3 +1,7 @@
+2008-01-04 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 1.00
+ * DEPENDS: cleaned up
+
2007-12-31 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: fixed WEB_SITE
diff --git a/ftp/transmission/transmission-0.96.tar.bz2.sig b/ftp/transmission/transmission-0.96.tar.bz2.sig
deleted file mode 100644
index 271a3bf815..0000000000
--- a/ftp/transmission/transmission-0.96.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/ftp/transmission/transmission-1.00.tar.bz2.sig b/ftp/transmission/transmission-1.00.tar.bz2.sig
new file mode 100644
index 0000000000..606861e4a0
--- /dev/null
+++ b/ftp/transmission/transmission-1.00.tar.bz2.sig
Binary files differ
diff --git a/gnome2-libs/pygobject/DETAILS b/gnome2-libs/pygobject/DETAILS
index b62a41eab6..a8b11960a0 100755
--- a/gnome2-libs/pygobject/DETAILS
+++ b/gnome2-libs/pygobject/DETAILS
@@ -1,6 +1,6 @@
SPELL=pygobject
- VERSION=2.14.0
- BRANCH=${VERSION%.?}
+ VERSION=2.14.1
+ BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
diff --git a/gnome2-libs/pygobject/HISTORY b/gnome2-libs/pygobject/HISTORY
index 87a9195a11..25564759b0 100644
--- a/gnome2-libs/pygobject/HISTORY
+++ b/gnome2-libs/pygobject/HISTORY
@@ -1,3 +1,7 @@
+2008-01-03 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 2.14.1
+
2007-12-26 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: Fixed SOURCE_URL[0], cleaned up
updated spell to 2.14.0
diff --git a/gnome2-libs/pygobject/pygobject-2.14.0.tar.bz2.sig b/gnome2-libs/pygobject/pygobject-2.14.0.tar.bz2.sig
deleted file mode 100644
index e53e2032c6..0000000000
--- a/gnome2-libs/pygobject/pygobject-2.14.0.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/gnome2-libs/pygobject/pygobject-2.14.1.tar.bz2.sig b/gnome2-libs/pygobject/pygobject-2.14.1.tar.bz2.sig
new file mode 100644
index 0000000000..bfde9d9b71
--- /dev/null
+++ b/gnome2-libs/pygobject/pygobject-2.14.1.tar.bz2.sig
Binary files differ
diff --git a/http/webkitgtk/DETAILS b/http/webkitgtk/DETAILS
index 8e3f42bb3c..bbfd69392f 100755
--- a/http/webkitgtk/DETAILS
+++ b/http/webkitgtk/DETAILS
@@ -1,8 +1,8 @@
SPELL=webkitgtk
- VERSION=r29079
+ VERSION=r29152
SOURCE=WebKit-$VERSION.tar.bz2
SOURCE_URL[0]=http://nightly.webkit.org/files/trunk/src/$SOURCE
- SOURCE_HASH=sha512:2322f9a9a9986d2bd3760c24f5e906c093ab3a8ce06c921632255c34303ab6a3c9b1364a4c6498f983596484fb11b137b92bc896f47548197da2cf51e4da43a1
+ SOURCE_HASH=sha512:22a7ab70ac35378779e5884c55b2ca0943fc8c27b826f2808b1b2f6d7dd5199e0de805effc3613509bb3cb90e4e9e853298c220d6c99b20ba6698ad03ff16b51
SOURCE_DIRECTORY=$BUILD_DIRECTORY/WebKit-$VERSION
WEB_SITE=http://webkit.org/
LICENSE[0]=GPL
diff --git a/http/webkitgtk/HISTORY b/http/webkitgtk/HISTORY
index 8a6938fe2a..84f33617a1 100644
--- a/http/webkitgtk/HISTORY
+++ b/http/webkitgtk/HISTORY
@@ -1,3 +1,6 @@
+2008-01-04 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to r29152
+
2008-01-02 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated to build 29079, cleaned up
* DEPENDS, BUILD, PRE_BUILD: qmake => autotools
diff --git a/libs/sdl/DEPENDS b/libs/sdl/DEPENDS
index d410495ab1..34a693ba6b 100755
--- a/libs/sdl/DEPENDS
+++ b/libs/sdl/DEPENDS
@@ -50,6 +50,11 @@ optional_depends directfb \
"--enable-video-directfb=no" \
"for DirectFB support" &&
+optional_depends pulseaudio \
+ "--enable-pulseaudio" \
+ "--disable-pulseaudio" \
+ "for PulseAudio output support" &&
+
source $GRIMOIRE/FUNCTIONS &&
if check_if_xorg_modular_libs
diff --git a/libs/sdl/DETAILS b/libs/sdl/DETAILS
index 98bf2006e1..001dedcd9d 100755
--- a/libs/sdl/DETAILS
+++ b/libs/sdl/DETAILS
@@ -1,15 +1,14 @@
SPELL=sdl
- VERSION=1.2.11
+ VERSION=1.2.13
SOURCE=SDL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
SOURCE_GPG=A7763BE6.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE_DIRECTORY=$BUILD_DIRECTORY/SDL-$VERSION
SOURCE_URL[0]=http://www.libsdl.org/release/$SOURCE
- SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
- WEB_SITE=http://www.libsdl.org
+ SOURCE2_URL[0]=$SOURCE_URL[0].sig
+ WEB_SITE=http://www.libsdl.org/
ENTERED=20010922
- UPDATED=20040216
LICENSE[0]=LGPL
DOCS="docs/html docs/index.html COPYING README*"
KEYWORDS="libs"
diff --git a/libs/sdl/HISTORY b/libs/sdl/HISTORY
index a826d25a3f..594121217c 100644
--- a/libs/sdl/HISTORY
+++ b/libs/sdl/HISTORY
@@ -1,3 +1,8 @@
+2008-01-04 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 1.2.13
+ * DEPENDS: added pulseaudio as optional
+ * PRE_BUILD: removed no-yasm patch
+
2007-07-12 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
* DETAILS: converted to upstream signature checking
* A7763BE6.gpg: added gpg keyring
diff --git a/libs/sdl/PRE_BUILD b/libs/sdl/PRE_BUILD
index f32ccf33f5..74b2580ae8 100755
--- a/libs/sdl/PRE_BUILD
+++ b/libs/sdl/PRE_BUILD
@@ -1,7 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SCRIPT_DIRECTORY/no-yasm.patch &&
-
mkdir -p smgl &&
cp $SCRIPT_DIRECTORY/sdl smgl/ &&
cp $SCRIPT_DIRECTORY/sdl.sh smgl/
diff --git a/libs/sdl/no-yasm.patch b/libs/sdl/no-yasm.patch
deleted file mode 100644
index 3409ebcac4..0000000000
--- a/libs/sdl/no-yasm.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- configure.in 2006-07-19 15:29:05.000000000 +0200
-+++ configure.in 2006-07-19 15:29:11.000000000 +0200
-@@ -597,10 +597,7 @@
- AC_HELP_STRING([--enable-nasm], [use nasm assembly blitters on x86 [[default=yes]]]),
- , enable_nasm=yes)
- if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_nasm = xyes; then
-- AC_PATH_PROG(NASM, yasm)
-- if test "x$NASM" = x -o "x$NASM" = x'"$NASM"'; then
-- AC_PATH_PROG(NASM, nasm)
-- fi
-+ AC_PATH_PROG(NASM, nasm)
- if test "x$NASM" != x -a "x$NASM" != x'"$NASM"'; then
- AC_DEFINE(SDL_HERMES_BLITTERS)
- SOURCES="$SOURCES $srcdir/src/hermes/*.asm"
---- configure~ 2006-07-24 18:30:23.000000000 +0200
-+++ configure 2006-07-24 18:33:03.000000000 +0200
-@@ -25062,7 +25062,7 @@ else
- fi;
- if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_nasm = xyes; then
- # Extract the first word of "yasm", so it can be a program name with args.
--set dummy yasm; ac_word=$2
-+set dummy nasm; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_NASM+set}" = set; then
-
diff --git a/libs/sdl_image/DEPENDS b/libs/sdl_image/DEPENDS
index 865c856dc2..2e401398e7 100755
--- a/libs/sdl_image/DEPENDS
+++ b/libs/sdl_image/DEPENDS
@@ -1,2 +1,16 @@
-depends libpng &&
-depends sdl
+depends sdl &&
+
+optional_depends libpng \
+ "--enable-png" \
+ "--disable-png" \
+ "for PNG support" &&
+
+optional_depends jpeg \
+ "--enable-jpg" \
+ "--disable-jpg" \
+ "for JPG support" &&
+
+optional_depends tiff \
+ "--enable-tif" \
+ "--disable-tif" \
+ "for TIFF support"
diff --git a/libs/sdl_image/DETAILS b/libs/sdl_image/DETAILS
index 2469d643af..cbe912a37f 100755
--- a/libs/sdl_image/DETAILS
+++ b/libs/sdl_image/DETAILS
@@ -1,13 +1,11 @@
SPELL=sdl_image
- VERSION=1.2.5
+ VERSION=1.2.6
SOURCE=SDL_image-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/SDL_image-$VERSION
SOURCE_URL[0]=http://www.libsdl.org/projects/SDL_image/release/$SOURCE
- SOURCE_HASH=sha512:cb2b25868e5814c9dd8ea0e4bf3f0b9df587103f64d9fd354c0612cc7cea49d97a9a8f1cab81d196a613d28a4d12764bb8e54904c726256964bcae1a500e17ce
-# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ SOURCE_HASH=sha512:ec6ec4060021f89ce2e4e3ffa573addf314814ac0ee25083c2acc954a230da653fe1509e5e136d8f697391b000c6dc673fc288e18c7758c1ade17afc6620e400
WEB_SITE=http://www.libsdl.org/projects/SDL_image
ENTERED=20010922
- UPDATED=20020424
LICENSE[0]=LGPL
KEYWORDS="sdl images libs"
SHORT="Simple library to load images of various formats as SDL surfaces."
diff --git a/libs/sdl_image/HISTORY b/libs/sdl_image/HISTORY
index e352401a25..829a147e29 100644
--- a/libs/sdl_image/HISTORY
+++ b/libs/sdl_image/HISTORY
@@ -1,3 +1,7 @@
+2008-01-04 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 1.2.6
+ * DEPENDS: libpng [req -> opt], tiff [opt], jpeg [opt]
+
2006-09-21 Juuso Alasuutari <iuso@sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.
@@ -28,4 +32,3 @@
2002-10-09 Julian v. Bock <julian@wongr.net>
* DETAILS: add LICENSE and MD5 fields.
-
diff --git a/libs/sdl_mixer/DETAILS b/libs/sdl_mixer/DETAILS
index bd1e7a74ab..d5537bbf42 100755
--- a/libs/sdl_mixer/DETAILS
+++ b/libs/sdl_mixer/DETAILS
@@ -1,20 +1,16 @@
SPELL=sdl_mixer
- VERSION=1.2.7
+ VERSION=1.2.8
SOURCE=SDL_mixer-$VERSION.tar.gz
SOURCE2=timidity.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/SDL_mixer-$VERSION
SOURCE_URL[0]=http://www.libsdl.org/projects/SDL_mixer/release/$SOURCE
SOURCE2_URL[0]=http://www.libsdl.org/projects/SDL_mixer/timidity/$SOURCE2
-
- SOURCE_HASH=sha512:d7f818adacbd233a2518a4ece451401a2603cadc24eabb2a1a43a3eefbf287f18027d11b63f3579b9c572e77843dafb1a6068867dbaa0f5389ef8d121aab6cb6
-# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
-
- SOURCE2_GPG="gurus.gpg:${SOURCE2}.sig"
+ SOURCE_HASH=sha512:e38d00661319b1e16648dcb1ae990f51978bd1c1ca299f5faf979e83f9731cacec7b118a631d5512cd653723bd2f676e8e99c21edabcc803da1d76ebbacdf60a
+ SOURCE2_GPG=gurus.gpg:$SOURCE2.sig
WEB_SITE=http://www.libsdl.org/projects/SDL_mixer/
ENTERED=20010922
LICENSE[0]=LGPL
KEYWORDS="mixer sdl libs"
- PATCHLEVEL=1
SHORT="SDL multi-channel audio mixer"
cat << EOF
SDL_mixer is a simple multi-channel audio mixer. It supports 8 channels
diff --git a/libs/sdl_mixer/HISTORY b/libs/sdl_mixer/HISTORY
index 67b485ac78..fc09e5f0bd 100644
--- a/libs/sdl_mixer/HISTORY
+++ b/libs/sdl_mixer/HISTORY
@@ -1,3 +1,6 @@
+2008-01-04 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 1.2.8
+
2007-11-04 Arjan Bouter <abouter@sourcemage.org>
* DETAILS: patchlevel++, removed UPDATED
* DEPENDS: fixed mikmod options
diff --git a/libs/sdl_mixer/timidity.tar.gz.sig b/libs/sdl_mixer/timidity.tar.gz.sig
index 17e0c3e33a..529fd37563 100644
--- a/libs/sdl_mixer/timidity.tar.gz.sig
+++ b/libs/sdl_mixer/timidity.tar.gz.sig
Binary files differ
diff --git a/mail/dovecot/DETAILS b/mail/dovecot/DETAILS
index 12c2aac567..7662e998f2 100755
--- a/mail/dovecot/DETAILS
+++ b/mail/dovecot/DETAILS
@@ -1,5 +1,5 @@
SPELL=dovecot
- VERSION=1.0.8
+ VERSION=1.0.10
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
@@ -15,9 +15,9 @@ if [[ "$DOVECOT_EXT_LDA" == "y" ]]; then
SOURCE4_IGNORE=signature
SOURCE3_GPG="dovecot.gpg:${SOURCE4}:UPSTREAM_KEY"
if [[ "$DOVECOT_MANAGESIEVE" == "y" ]]; then
- VERSION3=1.0.7
- VERSION4=v9
- SOURCE5_HASH=sha512:2d648f59fbb959d1868512ef07b37b7606d2177589b68c372686a9ba9d4010510307b68abf3e21ac044aa98ed95541b2bad85a6e6773e1a24df5531a60b5ff05
+ VERSION3=1.0.10
+ VERSION4=v9.1
+ SOURCE5_HASH=sha512:25a0e8e73a050f79108deb1887cde58f97ec4dad49a738ee7dffd38c7c29f2e1a8c1d0278dbaf0c8413f14943672c63c7dcc282624b4f7e3c60f13492b00ea47
SOURCE5=$SPELL-$VERSION3-MANAGESIEVE-$VERSION4.diff.gz
SOURCE5_URL[0]=http://sinas.rename-it.nl/~sirius/$SOURCE5
fi
diff --git a/mail/dovecot/HISTORY b/mail/dovecot/HISTORY
index 564a3d5dc9..a53490d1d5 100644
--- a/mail/dovecot/HISTORY
+++ b/mail/dovecot/HISTORY
@@ -1,3 +1,7 @@
+2008-01-03 Arjan Bouter <abouter@sourcemage.org>
+ * DETAILS: updated to 1.0.10, sieve 1.0.2 and
+ managesieve to 1.0.10 v9.1
+
2007-11-30 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
* DETAILS: updated spell to 1.0.8
updated managesieve patch to v9
diff --git a/windowmanagers/sawfish/DEPENDS b/windowmanagers/sawfish/DEPENDS
index a9e3fa9bfc..52da1055ab 100755
--- a/windowmanagers/sawfish/DEPENDS
+++ b/windowmanagers/sawfish/DEPENDS
@@ -1,11 +1,11 @@
-depends rep-gtk2 &&
-optional_depends audiofile "--with-audiofile" "--without-audiofile" \
- "use audiofile?" &&
-optional_depends esound "--with-esd" "--with-esd" "for esound support" &&
-optional_depends imlib "--without-gdk-pixbuf" "--with-gdk-pixbuf" \
- "use imlib instead of gdk-pixbuf for images?" &&
+depends rep-gtk2 &&
+optional_depends audiofile "--with-audiofile" "--without-audiofile" \
+ "use audiofile?" &&
+optional_depends esound "--with-esd" "--without-esd" "for esound support" &&
+optional_depends imlib "--without-gdk-pixbuf" "--with-gdk-pixbuf" \
+ "use imlib instead of gdk-pixbuf for images?" &&
-optional_depends libgnome "" "" "for gnome support" &&
+optional_depends libgnome "" "" "for gnome support" &&
if [ "${SAWFISH_CVS}" = "y" ] ; then
depends CVS
diff --git a/x11-toolkits/pygtk2/CONFLICTS b/x11-toolkits/pygtk2/CONFLICTS
index a4c0bd398f..15d152e3f1 100755
--- a/x11-toolkits/pygtk2/CONFLICTS
+++ b/x11-toolkits/pygtk2/CONFLICTS
@@ -1 +1 @@
-conflicts pygtk
+conflicts pygtk
diff --git a/x11-toolkits/pygtk2/DEPENDS b/x11-toolkits/pygtk2/DEPENDS
index b1e2a73eb2..6a67200032 100755
--- a/x11-toolkits/pygtk2/DEPENDS
+++ b/x11-toolkits/pygtk2/DEPENDS
@@ -1,9 +1,9 @@
-depends pygobject &&
-depends gtk+2 &&
-depends libglade2 &&
-depends pycairo &&
+depends pygobject &&
+depends gtk+2 &&
+depends libglade2 &&
+depends pycairo &&
-optional_depends numpy \
- "" \
- "--disable-numpy" \
- 'for python numerical support'
+optional_depends numpy \
+ "" \
+ "--disable-numpy" \
+ "for python numerical support"
diff --git a/x11-toolkits/pygtk2/DETAILS b/x11-toolkits/pygtk2/DETAILS
index 5bb828edfe..4befa13f5e 100755
--- a/x11-toolkits/pygtk2/DETAILS
+++ b/x11-toolkits/pygtk2/DETAILS
@@ -1,17 +1,17 @@
SPELL=pygtk2
- VERSION=2.12.0
+ VERSION=2.12.1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=pygtk-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/pygtk-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/pygtk/$BRANCH/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig
LICENSE[0]=LGPL
- WEB_SITE=http://www.pygtk.org
+ WEB_SITE=http://www.pygtk.org/
ENTERED=20020523
KEYWORDS="python x11 libs"
- SHORT="pygtk is a set of python bindings for GTK."
+ SHORT="pygtk2 is a set of python bindings for GTK+2"
cat << EOF
-PyGTK is a set of bindings for the GTK widget set. It provides an
+PyGTK2 is a set of bindings for the GTK widget set. It provides an
object oriented interface that is slightly higher level than the C one.
It automatically does all the type casting and reference counting that
you would have to do normally with the C API.
diff --git a/x11-toolkits/pygtk2/HISTORY b/x11-toolkits/pygtk2/HISTORY
index 4a8bf19097..b16e368467 100644
--- a/x11-toolkits/pygtk2/HISTORY
+++ b/x11-toolkits/pygtk2/HISTORY
@@ -1,3 +1,6 @@
+2008-01-04 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 2.12.1, cleaned up
+
2007-09-20 Robin Cook <rcook@wyrms.net>
* DETAILS: updated VERSION to 2.12.0
diff --git a/x11-toolkits/pygtk2/pygtk-2.12.0.tar.bz2.sig b/x11-toolkits/pygtk2/pygtk-2.12.0.tar.bz2.sig
deleted file mode 100644
index 41724f226b..0000000000
--- a/x11-toolkits/pygtk2/pygtk-2.12.0.tar.bz2.sig
+++ /dev/null
Binary files differ
diff --git a/x11-toolkits/pygtk2/pygtk-2.12.1.tar.bz2.sig b/x11-toolkits/pygtk2/pygtk-2.12.1.tar.bz2.sig
new file mode 100644
index 0000000000..3952cf3b04
--- /dev/null
+++ b/x11-toolkits/pygtk2/pygtk-2.12.1.tar.bz2.sig
Binary files differ