Fixed DEPEND for modular X.

(Portage version: 2.1_pre3-r1)

10 files changed, 41 insertions, 77 deletions

diff --git a/x11-misc/xplanet/ChangeLog b/x11-misc/xplanet/ChangeLog
index 115fdf55f4a8..59b12abee4b4 100644
--- a/x11-misc/xplanet/ChangeLog
+++ b/x11-misc/xplanet/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/xplanet
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xplanet/ChangeLog,v 1.57 2006/01/15 12:36:47 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xplanet/ChangeLog,v 1.58 2006/01/21 18:22:17 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> xplanet-1.2.0.ebuild:
+  Fixed DEPEND for modular X.
 
   15 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> -xplanet-1.1.1.ebuild,
   -xplanet-1.1.2-r1.ebuild:
diff --git a/x11-misc/xplanet/xplanet-1.2.0.ebuild b/x11-misc/xplanet/xplanet-1.2.0.ebuild
index 11e8aa7f2c44..6f29ece6535f 100644
--- a/x11-misc/xplanet/xplanet-1.2.0.ebuild
+++ b/x11-misc/xplanet/xplanet-1.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xplanet/xplanet-1.2.0.ebuild,v 1.9 2005/11/19 13:20:54 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xplanet/xplanet-1.2.0.ebuild,v 1.10 2006/01/21 18:22:17 nelchael Exp $
 
 DESCRIPTION="A program to render images of the earth into the X root window"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -12,7 +12,12 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 IUSE="gif jpeg X opengl truetype tiff png"
 
-RDEPEND="X? ( virtual/x11 )
+RDEPEND="X? ( || ( (
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+		x11-libs/libXt
+		x11-libs/libXext )
+	virtual/x11 ) )
 	opengl? ( virtual/opengl
 		virtual/glut )
 	gif? ( media-libs/giflib )
@@ -20,6 +25,11 @@ RDEPEND="X? ( virtual/x11 )
 	tiff? ( media-libs/tiff )
 	png? ( media-libs/libpng )
 	truetype? ( =media-libs/freetype-2* )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xproto
+		x11-proto/scrnsaverproto )
+	virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-misc/xplore/ChangeLog b/x11-misc/xplore/ChangeLog
index 348798d8506c..4ecfcc72bf12 100644
--- a/x11-misc/xplore/ChangeLog
+++ b/x11-misc/xplore/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xplore
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xplore/ChangeLog,v 1.7 2005/11/01 12:52:57 nelchael Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xplore/ChangeLog,v 1.8 2006/01/21 18:23:28 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> -xplore-1.1e.ebuild,
+  xplore-1.2a.ebuild:
+  Fixed DEPEND for modular X.
 
   01 Nov 2005; Krzysiek Pawlik <nelchael@gentoo.org> -xplore-1.1-r1.ebuild,
   xplore-1.1e.ebuild, xplore-1.2a.ebuild:
diff --git a/x11-misc/xplore/files/digest-xplore-1.1e b/x11-misc/xplore/files/digest-xplore-1.1e
deleted file mode 100644
index c72270249012..000000000000
--- a/x11-misc/xplore/files/digest-xplore-1.1e
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f1be9591f86452215edaecf29e3ac0ed xplore-1.1e.tar.bz2 413906
diff --git a/x11-misc/xplore/xplore-1.1e.ebuild b/x11-misc/xplore/xplore-1.1e.ebuild
deleted file mode 100644
index d95d5eed977e..000000000000
--- a/x11-misc/xplore/xplore-1.1e.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xplore/xplore-1.1e.ebuild,v 1.5 2005/11/01 12:52:57 nelchael Exp $
-
-IUSE=""
-
-DESCRIPTION="motif file manager for X."
-SRC_URI="http://www.musikwissenschaft.uni-mainz.de/~ag/xplore/${P}.tar.bz2"
-HOMEPAGE="http://www.musikwissenschaft.uni-mainz.de/~ag/xplore/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-# its webpage states the lesstif does not fully work with xplore
-DEPEND="virtual/x11
-	x11-libs/openmotif"
-
-src_compile() {
-	#Fix Xplore.tmpl so installation is to /usr instead of /usr/X11R6
-	#Note: LIBDIR is used to point to X11 tree.
-	cp Xplore.tmpl Xplore.tmpl.orig
-	sed -e "s:^\(XPLORELIBDIR = \).*:\1/usr/lib/xplore:" \
-		-e "s:^XCOMM \(BINDIR = /usr\)/local\(/bin\):\1\2:" \
-		-e "s:^XCOMM \(MANPATH = /usr\)/local\(/man\):\1/share\2:" \
-		Xplore.tmpl.orig > Xplore.tmpl
-
-	xmkmf -a || die "xmkmf Makefile creation failed"
-	# parallel make fails
-	make || die "make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "Installation failed"
-	dodoc ChangeLog README TODO
-}
diff --git a/x11-misc/xplore/xplore-1.2a.ebuild b/x11-misc/xplore/xplore-1.2a.ebuild
index cdec68198cb2..0b5640e7c63f 100644
--- a/x11-misc/xplore/xplore-1.2a.ebuild
+++ b/x11-misc/xplore/xplore-1.2a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xplore/xplore-1.2a.ebuild,v 1.7 2005/11/01 12:52:57 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xplore/xplore-1.2a.ebuild,v 1.8 2006/01/21 18:23:28 nelchael Exp $
 
 inherit eutils
 
@@ -15,8 +15,7 @@ LICENSE="GPL-2"
 KEYWORDS="x86"
 
 # its webpage states the lesstif does not fully work with xplore
-DEPEND="virtual/x11
-	x11-libs/openmotif"
+DEPEND="x11-libs/openmotif"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-misc/xrestop/ChangeLog b/x11-misc/xrestop/ChangeLog
index 336d91c87794..7b2321db04a6 100644
--- a/x11-misc/xrestop/ChangeLog
+++ b/x11-misc/xrestop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xrestop
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrestop/ChangeLog,v 1.17 2005/12/12 05:10:05 spyderous Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrestop/ChangeLog,v 1.18 2006/01/21 18:26:19 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> -xrestop-0.2.ebuild,
+  xrestop-0.3.ebuild:
+  Fixed DEPEND for modular X.
 
   12 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; xrestop-0.3.ebuild:
   Add modular X dependencies.
diff --git a/x11-misc/xrestop/files/digest-xrestop-0.2 b/x11-misc/xrestop/files/digest-xrestop-0.2
deleted file mode 100644
index 16d4d55c5917..000000000000
--- a/x11-misc/xrestop/files/digest-xrestop-0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5ff774ff9cbb5997f0fb68e712dee302 xrestop-0.2.tar.gz 85110
diff --git a/x11-misc/xrestop/xrestop-0.2.ebuild b/x11-misc/xrestop/xrestop-0.2.ebuild
deleted file mode 100644
index 977cd0d677e2..000000000000
--- a/x11-misc/xrestop/xrestop-0.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrestop/xrestop-0.2.ebuild,v 1.9 2005/11/01 00:01:09 nelchael Exp $
-
-IUSE=""
-
-DESCRIPTION="'Top' like statistics of X11 client's server side resource usage"
-SRC_URI="http://www.freedesktop.org/Software/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.freedesktop.org/Software/xrestop/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc amd64"
-
-DEPEND="virtual/x11"
-
-src_install () {
-	einstall || die
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/x11-misc/xrestop/xrestop-0.3.ebuild b/x11-misc/xrestop/xrestop-0.3.ebuild
index e3f663a077c6..c2f615a01a28 100644
--- a/x11-misc/xrestop/xrestop-0.3.ebuild
+++ b/x11-misc/xrestop/xrestop-0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrestop/xrestop-0.3.ebuild,v 1.11 2005/12/12 05:10:05 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrestop/xrestop-0.3.ebuild,v 1.12 2006/01/21 18:26:19 nelchael Exp $
 
 IUSE=""
 
@@ -12,11 +12,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc sparc x86"
 
-DEPEND="|| ( ( x11-libs/libXres
-			x11-libs/libXt
-		)
-		virtual/x11
-	)"
+RDEPEND="|| ( (
+		x11-libs/libXres
+		x11-libs/libX11
+		x11-libs/libXt )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xproto virtual/x11 )"
 
 src_install () {
 	make DESTDIR="${D}" install || die