New release: 2.12.1

(Portage version: 2.0.53_rc3)

6 files changed, 21 insertions, 30 deletions

diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index 2f9bd918a49a..669d2dfd4fe9 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.134 2005/09/24 11:47:02 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.135 2005/10/06 02:05:13 leonardop Exp $
+
+*control-center-2.12.1 (06 Oct 2005)
+
+  06 Oct 2005; Leonardo Boshell <leonardop@gentoo.org>
+  -files/control-center-2.11-xcursor_fix.patch,
+  -control-center-2.12.0.ebuild, +control-center-2.12.1.ebuild:
+  New version. Removing obsolete blocks.
 
   17 Sep 2005; Aron Griffis <agriffis@gentoo.org>
   control-center-2.10.2.ebuild, control-center-2.12.0.ebuild:
diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest
index e739197123d7..ca26b886394a 100644
--- a/gnome-base/control-center/Manifest
+++ b/gnome-base/control-center/Manifest
@@ -1,19 +1,22 @@
+MD5 250c46a6eb8c869c3d916b5a49c47d9b .control-center-2.12.1.ebuild.swp 12288
 MD5 e99d6ed15caae5629f299a3ebb117039 ChangeLog 17343
 MD5 d4f0febb27460c43fb258412acde17b8 control-center-1.4.0.5-r1.ebuild 1333
 MD5 63d40166766fb5bc828bb2bad93e6422 control-center-2.10.0.ebuild 1905
+MD5 5af1d1aad2b9b7fef198abb27b604c35 control-center-2.10.1-r1.ebuild 2036
 MD5 057a9b63a1fffc8535af779891248213 control-center-2.10.2.ebuild 1987
 MD5 171442d9d892b442c48aca1b60a0a065 control-center-2.12.0.ebuild 2468
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 5af1d1aad2b9b7fef198abb27b604c35 control-center-2.10.1-r1.ebuild 2036
+MD5 67644096eedeb95a9076262913e7018a control-center-2.12.1.ebuild 2433
 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 6d346011e61ca1c016c3c391881f9a4a files/control-center-2.11-gentoo_xcursor.patch 527
+MD5 975ffa9d50cadbd034c4dd6c3ffe0cac files/control-center-2.11-xcursor_fix.patch 646
 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 d49937874828450c09be566a6a624ead files/digest-control-center-2.12.0 75
 MD5 c74402dbfb3e7cdb095304cc4751d86a files/control-center-2.9-logout.patch 4083
 MD5 38949ed5d795344f78a96af44764f896 files/digest-control-center-1.4.0.5-r1 76
 MD5 86ede4717972671750335483cefdf77b files/digest-control-center-2.10.0 75
-MD5 975ffa9d50cadbd034c4dd6c3ffe0cac files/control-center-2.11-xcursor_fix.patch 646
-MD5 f14d2fe3d15320580a2ab5715e6e2d94 files/control-center-2.10.1-pathfix.patch 6670
 MD5 2f0867c07305e05e49c57051e20dc068 files/digest-control-center-2.10.1-r1 75
+MD5 cd6f25b991e95ef9f518b4c499f2e2f7 files/digest-control-center-2.10.2 75
+MD5 d49937874828450c09be566a6a624ead files/digest-control-center-2.12.0 75
+MD5 ce951b06688a38662ed2c0e5e8d0d1bc files/digest-control-center-2.12.1 75
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
diff --git a/gnome-base/control-center/control-center-2.12.0.ebuild b/gnome-base/control-center/control-center-2.12.1.ebuild
index 6f774034d9d4..1894008594c0 100644
--- a/gnome-base/control-center/control-center-2.12.0.ebuild
+++ b/gnome-base/control-center/control-center-2.12.1.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.12.0.ebuild,v 1.2 2005/09/17 16:42:23 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.12.1.ebuild,v 1.1 2005/10/06 02:05:13 leonardop Exp $
 
 inherit eutils gnome2
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="alsa eds gstreamer static"
+IUSE="alsa eds gstreamer"
 
 RDEPEND=">=gnome-base/gnome-vfs-2.2
 	>=media-libs/fontconfig-1
@@ -34,10 +34,7 @@ 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* )
-	!gnome-extra/fontilus
-	!gnome-extra/themus
-	!gnome-extra/acme"
+	gstreamer? ( =media-libs/gst-plugins-0.8* )"
 
 DEPEND="${RDEPEND}
 	app-text/scrollkeeper
@@ -57,7 +54,6 @@ pkg_setup() {
 		--enable-vfs-methods    \
 		$(use_enable alsa)      \
 		$(use_enable gstreamer) \
-		$(use_enable static)    \
 		$(use_enable eds aboutme)"
 }
 
@@ -82,7 +78,4 @@ src_unpack() {
 
 	# 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
 }
diff --git a/gnome-base/control-center/files/control-center-2.11-xcursor_fix.patch b/gnome-base/control-center/files/control-center-2.11-xcursor_fix.patch
deleted file mode 100644
index b351682cbead..000000000000
--- a/gnome-base/control-center/files/control-center-2.11-xcursor_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -NurdB control-center-2.11.92/capplets/mouse/gnome-mouse-properties.c control-center-2.11.92-patched/capplets/mouse/gnome-mouse-properties.c
---- control-center-2.11.92/capplets/mouse/gnome-mouse-properties.c	2005-08-01 10:59:43.000000000 -0500
-+++ control-center-2.11.92-patched/capplets/mouse/gnome-mouse-properties.c	2005-08-24 22:17:28.000000000 -0500
-@@ -690,7 +690,7 @@
- 			
- 			for (i = 0; sizes[i] != 0; i++) {
- 				cursor = XcursorLibraryLoadImage("left_ptr", name, sizes[i]);
--				if (cursor->size != sizes[i]) {
-+				if (cursor != NULL && cursor->size != sizes[i]) {
- 					XcursorImageDestroy (cursor);
- 					cursor = NULL;
- 				}
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
deleted file mode 100644
index f114557d3cc1..000000000000
--- a/gnome-base/control-center/files/digest-control-center-2.12.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 06a213f801bff26cee4f5db03a54da08 control-center-2.12.0.tar.bz2 1901106
diff --git a/gnome-base/control-center/files/digest-control-center-2.12.1 b/gnome-base/control-center/files/digest-control-center-2.12.1
new file mode 100644
index 000000000000..f3beece6584e
--- /dev/null
+++ b/gnome-base/control-center/files/digest-control-center-2.12.1
@@ -0,0 +1 @@
+MD5 f3d8520b8544e1f910600ba889e02523 control-center-2.12.1.tar.bz2 1771524