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

25 files changed, 68 insertions, 54 deletions

diff --git a/disk/brasero/DEPENDS b/disk/brasero/DEPENDS
index 30a62c118b..9e3aec7b7d 100755
--- a/disk/brasero/DEPENDS
+++ b/disk/brasero/DEPENDS
@@ -1,6 +1,8 @@
 depends gnome-vfs2  &&
 depends gst-plugins-good  &&
 depends libxml2  &&
+depends gstreamer  &&
+depends gst-plugins-base  &&
 optional_depends CD-BURN-UTILITY  ""  ""  "to burn CDs"  &&
 optional_depends dvd+rw-tools  ""  ""  "to burn DVDs"  &&
 optional_depends totem "--enable-playlist" "--disable-playlist" "For playlist pane"  &&
diff --git a/disk/brasero/HISTORY b/disk/brasero/HISTORY
index 230010df1d..8f19fb05c0 100644
--- a/disk/brasero/HISTORY
+++ b/disk/brasero/HISTORY
@@ -1,3 +1,6 @@
+2009-10-09 Ladislav Hagara <hgr@vabo.cz>
+	* DEPENDS: added gstreamer and gst-plugins-base #15455
+
 2009-10-05 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 2.28.1
 
diff --git a/gnome2-libs/gconf2/HISTORY b/gnome2-libs/gconf2/HISTORY
index db59ffb5ff..a7a9092485 100644
--- a/gnome2-libs/gconf2/HISTORY
+++ b/gnome2-libs/gconf2/HISTORY
@@ -1,3 +1,7 @@
+2009-10-08 Eric Sandall <sandalle@sourcemage.org>
+	* PRE_BUILD: Don't apply defaults.patch, fixes Bug #15445
+	* defaults.patch: Removed
+
 2009-09-24 Vlad Glagolev <stealth@sourcemage.org>
 	* DEPENDS: added openldap opt dep, policykit is optional again too!
 	* defaults.patch: added, to fix compilation
diff --git a/gnome2-libs/gconf2/PRE_BUILD b/gnome2-libs/gconf2/PRE_BUILD
index 54dfbd3e86..06d429e0d4 100755
--- a/gnome2-libs/gconf2/PRE_BUILD
+++ b/gnome2-libs/gconf2/PRE_BUILD
@@ -1,7 +1,5 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
-patch -p0 < "$SPELL_DIRECTORY/defaults.patch" &&
-
 patch $SOURCE_DIRECTORY/Makefile.in             \
       $SCRIPT_DIRECTORY/gconf.xml.system.patch
diff --git a/gnome2-libs/gconf2/defaults.patch b/gnome2-libs/gconf2/defaults.patch
deleted file mode 100644
index 4effcf5f2a..0000000000
--- a/gnome2-libs/gconf2/defaults.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- defaults/Makefile.in.orig	2009-09-22 16:54:11.000000000 +0400
-+++ defaults/Makefile.in	2009-09-24 00:34:28.749574347 +0400
-@@ -260,11 +260,11 @@
- 	-I$(top_srcdir) \
- 	-I$(top_builddir) \
- 	-DSYSGCONFDIR=\"$(sysgconfdir)\" \
--	$(DEFAULTS_CFLAGS)
-+	$(DEPENDENT_CFLAGS)
- 
- gconf_defaults_mechanism_LDADD = \
- 	$(top_builddir)/gconf/libgconf-2.la \
--	$(DEFAULTS_LIBS)
-+	$(DEPENDENT_LIBS)
- 
- BUILT_SOURCES = gconf-defaults-glue.h
- dbus_servicesdir = $(datadir)/dbus-1/system-services
diff --git a/libs/libdrm/DETAILS b/libs/libdrm/DETAILS
index 154946dc99..0514374fd0 100755
--- a/libs/libdrm/DETAILS
+++ b/libs/libdrm/DETAILS
@@ -11,7 +11,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/drm-git"
    SOURCE_IGNORE=volatile
   FORCE_DOWNLOAD=1
 else
-         VERSION=2.4.14
+         VERSION=2.4.15
 #     SOURCE_HASH=sha512:92ee0c40396c77fd32570660bfc3358a76fed46cb4d918809dd295c76b032d01658156aa715896547de2bed68bab5cfa79e76481f25f5f5c4d44c2e02f6b94fd
           SOURCE=${SPELL}-${VERSION}.tar.bz2
    SOURCE_URL[0]=http://dri.freedesktop.org/${SPELL}/${SOURCE}
diff --git a/libs/libdrm/HISTORY b/libs/libdrm/HISTORY
index c324e9da6b..1f7442c6ef 100644
--- a/libs/libdrm/HISTORY
+++ b/libs/libdrm/HISTORY
@@ -1,3 +1,7 @@
+2009-10-08 Eric Sandall <sandalle@sourcemage.org>
+	* DETAILS: Updated to 2.4.15
+	  SOURCE matches upstream posted MD5
+
 2009-10-01 Eric Sandall <sandalle@sourcemage.org>
 	* DETAILS: Updated to 2.4.14
 	  SOURCE matches upstream posted MD5
diff --git a/libs/libdrm/libdrm-2.4.14.tar.bz2.sig b/libs/libdrm/libdrm-2.4.14.tar.bz2.sig
deleted file mode 100644
index a28c1de267..0000000000
--- a/libs/libdrm/libdrm-2.4.14.tar.bz2.sig
+++ /dev/null
diff --git a/libs/libdrm/libdrm-2.4.15.tar.bz2.sig b/libs/libdrm/libdrm-2.4.15.tar.bz2.sig
new file mode 100644
index 0000000000..424b822793
--- /dev/null
+++ b/libs/libdrm/libdrm-2.4.15.tar.bz2.sig
diff --git a/video/totem-pl-parser/DEPENDS b/video/totem-pl-parser/DEPENDS
index f6dc591707..bbed0a76f6 100755
--- a/video/totem-pl-parser/DEPENDS
+++ b/video/totem-pl-parser/DEPENDS
@@ -1,5 +1,5 @@
 depends glib2                  &&
-depends gmime                  &&
+depends -sub "2.4" gmime       &&
 depends gtk+2                  &&
 depends libxml2                &&
 depends gnome-vfs2             &&
diff --git a/video/totem-pl-parser/HISTORY b/video/totem-pl-parser/HISTORY
index b31ed86afe..060e2154b5 100644
--- a/video/totem-pl-parser/HISTORY
+++ b/video/totem-pl-parser/HISTORY
@@ -1,3 +1,6 @@
+2009-10-09 Ladislav Hagara <hgr@vabo.cz>
+	* DEPENDS: depends gmime -> depends -sub "2.4" gmime #15454
+
 2009-10-01 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 2.28.1
 
diff --git a/xorg-app/luit/DETAILS b/xorg-app/luit/DETAILS
index ffed9c973a..210ea94f55 100755
--- a/xorg-app/luit/DETAILS
+++ b/xorg-app/luit/DETAILS
@@ -1,23 +1,22 @@
            SPELL=luit
-             PKG=luit
-         VERSION=1.0.3
-        XORG_VER=X11R7.0
-          SOURCE=${PKG}-${VERSION}.tar.bz2
+         VERSION=1.0.4
+          SOURCE=$SPELL-$VERSION.tar.bz2
+      SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
    SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/app/${SOURCE}
-     SOURCE_HASH=sha512:05a90000a66ad8aef9843674b50b2fa339bd4c3109bed54780240dbcef11403b4659cb6b4e96106fcbc1f5cbdde661d4f70334d43cc9fac9a8d7f05225696872
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
+#     SOURCE_HASH=sha512:05a90000a66ad8aef9843674b50b2fa339bd4c3109bed54780240dbcef11403b4659cb6b4e96106fcbc1f5cbdde661d4f70334d43cc9fac9a8d7f05225696872
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://xorg.freedesktop.org
          ENTERED=20051125
       LICENSE[0]=XCL
            SHORT="Locale and ISO 2022 support for Unicode terminals"
 cat << EOF
 Luit is a filter that can be run between an arbitrary application and a
-UTF-8 terminal emulator.  It will convert application output from the 
-locale's encoding into UTF-8, and convert terminal input from UTF-8 
+UTF-8 terminal emulator.  It will convert application output from the
+locale's encoding into UTF-8, and convert terminal input from UTF-8
 into the locale's encoding.
 
-An application may also request to a different output encoding using 
-ISO 2022 and ISO 6429 escape sequences.  Use of this feature is 
-discouraged: multilingual applications should be modified to directly 
+An application may also request to a different output encoding using
+ISO 2022 and ISO 6429 escape sequences.  Use of this feature is
+discouraged: multilingual applications should be modified to directly
 generate UTF-8 instead.
 EOF
diff --git a/xorg-app/luit/HISTORY b/xorg-app/luit/HISTORY
index 6512920e22..d495c4d639 100644
--- a/xorg-app/luit/HISTORY
+++ b/xorg-app/luit/HISTORY
@@ -1,3 +1,8 @@
+2009-10-08 Eric Sandall <sandalle@sourcemage.org>
+	* DETAILS: Updated to 1.0.4
+	  SOURCE matches upstream posted MD5
+	  Removed XORG_VER and PKG
+
 2008-03-17 Eric Sandall <sandalle@sourcemage.org>
 	* CONFLICTS: Auto-conflicts with xorg as well
 
diff --git a/xorg-app/luit/luit-1.0.4.tar.bz2.sig b/xorg-app/luit/luit-1.0.4.tar.bz2.sig
new file mode 100644
index 0000000000..8c58f3f8b8
--- /dev/null
+++ b/xorg-app/luit/luit-1.0.4.tar.bz2.sig
diff --git a/xorg-app/luit/luit-X11R7.0-1.0.1.tar.bz2.sig b/xorg-app/luit/luit-X11R7.0-1.0.1.tar.bz2.sig
deleted file mode 100755
index 6f01a05b93..0000000000
--- a/xorg-app/luit/luit-X11R7.0-1.0.1.tar.bz2.sig
+++ /dev/null
diff --git a/xorg-app/mkcomposecache/DETAILS b/xorg-app/mkcomposecache/DETAILS
index 1b00a18636..e3f014ea10 100755
--- a/xorg-app/mkcomposecache/DETAILS
+++ b/xorg-app/mkcomposecache/DETAILS
@@ -1,11 +1,10 @@
            SPELL=mkcomposecache
-             PKG=mkcomposecache
-         VERSION=1.2
-        XORG_VER=X11R7.1
-          SOURCE=${PKG}-${VERSION}.tar.bz2
+         VERSION=1.2.1
+          SOURCE=$SPELL-$VERSION.tar.bz2
+      SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
    SOURCE_URL[0]=ftp://ftp.x.org/pub/individual/app/$SOURCE
-     SOURCE_HASH=sha512:e81101dbf3324341a2aa6b12a6f1a67bf18484f69edc86e38f78f30b2e62d4d3a98d65dbd05540dfe437d739b5cdd330d1e381da87ec3fe4fe7c42fcef58aad7
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
+#     SOURCE_HASH=sha512:e81101dbf3324341a2aa6b12a6f1a67bf18484f69edc86e38f78f30b2e62d4d3a98d65dbd05540dfe437d739b5cdd330d1e381da87ec3fe4fe7c42fcef58aad7
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://xorg.freedesktop.org
          ENTERED=20060828
       LICENSE[0]=XCL
diff --git a/xorg-app/mkcomposecache/HISTORY b/xorg-app/mkcomposecache/HISTORY
index 31e62a7e4a..38d9d59859 100644
--- a/xorg-app/mkcomposecache/HISTORY
+++ b/xorg-app/mkcomposecache/HISTORY
@@ -1,3 +1,8 @@
+2009-10-08 Eric Sandall <sandalle@sourcemage.org>
+	* DETAILS: Updated to 1.2.1
+	  SOURCE matches upstream posted MD5
+	  Removed XORG_VER and PKG
+
 2008-03-17 Eric Sandall <sandalle@sourcemage.org>
 	* CONFLICTS: Auto-conflicts with xorg as well
 
diff --git a/xorg-app/mkcomposecache/mkcomposecache-1.2.1.tar.bz2.sig b/xorg-app/mkcomposecache/mkcomposecache-1.2.1.tar.bz2.sig
new file mode 100644
index 0000000000..457b77cdd6
--- /dev/null
+++ b/xorg-app/mkcomposecache/mkcomposecache-1.2.1.tar.bz2.sig
diff --git a/xorg-app/xmodmap/DETAILS b/xorg-app/xmodmap/DETAILS
index 2f705d21f9..5932713ebf 100755
--- a/xorg-app/xmodmap/DETAILS
+++ b/xorg-app/xmodmap/DETAILS
@@ -1,11 +1,10 @@
            SPELL=xmodmap
-             PKG=xmodmap
-         VERSION=1.0.3
-        XORG_VER=X11R7.1
-          SOURCE=${PKG}-${VERSION}.tar.bz2
+         VERSION=1.0.4
+          SOURCE=$SPELL-$VERSION.tar.bz2
+      SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
    SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/app/${SOURCE}
-     SOURCE_HASH=sha512:cf38270af70e04861a9ac8c0ffaaa5e2bc3a041a588d381707999df5d588c1342a0229ba1f5bc9dc48d725e8dc398d2fd5da9ee53ca267fdfd5d7d408fccd357
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
+#     SOURCE_HASH=sha512:cf38270af70e04861a9ac8c0ffaaa5e2bc3a041a588d381707999df5d588c1342a0229ba1f5bc9dc48d725e8dc398d2fd5da9ee53ca267fdfd5d7d408fccd357
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://xorg.freedesktop.org
          ENTERED=20051125
       LICENSE[0]=XCL
diff --git a/xorg-app/xmodmap/HISTORY b/xorg-app/xmodmap/HISTORY
index 9ffed0c78a..7c8431a728 100644
--- a/xorg-app/xmodmap/HISTORY
+++ b/xorg-app/xmodmap/HISTORY
@@ -1,3 +1,8 @@
+2009-10-08 Eric Sandall <sandalle@sourcemage.org>
+	* DETAILS: Updated to 1.0.4
+	  SOURCE matches upstream posted MD5
+	  Removed XORG_VER and PKG
+
 2008-03-17 Eric Sandall <sandalle@sourcemage.org>
 	* CONFLICTS: Auto-conflicts with xorg as well
 
diff --git a/xorg-app/xmodmap/xmodmap-1.0.4.tar.bz2.sig b/xorg-app/xmodmap/xmodmap-1.0.4.tar.bz2.sig
new file mode 100644
index 0000000000..e0e920c3db
--- /dev/null
+++ b/xorg-app/xmodmap/xmodmap-1.0.4.tar.bz2.sig
diff --git a/xorg-lib/libxfontcache/DEPENDS b/xorg-lib/libxfontcache/DEPENDS
index b9e83eabd6..d08ae417f7 100755
--- a/xorg-lib/libxfontcache/DEPENDS
+++ b/xorg-lib/libxfontcache/DEPENDS
@@ -5,5 +5,4 @@ depends  util-macros     &&
 depends  xextproto       &&
 depends  fontcacheproto  &&
 depends  libx11          &&
-depends  libxext         
-
+depends  libxext
diff --git a/xorg-lib/libxfontcache/DETAILS b/xorg-lib/libxfontcache/DETAILS
index 32fe681e44..3d92c5be41 100755
--- a/xorg-lib/libxfontcache/DETAILS
+++ b/xorg-lib/libxfontcache/DETAILS
@@ -1,16 +1,16 @@
            SPELL=libxfontcache
              PKG=libXfontcache
-         VERSION=1.0.4
-        XORG_VER=X11R7.1
+         VERSION=1.0.5
           SOURCE=${PKG}-${VERSION}.tar.bz2
+      SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
    SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/lib/${SOURCE}
-     SOURCE_HASH=sha512:241121a3d262be7632c774770efe3df97808cfc28a174e618641c59b83acbb570073d73a48f34311fdac299c07c5da64d3bb212fa36dd8c584ae46b8b8270e75
+#     SOURCE_HASH=sha512:241121a3d262be7632c774770efe3df97808cfc28a174e618641c59b83acbb570073d73a48f34311fdac299c07c5da64d3bb212fa36dd8c584ae46b8b8270e75
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
         WEB_SITE=http://xorg.freedesktop.org
          ENTERED=20051125
       LICENSE[0]=XCL
            SHORT="X-TrueType font cache extension client library"
 cat << EOF
-FontCache is an extension that is used by X-TrueType to cache 
+FontCache is an extension that is used by X-TrueType to cache
 informations about fonts.
 EOF
diff --git a/xorg-lib/libxfontcache/HISTORY b/xorg-lib/libxfontcache/HISTORY
index c7ccda5ed9..b2df9870ba 100644
--- a/xorg-lib/libxfontcache/HISTORY
+++ b/xorg-lib/libxfontcache/HISTORY
@@ -1,3 +1,8 @@
+2009-10-08 Eric Sandall <sandalle@sourcemage.org>
+	* DETAILS: Updated to 1.0.5
+	  SOURCE matches upstream posted MD5
+	  Removed XORG_VER
+
 2008-03-17 Eric Sandall <sandalle@sourcemage.org>
 	* CONFLICTS: Auto-conflicts with xorg as well
 
@@ -13,7 +18,7 @@
 2006-10-22 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
 	* DETAILS: version 1.0.3
 
-2006-05-23 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> 
+2006-05-23 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
 	* DETAILS: version update xorg 7.1
 
 2005-12-26 Robin Cook <rcook@wyrms.net>
@@ -37,11 +42,11 @@
 2005-11-25 Karsten Behrmann <BearPerson@sourcemage.org>
 	* DEPENDS: auto-created or updated
 
-2005-11-24 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> 
-	* DEPENDS: added various depends 
+2005-11-24 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
+	* DEPENDS: added various depends
 
-2005-11-24 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> 
-	* DETAILS: fix broken SOURCE_URL 
+2005-11-24 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
+	* DETAILS: fix broken SOURCE_URL
 
 2005-11-25 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
 	* DETAILS, HISTORY: created spell
diff --git a/xorg-lib/libxfontcache/libXfontcache-1.0.5.tar.bz2.sig b/xorg-lib/libxfontcache/libXfontcache-1.0.5.tar.bz2.sig
new file mode 100644
index 0000000000..b72303ad07
--- /dev/null
+++ b/xorg-lib/libxfontcache/libXfontcache-1.0.5.tar.bz2.sig