Remove monolithic X deps

Package-Manager: portage-2.1.1

3 files changed, 29 insertions, 35 deletions

diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index 7d366806f1b9..6cf247178a49 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.195 2006/09/08 18:58:43 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.196 2006/09/12 16:17:20 dang Exp $
+
+  12 Sep 2006; Daniel Gryniewicz <dang@gentoo.org>
+  control-center-2.16.0.ebuild:
+  Remove monolithic X deps
 
   08 Sep 2006; Daniel Gryniewicz <dang@gentoo.org>
   control-center-2.16.0.ebuild:
diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest
index d8fc5902d331..95b2a421a5f7 100644
--- a/gnome-base/control-center/Manifest
+++ b/gnome-base/control-center/Manifest
@@ -82,14 +82,14 @@ EBUILD control-center-2.14.2.ebuild 2440 RMD160 aeca52cee47ecd25dbf587db6ec0b09e
 MD5 f7044f51409ad001e22251c50bcbf993 control-center-2.14.2.ebuild 2440
 RMD160 aeca52cee47ecd25dbf587db6ec0b09e101ec851 control-center-2.14.2.ebuild 2440
 SHA256 06e94cfaea1d8a89db5260ab1c50ed3994da2b00113e8022f6da401ce5c913d7 control-center-2.14.2.ebuild 2440
-EBUILD control-center-2.16.0.ebuild 2345 RMD160 14fc3700207446c29bd14f38337066893f534f2b SHA1 5d107612174364c13a28c1d7c73531815d4a1524 SHA256 91008249dd0df21e98400f5bee7b40b7050c50e4ed44053bb79bd66b64a58bd7
-MD5 fea2d0e57601bfb09a7c41b677c7dd42 control-center-2.16.0.ebuild 2345
-RMD160 14fc3700207446c29bd14f38337066893f534f2b control-center-2.16.0.ebuild 2345
-SHA256 91008249dd0df21e98400f5bee7b40b7050c50e4ed44053bb79bd66b64a58bd7 control-center-2.16.0.ebuild 2345
-MISC ChangeLog 26146 RMD160 2ac24f2ebcbd8ea2b3b88e7b49194969c151e31a SHA1 1a7fa3b4174a481ec8ddcedbd75e39e6bdb7e642 SHA256 168dd3682e49632073e54bab243f2fa2b54b5b037fe8e8a45dc9a1d05a254814
-MD5 e134677f8562a5169552acc8a45a0611 ChangeLog 26146
-RMD160 2ac24f2ebcbd8ea2b3b88e7b49194969c151e31a ChangeLog 26146
-SHA256 168dd3682e49632073e54bab243f2fa2b54b5b037fe8e8a45dc9a1d05a254814 ChangeLog 26146
+EBUILD control-center-2.16.0.ebuild 2229 RMD160 51859dfdc93f5661cb83012612e74586831d7ff5 SHA1 30b48d34c75b38911ad0926a4378410fde45bb3c SHA256 8ec06bf79514c0f8bdf2cd1970f8de3dc211452e8c65a6a49500083af18e8cca
+MD5 c8bc4777079fafdc5d13ca763b47dcd5 control-center-2.16.0.ebuild 2229
+RMD160 51859dfdc93f5661cb83012612e74586831d7ff5 control-center-2.16.0.ebuild 2229
+SHA256 8ec06bf79514c0f8bdf2cd1970f8de3dc211452e8c65a6a49500083af18e8cca control-center-2.16.0.ebuild 2229
+MISC ChangeLog 26257 RMD160 73a4e8dbeca57658cdbf2940137e3faae6c1d327 SHA1 ad7556d6ce76ff6800f1d89663e9c0704b567ce6 SHA256 da8eb5ae4b6d4fa3dd65f6fbcd3a8148bffd09462fbd7cb8d7466c43a29e8c70
+MD5 4b43044f8966a19448dd1c6df08945f3 ChangeLog 26257
+RMD160 73a4e8dbeca57658cdbf2940137e3faae6c1d327 ChangeLog 26257
+SHA256 da8eb5ae4b6d4fa3dd65f6fbcd3a8148bffd09462fbd7cb8d7466c43a29e8c70 ChangeLog 26257
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -118,7 +118,7 @@ SHA256 012ed204a12c6b74819030e4a8e2bd531c5e822d094df23f1476bb982e9b5229 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFFAb13omPajV0RnrERAnedAJ9BfIOfFZlrCZ0bPC+R8DHiidnocACfTFf3
-runxLe/EJPy700UwrXHcHTc=
-=UcW3
+iD8DBQFFBt2UomPajV0RnrERAi3cAJ9jdbhzBvJZ0BIn6wO8WtpuMVh+5wCdGZIe
+mnQ4dMkHiQTJE/F7R6rc4PQ=
+=H5M3
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/control-center/control-center-2.16.0.ebuild b/gnome-base/control-center/control-center-2.16.0.ebuild
index e92f4cc16b2d..d298cdcb39ba 100644
--- a/gnome-base/control-center/control-center-2.16.0.ebuild
+++ b/gnome-base/control-center/control-center-2.16.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.16.0.ebuild,v 1.2 2006/09/08 18:58:43 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.16.0.ebuild,v 1.3 2006/09/12 16:17:20 dang Exp $
 
 inherit eutils gnome2 autotools
 
@@ -15,18 +15,13 @@ IUSE="alsa eds"
 RDEPEND=">=gnome-base/gnome-vfs-2.2
 		>=media-libs/fontconfig-1
 		>=virtual/xft-2.1.2
-		||	(
-				(
-					x11-libs/libX11
-					x11-libs/libXext
-					x11-libs/libXdmcp
-					x11-libs/libICE
-					x11-libs/libSM
-					x11-libs/libXxf86misc
-					x11-libs/libXau
-				)
-				virtual/x11
-			)
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXdmcp
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXxf86misc
+		x11-libs/libXau
 		>=dev-libs/glib-2.8
 		>=x11-libs/gtk+-2.8.12
 		>=gnome-base/libbonobo-2
@@ -51,16 +46,11 @@ RDEPEND=">=gnome-base/gnome-vfs-2.2
 		>=media-libs/gstreamer-0.10.2"
 
 DEPEND="${RDEPEND}
-		||	(
-				(
-					x11-proto/kbproto
-					x11-proto/xextproto
-					x11-libs/libxkbfile
-					x11-proto/xf86miscproto
-					x11-proto/scrnsaverproto
-				)
-				virtual/x11
-			)
+		x11-proto/kbproto
+		x11-proto/xextproto
+		x11-libs/libxkbfile
+		x11-proto/xf86miscproto
+		x11-proto/scrnsaverproto
 		sys-devel/gettext
 		>=dev-util/pkgconfig-0.9
 		>=dev-util/intltool-0.35