Remove monolithic X from dependencies.

Package-Manager: portage-2.1.2_pre3-r6

4 files changed, 41 insertions, 46 deletions

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() {