Drop virtual/x11 references.

Package-Manager: portage-2.1.2.9

3 files changed, 34 insertions, 24 deletions

diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index 417e894960aa..f67f6e769f7c 100644
--- a/gnome-base/control-center/ChangeLog
+++ b/gnome-base/control-center/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/control-center
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.237 2007/07/08 04:50:27 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.238 2007/07/22 10:31:21 graaff Exp $
+
+  22 Jul 2007; Hans de Graaff <graaff@gentoo.org>
+  control-center-2.14.2.ebuild:
+  Drop virtual/x11 references.
 
   08 Jul 2007; Michael Sterrett <mr_bones_@gentoo.org>
   control-center-2.16.2.ebuild, control-center-2.16.3.ebuild,
diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest
index 1757a2f52f9d..238431dea4d4 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
@@ -27,10 +30,10 @@ DIST control-center-2.16.2.tar.bz2 2022817 RMD160 f8a45a1c3cbfc3c04d4bd562482e28
 DIST control-center-2.16.3.tar.bz2 2025478 RMD160 313804094b0ad0f5dd801d71fc1214798290ed99 SHA1 fcf34601399a2f432fb7189b354007d37803f87b SHA256 6bffec96f9014b3742df80f193b68877e31b26b2a1cc0ba961fcba15a22af9d9
 DIST control-center-2.18.0.tar.bz2 2138980 RMD160 253e55334df4cbd4e2e95156c663f12523822fff SHA1 550cddb9903b3596f60167e64f397efebc43d64b SHA256 5879c85775c2ba659174c506def2f0db11cad4215c956415c5e13908c5d06611
 DIST control-center-2.18.1.tar.bz2 2150134 RMD160 f3980d2348a699f646d87ec27c61f27057594302 SHA1 4325caeb94de9b77cd57fc210f1ba623458a2aa8 SHA256 3bb1474a6914d5a210a6f21368c48c9c302918a4ab94a5282b84b57ebc432c87
-EBUILD control-center-2.14.2.ebuild 2459 RMD160 b2a7c316a8f275800517cf6686d9bbe90bad5b32 SHA1 0c559ca4f9b5e5f0f8c6ab5ba5801120cf7bb594 SHA256 9ca7faf16479955ab023534f147f4be290b23adf903d68d2d541d9be25556eb2
-MD5 e3e8e914e86e9cee3296ef50afaad8d5 control-center-2.14.2.ebuild 2459
-RMD160 b2a7c316a8f275800517cf6686d9bbe90bad5b32 control-center-2.14.2.ebuild 2459
-SHA256 9ca7faf16479955ab023534f147f4be290b23adf903d68d2d541d9be25556eb2 control-center-2.14.2.ebuild 2459
+EBUILD control-center-2.14.2.ebuild 2401 RMD160 447ee608d655ec29b5f1dde4341402b4390ffb4d SHA1 794d5c29b707e1c938d7b33853e1ad91cd15d24c SHA256 4fe45208dfcc367e230b08877e6c0e00d65cdadcda3dda0aa04187f9bd963bd9
+MD5 f7e6be9686e1242428773a9059880c16 control-center-2.14.2.ebuild 2401
+RMD160 447ee608d655ec29b5f1dde4341402b4390ffb4d control-center-2.14.2.ebuild 2401
+SHA256 4fe45208dfcc367e230b08877e6c0e00d65cdadcda3dda0aa04187f9bd963bd9 control-center-2.14.2.ebuild 2401
 EBUILD control-center-2.16.2.ebuild 2333 RMD160 955141bd2be17a37bed76596e066c4607038d5ed SHA1 aef0fb1db5d428f9998548383d93477d2adf9a30 SHA256 2e1333885fbe8df94030041b1a533dd4ea7dc4d7e1c3308a77ea3ed24fd3fb3d
 MD5 0c5ffee8c8ba6cb5b27428393a60c68a control-center-2.16.2.ebuild 2333
 RMD160 955141bd2be17a37bed76596e066c4607038d5ed control-center-2.16.2.ebuild 2333
@@ -47,10 +50,10 @@ EBUILD control-center-2.18.1.ebuild 2717 RMD160 0cd466c053ebb619b2c807b263bbb65e
 MD5 1cc2c4ffa44cf02950bb39757ead786d control-center-2.18.1.ebuild 2717
 RMD160 0cd466c053ebb619b2c807b263bbb65e4907c966 control-center-2.18.1.ebuild 2717
 SHA256 23d11431b5e3c075c93effd713ebbfd7d177383194a4bffd09d3e2f8d7c74d40 control-center-2.18.1.ebuild 2717
-MISC ChangeLog 32024 RMD160 7a77649bd3d430bd43f7d6e057fecd2a3883ff50 SHA1 517e6cf6054d6a2bc6328f75851b9e67e5ce5bc5 SHA256 2521086f78b076c416b6fc800ee93b36e7443f970a7d11191768a86dc9cc4915
-MD5 818e9a659413219a0226b00aeede2fce ChangeLog 32024
-RMD160 7a77649bd3d430bd43f7d6e057fecd2a3883ff50 ChangeLog 32024
-SHA256 2521086f78b076c416b6fc800ee93b36e7443f970a7d11191768a86dc9cc4915 ChangeLog 32024
+MISC ChangeLog 32135 RMD160 4cf6acf20ab2511225e8891b2dc54e2998daf3fe SHA1 2abc61f94e36b270bffa429aa619e01fdfd4978d SHA256 c2cb5be6894e9fe37bb9d6cd80193092e9fa7e82b752e917db0fad8b57f16fbd
+MD5 2719d99fba980e76bf2a1d2fe32ae54a ChangeLog 32135
+RMD160 4cf6acf20ab2511225e8891b2dc54e2998daf3fe ChangeLog 32135
+SHA256 c2cb5be6894e9fe37bb9d6cd80193092e9fa7e82b752e917db0fad8b57f16fbd ChangeLog 32135
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -70,3 +73,10 @@ SHA256 f4de778088f40660791efd4cd3ad394f8e179726da7297ca20ea1269f0b7a77f files/di
 MD5 f84d983b3484feb31c85348fa89d37d0 files/digest-control-center-2.18.1 271
 RMD160 f191c70a67df5a477abd305cfb019055a3bb6c45 files/digest-control-center-2.18.1 271
 SHA256 cf2bc498f431016785a9c2b0d2dca076c48dc66ac884bcfd4a8593f0be501df7 files/digest-control-center-2.18.1 271
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFGozH30BM77Tkv120RArcTAKCygykSA/0JXh7lZlXx7S17WNrRxQCgjxH0
+uIVGSXwMtptgxZB1tBq/YQo=
+=CH5V
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/control-center/control-center-2.14.2.ebuild b/gnome-base/control-center/control-center-2.14.2.ebuild
index 14900e5a0d3d..7392b8a6a046 100644
--- a/gnome-base/control-center/control-center-2.14.2.ebuild
+++ b/gnome-base/control-center/control-center-2.14.2.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.14.2.ebuild,v 1.12 2007/03/23 15:49:55 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.14.2.ebuild,v 1.13 2007/07/22 10:31:21 graaff Exp $
 
 inherit eutils gnome2 autotools
 
@@ -15,14 +15,12 @@ IUSE="alsa eds gstreamer"
 RDEPEND=">=gnome-base/gnome-vfs-2.2
 	>=media-libs/fontconfig-1
 	virtual/xft
-	|| ( (
-		x11-apps/xmodmap
-		x11-libs/libXdmcp
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXxf86misc
-		x11-libs/libXau )
-	virtual/x11 )
+	x11-apps/xmodmap
+	x11-libs/libXdmcp
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXxf86misc
+	x11-libs/libXau
 	>=x11-libs/gtk+-2.8.12
 	>=dev-libs/glib-2.8
 	>=gnome-base/libbonobo-2
@@ -44,12 +42,10 @@ RDEPEND=">=gnome-base/gnome-vfs-2.2
 	gstreamer? ( >=media-libs/gst-plugins-base-0.10 )"
 
 DEPEND="${RDEPEND}
-	|| ( (
-		x11-libs/libxkbfile
-		x11-proto/kbproto
-		x11-proto/xf86miscproto
-		x11-proto/scrnsaverproto )
-	virtual/x11 )
+	x11-libs/libxkbfile
+	x11-proto/kbproto
+	x11-proto/xf86miscproto
+	x11-proto/scrnsaverproto
 	app-text/scrollkeeper
 	>=dev-util/pkgconfig-0.9
 	>=dev-util/intltool-0.34.2