New release: 2.12.0

Package-Manager: portage-2.0.51.22-r2

6 files changed, 29 insertions, 35 deletions

diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index 62bb320e52ef..5ae02aa0b0f0 100644
--- a/gnome-base/control-center/ChangeLog
+++ b/gnome-base/control-center/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/control-center
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.131 2005/09/03 20:18:06 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.132 2005/09/07 02:05:04 leonardop Exp $
+
+*control-center-2.12.0 (07 Sep 2005)
+
+  07 Sep 2005; Leonardo Boshell <leonardop@gentoo.org>
+  -files/control-center-2.11.91-xft_check.patch,
+  -control-center-2.11.92.ebuild, +control-center-2.12.0.ebuild:
+  New version.
 
   03 Sep 2005; Markus Rothe <corsair@gentoo.org>
   control-center-2.10.2.ebuild:
diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest
index a2b423067e9a..6a6d4fa49208 100644
--- a/gnome-base/control-center/Manifest
+++ b/gnome-base/control-center/Manifest
@@ -1,20 +1,19 @@
-MD5 6ff4c279b5057f1747de537c1ecb0ebc ChangeLog 16858
+MD5 e5207b9038e29334e99293fd8d0ef271 ChangeLog 17083
 MD5 aa3234dd1a36f666ba5ace0047cdd8b9 control-center-1.4.0.5-r1.ebuild 1258
-MD5 63d40166766fb5bc828bb2bad93e6422 control-center-2.10.0.ebuild 1905
+MD5 38818621c9b54fa548e5947beb80c82c control-center-2.10.2.ebuild 1979
 MD5 5af1d1aad2b9b7fef198abb27b604c35 control-center-2.10.1-r1.ebuild 2036
-MD5 b0f1214c7aad7a7bf070fdb4d5317501 control-center-2.11.92.ebuild 2609
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 38818621c9b54fa548e5947beb80c82c control-center-2.10.2.ebuild 1979
+MD5 63d40166766fb5bc828bb2bad93e6422 control-center-2.10.0.ebuild 1905
+MD5 223ce4cc3928e8fbd6a22ea8350d7922 control-center-2.12.0.ebuild 2462
 MD5 dbc915ad73576e8f0ae8a948e52fb621 files/control-center-1.4.0.5-cflags.patch 744
 MD5 cd6f25b991e95ef9f518b4c499f2e2f7 files/digest-control-center-2.10.2 75
-MD5 f14d2fe3d15320580a2ab5715e6e2d94 files/control-center-2.10.1-pathfix.patch 6670
+MD5 d49937874828450c09be566a6a624ead files/digest-control-center-2.12.0 75
 MD5 fdc3d7feea8b429588a2d193c9547dbf files/control-center-2.2.0.1-alpha_hack.patch 2997
 MD5 63670f480e3cafb0d9dc8b3423425071 files/control-center-2.6.0-remove-pmu.patch 1210
-MD5 dd226cb871fbe3b10ff84c37acbda960 files/digest-control-center-2.11.92 76
-MD5 c74402dbfb3e7cdb095304cc4751d86a files/control-center-2.9-logout.patch 4083
 MD5 38949ed5d795344f78a96af44764f896 files/digest-control-center-1.4.0.5-r1 76
+MD5 6d346011e61ca1c016c3c391881f9a4a files/control-center-2.11-gentoo_xcursor.patch 527
+MD5 c74402dbfb3e7cdb095304cc4751d86a files/control-center-2.9-logout.patch 4083
 MD5 86ede4717972671750335483cefdf77b files/digest-control-center-2.10.0 75
+MD5 f14d2fe3d15320580a2ab5715e6e2d94 files/control-center-2.10.1-pathfix.patch 6670
 MD5 2f0867c07305e05e49c57051e20dc068 files/digest-control-center-2.10.1-r1 75
-MD5 ecb1936df2b744bffc2f450bfb844e81 files/control-center-2.11.91-xft_check.patch 503
-MD5 6d346011e61ca1c016c3c391881f9a4a files/control-center-2.11-gentoo_xcursor.patch 527
 MD5 975ffa9d50cadbd034c4dd6c3ffe0cac files/control-center-2.11-xcursor_fix.patch 646
diff --git a/gnome-base/control-center/control-center-2.11.92.ebuild b/gnome-base/control-center/control-center-2.12.0.ebuild
index 5f0d721032c7..81ccfe3e8808 100644
--- a/gnome-base/control-center/control-center-2.11.92.ebuild
+++ b/gnome-base/control-center/control-center-2.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.11.92.ebuild,v 1.1 2005/08/25 05:54:57 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.12.0.ebuild,v 1.1 2005/09/07 02:05:04 leonardop Exp $
 
 inherit eutils gnome2
 
@@ -34,14 +34,16 @@ RDEPEND=">=gnome-base/gnome-vfs-2.2
 	>=gnome-base/orbit-2
 	eds? ( >=gnome-extra/evolution-data-server-1.3 )
 	!arm? ( alsa? ( >=media-libs/alsa-lib-0.9 ) )
-	gstreamer? ( >=media-libs/gst-plugins-0.8 )
+	gstreamer? ( =media-libs/gst-plugins-0.8* )
 	!gnome-extra/fontilus
 	!gnome-extra/themus
 	!gnome-extra/acme"
 
 DEPEND="${RDEPEND}
+	app-text/scrollkeeper
 	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.28"
+	>=dev-util/intltool-0.28
+	>=app-text/gnome-doc-utils-0.3.2"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 USE_DESTDIR="1"
@@ -50,9 +52,13 @@ MAKEOPTS="${MAKEOPTS} -j1"
 
 
 pkg_setup() {
-	G2CONF="--disable-schemas-install --disable-scrollkeeper \
-		--enable-vfs-methods $(use_enable alsa) $(use_enable gstreamer) \
-		$(use_enable static) $(use_enable eds aboutme)"
+	G2CONF="--disable-schemas-install \
+		--disable-scrollkeeper  \
+		--enable-vfs-methods    \
+		$(use_enable alsa)      \
+		$(use_enable gstreamer) \
+		$(use_enable static)    \
+		$(use_enable eds aboutme)"
 }
 
 src_unpack() {
@@ -74,15 +80,9 @@ src_unpack() {
 	# gnome-theme-installer.  bug #84977
 	epatch ${FILESDIR}/${PN}-2.10.1-pathfix.patch
 
-	# Remove unnecessary check for bleeding-edge version of Xft. Gentoo's
-	# xorg-x11 already includes the patch that this check tries to enforce.
-	epatch ${FILESDIR}/${PN}-2.11.91-xft_check.patch
-
 	# Gentoo-specific support for xcursor themes. See bug #103638.
 	epatch ${FILESDIR}/${PN}-2.11-gentoo_xcursor.patch
 
 	# Avoid segfault after calling XcursorLibraryLoadImage
 	epatch ${FILESDIR}/${PN}-2.11-xcursor_fix.patch
-
-	autoconf || die "autoconf failed"
 }
diff --git a/gnome-base/control-center/files/control-center-2.11.91-xft_check.patch b/gnome-base/control-center/files/control-center-2.11.91-xft_check.patch
deleted file mode 100644
index 36fe8c44a24f..000000000000
--- a/gnome-base/control-center/files/control-center-2.11.91-xft_check.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -NurdB control-center-2.11.91/configure.in control-center-2.11.91-patched/configure.in
---- control-center-2.11.91/configure.in	2005-08-17 12:21:25.000000000 -0500
-+++ control-center-2.11.91-patched/configure.in	2005-08-17 17:28:21.000000000 -0500
-@@ -23,7 +23,7 @@
- 
- m4_define(gnomevfs_minver, 2.0.0)
- m4_define(fontconfig_minver, 1.0.0)
--m4_define(xft_minver, 2.1.7)
-+m4_define(xft_minver, 2)
- m4_define(gtk_minver, 2.6.0)
- m4_define(libbonobo_minver, 2.0.0)
- m4_define(libgnomeui_minver, 2.2.0)
diff --git a/gnome-base/control-center/files/digest-control-center-2.11.92 b/gnome-base/control-center/files/digest-control-center-2.11.92
deleted file mode 100644
index 58967df04e35..000000000000
--- a/gnome-base/control-center/files/digest-control-center-2.11.92
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9572d1033c1103c2ed57e802c24b5a5c control-center-2.11.92.tar.bz2 1906135
diff --git a/gnome-base/control-center/files/digest-control-center-2.12.0 b/gnome-base/control-center/files/digest-control-center-2.12.0
new file mode 100644
index 000000000000..f114557d3cc1
--- /dev/null
+++ b/gnome-base/control-center/files/digest-control-center-2.12.0
@@ -0,0 +1 @@
+MD5 06a213f801bff26cee4f5db03a54da08 control-center-2.12.0.tar.bz2 1901106