Remove monolithic X from dependencies.

Package-Manager: portage-2.1.2_pre3-r6

7 files changed, 60 insertions, 65 deletions

diff --git a/x11-misc/xfm/Manifest b/x11-misc/xfm/Manifest
index 1eb6883714d1..4243abc0f97a 100644
--- a/x11-misc/xfm/Manifest
+++ b/x11-misc/xfm/Manifest
@@ -6,14 +6,14 @@ MD5 0f75a007428c6d3d50de93fcdbb67a6f files/xfm-1.4.3-malloc.patch 413
 RMD160 68cd7c5a327f647c24a36bcd5d9dff0d1ca07c7a files/xfm-1.4.3-malloc.patch 413
 SHA256 7cb3cb933eac0348490f30cdea8cb6c21a041fea2068473b47f5968712b79d8c files/xfm-1.4.3-malloc.patch 413
 DIST xfm-1.4.3.tar.gz 420962 RMD160 b06c562b467e5085e5ecdd4273b64d554415ce69 SHA1 8d6235bb63e04491cc99603144b52884866b39e2 SHA256 427e58f2abb61c7c17e375a41e4a242ffb9dd621e0f04571db9e9cf18d4c05af
-EBUILD xfm-1.4.3.ebuild 1310 RMD160 80e12e317ffc176dd9b63cb7421a893789da08d5 SHA1 252ab1dc1717d43df2839831508aac7549924f6b SHA256 0ffa2a0be5b706b3d5931fad33c50a3b88a1f0c5bef16005594dd3f8910edb5f
-MD5 076f8b46c8ce01659c1af4dde490d701 xfm-1.4.3.ebuild 1310
-RMD160 80e12e317ffc176dd9b63cb7421a893789da08d5 xfm-1.4.3.ebuild 1310
-SHA256 0ffa2a0be5b706b3d5931fad33c50a3b88a1f0c5bef16005594dd3f8910edb5f xfm-1.4.3.ebuild 1310
-MISC ChangeLog 1450 RMD160 6c937cf9d70e804c9a52a9ffb2dbb1f5d804382c SHA1 20ee4b6b1f54af2a22e9f00bc58ed391719ffac5 SHA256 777b42cc9f63721c9cd3286988a1f77c71c69fd2ae5e61d7db4c4ece3323e02a
-MD5 2ca5647e0fb5c62b946afbd339291491 ChangeLog 1450
-RMD160 6c937cf9d70e804c9a52a9ffb2dbb1f5d804382c ChangeLog 1450
-SHA256 777b42cc9f63721c9cd3286988a1f77c71c69fd2ae5e61d7db4c4ece3323e02a ChangeLog 1450
+EBUILD xfm-1.4.3.ebuild 1250 RMD160 8d52a49d095319904559f1302d856ec760301801 SHA1 1094e2e11378adfb06a85e743f874743b2901f0d SHA256 c34b5db7c669363fead2310e00556fe892c6061bd7eb0e9a7c5f3ce06ef64184
+MD5 450505dd8f91973529d5da47c583f88a xfm-1.4.3.ebuild 1250
+RMD160 8d52a49d095319904559f1302d856ec760301801 xfm-1.4.3.ebuild 1250
+SHA256 c34b5db7c669363fead2310e00556fe892c6061bd7eb0e9a7c5f3ce06ef64184 xfm-1.4.3.ebuild 1250
+MISC ChangeLog 1569 RMD160 227965ed7792ccf2526c7a347a0c9822d22256a1 SHA1 919f0653aae4d01281b5fa4d9682475a6a6ba4da SHA256 b8690d26178859090634d873ce0e70ae546dde438bdf5d3b2fe2062ac2a24bfc
+MD5 72218f1bc934eb844f442a1dc29b0b64 ChangeLog 1569
+RMD160 227965ed7792ccf2526c7a347a0c9822d22256a1 ChangeLog 1569
+SHA256 b8690d26178859090634d873ce0e70ae546dde438bdf5d3b2fe2062ac2a24bfc ChangeLog 1569
 MISC metadata.xml 173 RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e SHA1 ca2ea648208cc74669b8a084f1b74e5cd4415777 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f
 MD5 fe402b096905cae8dcb4a503d3a838ac metadata.xml 173
 RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e metadata.xml 173
@@ -24,7 +24,7 @@ SHA256 77c096083cc36dea781e530b757076393e013553f19ea65b681632543850056e files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFLNWCgo/w9rxVVVERAmTiAJ9clQndEvWGyP2ufRn+T9DeF3OT4wCgoWsb
-DtlZ+4eN0gq8mmPxBGk0dYw=
-=ib07
+iD8DBQFFOpicvSApE0uP4UsRAhwOAJ0Xt1FOyT7k43GY69U5N5U3p5cM3ACfTIb5
+Wa+ONZRkEC2NmpRbhYFl4bc=
+=GgWl
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index d09fd707cd0b..c31a3b6c835d 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.153 2006/10/21 03:16:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.154 2006/10/21 21:53:42 omp Exp $
+
+  21 Oct 2006; David Shakaryan <omp@gentoo.org> xscreensaver-4.24.ebuild,
+  xscreensaver-5.00-r1.ebuild, xscreensaver-5.01.ebuild:
+  Remove monolithic X from dependencies.
 
   21 Oct 2006; Aron Griffis <agriffis@gentoo.org>
   xscreensaver-5.00-r1.ebuild:
diff --git a/x11-misc/xscreensaver/xscreensaver-4.24.ebuild b/x11-misc/xscreensaver/xscreensaver-4.24.ebuild
index 585a57c62b7f..6c054873a750 100644
--- a/x11-misc/xscreensaver/xscreensaver-4.24.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-4.24.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/x11-misc/xscreensaver/xscreensaver-4.24.ebuild,v 1.13 2006/10/11 13:33:06 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.24.ebuild,v 1.14 2006/10/21 21:53:42 omp Exp $
 
 inherit eutils flag-o-matic pam fixheadtails autotools
 
@@ -14,12 +14,9 @@ LICENSE="BSD"
 KEYWORDS="alpha amd64 ~arm hppa ia64 mips ppc ppc64 sparc x86"
 SLOT="0"
 
-RDEPEND="|| ( (
-		x11-libs/libXxf86misc
-		x11-apps/xwininfo
-		x11-apps/appres
-		xinerama? ( x11-libs/libXinerama ) )
-	virtual/x11 )
+RDEPEND="x11-libs/libXxf86misc
+	x11-apps/xwininfo
+	x11-apps/appres
 	media-libs/netpbm
 	>=sys-libs/zlib-1.1.4
 	>=dev-libs/libxml2-2.5
@@ -31,20 +28,20 @@ RDEPEND="|| ( (
 	jpeg? ( media-libs/jpeg )
 	opengl? ( virtual/opengl
 	          >=media-libs/gle-3.0.1 )
+	xinerama? ( x11-libs/libXinerama )
 	!arm? ( new-login? ( gnome-base/gdm ) )"
 
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xf86vidmodeproto
-		x11-proto/xextproto
-		x11-proto/scrnsaverproto
-		x11-proto/recordproto
-		x11-proto/xf86miscproto
-		xinerama? ( x11-proto/xineramaproto ) )
-	virtual/x11 )
+	x11-proto/xf86vidmodeproto
+	x11-proto/xextproto
+	x11-proto/scrnsaverproto
+	x11-proto/recordproto
+	x11-proto/xf86miscproto
 	=sys-devel/automake-1.4*
 	sys-devel/bc
 	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+	xinerama? ( x11-proto/xineramaproto )"
 
 # simple workaround for the flurry screensaver
 filter-flags -mabi=altivec
diff --git a/x11-misc/xscreensaver/xscreensaver-5.00-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.00-r1.ebuild
index 909214a2e8d6..76d0351c71fe 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.00-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.00-r1.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/x11-misc/xscreensaver/xscreensaver-5.00-r1.ebuild,v 1.3 2006/10/21 03:16:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.00-r1.ebuild,v 1.4 2006/10/21 21:53:42 omp Exp $
 
 inherit eutils flag-o-matic pam fixheadtails autotools
 
@@ -14,12 +14,9 @@ LICENSE="BSD"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 SLOT="0"
 
-RDEPEND="|| ( (
-		x11-libs/libXxf86misc
-		x11-apps/xwininfo
-		x11-apps/appres
-		xinerama? ( x11-libs/libXinerama ) )
-	virtual/x11 )
+RDEPEND="x11-libs/libXxf86misc
+	x11-apps/xwininfo
+	x11-apps/appres
 	media-libs/netpbm
 	>=sys-libs/zlib-1.1.4
 	>=dev-libs/libxml2-2.5
@@ -30,19 +27,19 @@ RDEPEND="|| ( (
 	jpeg? ( media-libs/jpeg )
 	opengl? ( virtual/opengl
 	          >=media-libs/gle-3.0.1 )
+	xinerama? ( x11-libs/libXinerama )
 	!arm? ( new-login? ( gnome-base/gdm ) )"
 
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xf86vidmodeproto
-		x11-proto/xextproto
-		x11-proto/scrnsaverproto
-		x11-proto/recordproto
-		x11-proto/xf86miscproto
-		xinerama? ( x11-proto/xineramaproto ) )
-	virtual/x11 )
+	x11-proto/xf86vidmodeproto
+	x11-proto/xextproto
+	x11-proto/scrnsaverproto
+	x11-proto/recordproto
+	x11-proto/xf86miscproto
 	sys-devel/bc
 	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+	xinerama? ( x11-proto/xineramaproto )"
 
 # simple workaround for the flurry screensaver
 filter-flags -mabi=altivec
diff --git a/x11-misc/xscreensaver/xscreensaver-5.01.ebuild b/x11-misc/xscreensaver/xscreensaver-5.01.ebuild
index 8cad4cea0107..1cd5fff43648 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.01.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.01.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/x11-misc/xscreensaver/xscreensaver-5.01.ebuild,v 1.1 2006/10/11 12:46:44 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.01.ebuild,v 1.2 2006/10/21 21:53:42 omp Exp $
 
 inherit eutils flag-o-matic pam fixheadtails autotools
 
@@ -14,12 +14,9 @@ LICENSE="BSD"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 SLOT="0"
 
-RDEPEND="|| ( (
-		x11-libs/libXxf86misc
-		x11-apps/xwininfo
-		x11-apps/appres
-		xinerama? ( x11-libs/libXinerama ) )
-	virtual/x11 )
+RDEPEND="x11-libs/libXxf86misc
+	x11-apps/xwininfo
+	x11-apps/appres
 	media-libs/netpbm
 	>=sys-libs/zlib-1.1.4
 	>=dev-libs/libxml2-2.5
@@ -30,19 +27,19 @@ RDEPEND="|| ( (
 	jpeg? ( media-libs/jpeg )
 	opengl? ( virtual/opengl
 	          >=media-libs/gle-3.0.1 )
+	xinerama? ( x11-libs/libXinerama )
 	!arm? ( new-login? ( gnome-base/gdm ) )"
 
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xf86vidmodeproto
-		x11-proto/xextproto
-		x11-proto/scrnsaverproto
-		x11-proto/recordproto
-		x11-proto/xf86miscproto
-		xinerama? ( x11-proto/xineramaproto ) )
-	virtual/x11 )
+	x11-proto/xf86vidmodeproto
+	x11-proto/xextproto
+	x11-proto/scrnsaverproto
+	x11-proto/recordproto
+	x11-proto/xf86miscproto
 	sys-devel/bc
 	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+	xinerama? ( x11-proto/xineramaproto )"
 
 pkg_setup() {
 
diff --git a/x11-misc/xtrlock/ChangeLog b/x11-misc/xtrlock/ChangeLog
index 66e71deca695..fd19c3bef441 100644
--- a/x11-misc/xtrlock/ChangeLog
+++ b/x11-misc/xtrlock/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/xtrlock
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtrlock/ChangeLog,v 1.9 2006/10/20 09:08:32 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtrlock/ChangeLog,v 1.10 2006/10/21 21:57:43 omp Exp $
+
+  21 Oct 2006; David Shakaryan <omp@gentoo.org> xtrlock-2.0-r2.ebuild:
+  Remove monolithic X from dependencies.
 
 *xtrlock-2.0-r2 (20 Oct 2006)
 
diff --git a/x11-misc/xtrlock/xtrlock-2.0-r2.ebuild b/x11-misc/xtrlock/xtrlock-2.0-r2.ebuild
index 50f2bb81ff65..89612c7dd4b4 100644
--- a/x11-misc/xtrlock/xtrlock-2.0-r2.ebuild
+++ b/x11-misc/xtrlock/xtrlock-2.0-r2.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/x11-misc/xtrlock/xtrlock-2.0-r2.ebuild,v 1.1 2006/10/20 09:08:32 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtrlock/xtrlock-2.0-r2.ebuild,v 1.2 2006/10/21 21:57:43 omp Exp $
 
 MY_P=${P/-/_}-12
 DESCRIPTION="A simplistic screen locking program for X"
@@ -12,13 +12,10 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND="|| ( x11-libs/libX11 virtual/x11 )"
-
+RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
-		|| ( (
-			x11-proto/xproto
-			x11-misc/imake )
-		virtual/x11 )"
+	x11-proto/xproto
+	x11-misc/imake" 
 
 src_unpack() {
 	unpack ${A}