Correct esound and evolution-data-server dependencies. Back out again the dbus reintroduced nonsense in RDEPEND - if moving from overlay to portage please sync back fixes done in portage tree only. Remove all the test fixes as they are not necessary by now...

Package-Manager: portage-2.1.3.12

2 files changed, 18 insertions, 17 deletions

diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest
index e6e20f6c5bb7..d440b4920a8f 100644
--- a/gnome-base/control-center/Manifest
+++ b/gnome-base/control-center/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX control-center-2.11-gentoo_xcursor.patch 527 RMD160 bf455b0cf0c98c303c0885d5bcc7a72005b63108 SHA1 dc3e5afcb696034069d2ddc4d87c2905532e914c SHA256 682ed264c5ac0ed848b5cf3e856ee4440201be94f81b3dad4066233aaec48d9a
 MD5 6d346011e61ca1c016c3c391881f9a4a files/control-center-2.11-gentoo_xcursor.patch 527
 RMD160 bf455b0cf0c98c303c0885d5bcc7a72005b63108 files/control-center-2.11-gentoo_xcursor.patch 527
@@ -29,10 +32,10 @@ EBUILD control-center-2.18.1.ebuild 2767 RMD160 284279608e856c2462fdf8dfd2ef0510
 MD5 02b6f6d2df2c8c1d97cd984f81777ebd control-center-2.18.1.ebuild 2767
 RMD160 284279608e856c2462fdf8dfd2ef051086abd470 control-center-2.18.1.ebuild 2767
 SHA256 195575f6d7645fddd72762dfbb5f4d47a9276a98bc8628c4f9dc97e136a1f5be control-center-2.18.1.ebuild 2767
-EBUILD control-center-2.20.0.1.ebuild 2966 RMD160 91727974eb27e2d3eaf35d940cfacaa126d9fd2a SHA1 a2a49b7482120dfd8579b3bac8bd86519560df51 SHA256 cbe61c26fd1bd93b5f5646d314fcd756e65a9f3f11b77f8f0c7b70a398bd2483
-MD5 fd183e3433512f48c7621cc51d5cbe9b control-center-2.20.0.1.ebuild 2966
-RMD160 91727974eb27e2d3eaf35d940cfacaa126d9fd2a control-center-2.20.0.1.ebuild 2966
-SHA256 cbe61c26fd1bd93b5f5646d314fcd756e65a9f3f11b77f8f0c7b70a398bd2483 control-center-2.20.0.1.ebuild 2966
+EBUILD control-center-2.20.0.1.ebuild 2518 RMD160 33e0e687fcce0d1d0d0cbac439d533660587cb4e SHA1 6521a3b5395a0d14a4089f6d05eb05776ee4cab8 SHA256 c4f3f1523fad7f38ed2f5db38201b2dd5c6cc742e0b6353b23c897887ec28452
+MD5 9a71b3c54bedd213e214a9c23e2b92d5 control-center-2.20.0.1.ebuild 2518
+RMD160 33e0e687fcce0d1d0d0cbac439d533660587cb4e control-center-2.20.0.1.ebuild 2518
+SHA256 c4f3f1523fad7f38ed2f5db38201b2dd5c6cc742e0b6353b23c897887ec28452 control-center-2.20.0.1.ebuild 2518
 MISC ChangeLog 33679 RMD160 865d7d3b761f76af1bb91ff6cbb9a3292ec94cff SHA1 a5b116155660ff975f68bd6b7cab384b39435c7d SHA256 859a5af117463ac5c528269e423b6f231a7ccdcc986ee9c64d08a27a9870b5c0
 MD5 a4d7aec718e90b0036a4d4b751ad4f01 ChangeLog 33679
 RMD160 865d7d3b761f76af1bb91ff6cbb9a3292ec94cff ChangeLog 33679
@@ -50,3 +53,10 @@ SHA256 cf2bc498f431016785a9c2b0d2dca076c48dc66ac884bcfd4a8593f0be501df7 files/di
 MD5 4ab18a4fb98db3fad52b86b7caa7de6a files/digest-control-center-2.20.0.1 295
 RMD160 b5ba300c3c3bb849e9016868630ddf182f244628 files/digest-control-center-2.20.0.1 295
 SHA256 f7e318517a102ac566cb63a9ce5104b016c90187557955bb72c366a62ae38991 files/digest-control-center-2.20.0.1 295
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHD0NlkeYb6olFHJcRAqbSAJ0V72Lm6wjAMSE4i4JrTLiQzg50SQCePKvj
+8iFOjNhTpKZUbzW8+F/x6vk=
+=ls30
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/control-center/control-center-2.20.0.1.ebuild b/gnome-base/control-center/control-center-2.20.0.1.ebuild
index e918b1a17f89..4d6b4ab75a3a 100644
--- a/gnome-base/control-center/control-center-2.20.0.1.ebuild
+++ b/gnome-base/control-center/control-center-2.20.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.20.0.1.ebuild,v 1.1 2007/10/04 04:25:18 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.20.0.1.ebuild,v 1.2 2007/10/12 09:50:48 leio Exp $
 
 inherit eutils gnome2 autotools
 
@@ -41,7 +41,7 @@ RDEPEND=">=gnome-base/gnome-vfs-2.2
 	>=gnome-base/gnome-menus-2.11.1
 	>=gnome-base/gnome-panel-2
 	>=gnome-base/libgnomekbd-0.1
-	esd? ( media-sound/esound )
+	esd? ( >=media-sound/esound-0.2.38 )
 	hal? ( >=sys-apps/hal-0.5.6 )
 	dev-libs/libxml2
 	>=x11-wm/metacity-2.8.6-r1
@@ -49,11 +49,8 @@ RDEPEND=">=gnome-base/gnome-vfs-2.2
 	>=gnome-base/libgnome-2.2
 	media-libs/freetype
 	>=gnome-base/orbit-2.12.4
-	||  (
-		>=dev-libs/dbus-glib-0.71
-		( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.60 )
-	)
-	eds? ( >=gnome-extra/evolution-data-server-1.7 )
+	>=dev-libs/dbus-glib-0.71
+	eds? ( >=gnome-extra/evolution-data-server-1.7.90 )
 	!arm? ( alsa? ( >=media-libs/alsa-lib-0.9 ) )
 	>=media-libs/gst-plugins-base-0.10.2
 	>=media-libs/gstreamer-0.10.2"
@@ -94,11 +91,5 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${PN}-2.19.90-no-esd.patch"
 
-	# Fix tests
-	echo "capplets/appearance/data/gnome-appearance-properties.desktop.in" >> "${S}/po/POTFILES.skip"
-	echo "capplets/appearance/data/gnome-theme-installer.desktop.in" >> "${S}/po/POTFILES.skip"
-	echo "capplets/appearance/data/gnome-appearance-properties.desktop.in" >> "${S}/po/POTFILES.skip"
-	echo "capplets/appearance/data/gnome-theme-installer.desktop.in" >> "${S}/po/POTFILES.skip"
-
 	eautoreconf
 }