Fixed DEPEND for modular X.

Package-Manager: portage-2.1_pre4-r1

13 files changed, 48 insertions, 132 deletions

diff --git a/x11-misc/netwmpager/ChangeLog b/x11-misc/netwmpager/ChangeLog
index 9755593885a3..1fc57f6b3865 100644
--- a/x11-misc/netwmpager/ChangeLog
+++ b/x11-misc/netwmpager/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/netwmpager
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/netwmpager/ChangeLog,v 1.3 2005/12/04 06:21:42 halcy0n Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/netwmpager/ChangeLog,v 1.4 2006/02/11 11:18:28 nelchael Exp $
+
+  11 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org> netwmpager-1.6.ebuild:
+  Fixed DEPEND for modular X.
 
   04 Dec 2005; Mark Loeser <halcy0n@gentoo.org> netwmpager-1.6.ebuild:
   Stable on x86; bug #112873
diff --git a/x11-misc/netwmpager/netwmpager-1.6.ebuild b/x11-misc/netwmpager/netwmpager-1.6.ebuild
index fd68e09ada40..180c23ddc37a 100644
--- a/x11-misc/netwmpager/netwmpager-1.6.ebuild
+++ b/x11-misc/netwmpager/netwmpager-1.6.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/netwmpager/netwmpager-1.6.ebuild,v 1.3 2005/12/04 06:21:42 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/netwmpager/netwmpager-1.6.ebuild,v 1.4 2006/02/11 11:18:28 nelchael Exp $
 
 DESCRIPTION="EWMH (NetWM) compatible pager. Works with Openbox and other EWMH
 compliant window managers."
@@ -9,7 +9,16 @@ HOMEPAGE="http://onion.dynserv.net/~timo/?page=Projects/netwmpager"
 SLOT="0"
 IUSE=""
 
-DEPEND="virtual/x11 virtual/xft"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-libs/libXft
+		x11-libs/libXdmcp
+		x11-libs/libXau )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xproto virtual/x11 )
+	virtual/xft"
 
 LICENSE="GPL-2"
 KEYWORDS="~ppc x86"
diff --git a/x11-misc/peksystray/ChangeLog b/x11-misc/peksystray/ChangeLog
index 49277c67d0f9..bc5b5ae36a1f 100644
--- a/x11-misc/peksystray/ChangeLog
+++ b/x11-misc/peksystray/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/peksystray
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/peksystray/ChangeLog,v 1.11 2005/08/07 13:39:51 hansmi Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/peksystray/ChangeLog,v 1.12 2006/02/11 11:22:28 nelchael Exp $
+
+  11 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  -files/peksystray-gcc3-mlsl.diff, -peksystray-0.2.ebuild,
+  peksystray-0.2.1.ebuild:
+  Fixed DEPEND for modular X.
 
   07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
   peksystray-0.2.1.ebuild:
diff --git a/x11-misc/peksystray/files/digest-peksystray-0.2 b/x11-misc/peksystray/files/digest-peksystray-0.2
deleted file mode 100644
index d0a6e3c44f13..000000000000
--- a/x11-misc/peksystray/files/digest-peksystray-0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ebc882971dddf4bac5bda77c232e7233 peksystray-0.2.tar.gz 67117
diff --git a/x11-misc/peksystray/files/peksystray-gcc3-mlsl.diff b/x11-misc/peksystray/files/peksystray-gcc3-mlsl.diff
deleted file mode 100644
index 868e9b2fd4da..000000000000
--- a/x11-misc/peksystray/files/peksystray-gcc3-mlsl.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -ruN peksystray-0.2.orig/src/peksystray.c peksystray-0.2/src/peksystray.c
---- peksystray-0.2.orig/src/peksystray.c	2003-06-20 12:21:04.000000000 +0100
-+++ peksystray-0.2/src/peksystray.c	2004-01-10 17:49:13.000000000 +0000
-@@ -66,21 +66,21 @@
- void
- display_help ()
- {
--  fprintf (stdout, "
--%s - version %s
--Copyright 2003, Mohammed Sameer <uniball@linux-egypt.org>
--
--Usage: %s [OPTIONS]
--
--Options:
-- --help\t Display this help.
-- --version\t Display version number and exit.
-- --display DISPLAY\t The X display to connect to.
-- --icon-size SIZE\t Icon size. Default is 16.
-- --vertical\t Vertical layout. Default is horizontal.
-- --border SIZE\t Border width. Default is 0;
-- --multiple\t Open each icon in a separate window. Default is no.
--
-+  fprintf (stdout, "\n\
-+%s - version %s\n\
-+Copyright 2003, Mohammed Sameer <uniball@linux-egypt.org>\n\
-+\n\
-+Usage: %s [OPTIONS]\n\
-+\n\
-+Options:\n\
-+ --help\t Display this help.\n\
-+ --version\t Display version number and exit.\n\
-+ --display DISPLAY\t The X display to connect to.\n\
-+ --icon-size SIZE\t Icon size. Default is 16.\n\
-+ --vertical\t Vertical layout. Default is horizontal.\n\
-+ --border SIZE\t Border width. Default is 0;\n\
-+ --multiple\t Open each icon in a separate window. Default is no.\n\
-+\n\
- ", PACKAGE, VERSION, PACKAGE);
-   exit (0);
- }
diff --git a/x11-misc/peksystray/peksystray-0.2.1.ebuild b/x11-misc/peksystray/peksystray-0.2.1.ebuild
index 33b8d1a3addb..49cdba010c36 100644
--- a/x11-misc/peksystray/peksystray-0.2.1.ebuild
+++ b/x11-misc/peksystray/peksystray-0.2.1.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/peksystray/peksystray-0.2.1.ebuild,v 1.6 2005/08/07 13:39:51 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/peksystray/peksystray-0.2.1.ebuild,v 1.7 2006/02/11 11:22:28 nelchael Exp $
 
 inherit eutils
 
@@ -11,16 +11,20 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha ppc x86"
-DEPEND="virtual/x11"
 IUSE=""
 
+RDEPEND="|| ( (
+		x11-libs/libXt
+		x11-libs/libX11 )
+	virtual/x11 )"
+DEPEND="${RDEPEND}"
+
 src_compile() {
-	econf --x-libraries=/usr/X11R6/lib || die
+	econf --x-libraries=/usr/lib || die
 	emake || die
 }
 
 src_install() {
 	dobin src/peksystray
-
 	dodoc AUTHORS NEWS README THANKS TODO
 }
diff --git a/x11-misc/peksystray/peksystray-0.2.ebuild b/x11-misc/peksystray/peksystray-0.2.ebuild
deleted file mode 100644
index 99d30f56e5f1..000000000000
--- a/x11-misc/peksystray/peksystray-0.2.ebuild
+++ /dev/null
@@ -1,33 +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/peksystray/peksystray-0.2.ebuild,v 1.6 2005/01/30 18:01:59 taviso Exp $
-
-inherit eutils
-
-DESCRIPTION="A system tray dockapp for window managers supporting docking"
-HOMEPAGE="http://freshmeat.net/projects/peksystray"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 alpha"
-DEPEND="virtual/x11"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-
-	# Quick patch to get rid of the multi-line string literal.
-	# 	-taviso (10 Jan 2004)
-	cd ${S}; epatch ${FILESDIR}/${PN}-gcc3-mlsl.diff
-}
-
-src_compile() {
-	econf --x-libraries=/usr/X11R6/lib || die
-	emake || die
-}
-
-src_install() {
-	dodoc AUTHORS COPYING NEWS README THANKS TODO
-	dobin src/peksystray
-}
diff --git a/x11-misc/wmctrl/ChangeLog b/x11-misc/wmctrl/ChangeLog
index 9ff0557cd364..c24e574cbf8d 100644
--- a/x11-misc/wmctrl/ChangeLog
+++ b/x11-misc/wmctrl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/wmctrl
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmctrl/ChangeLog,v 1.10 2005/12/12 19:47:31 metalgod Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmctrl/ChangeLog,v 1.11 2006/02/11 11:25:51 nelchael Exp $
+
+  11 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org> -wmctrl-1.04.ebuild,
+  -wmctrl-1.05.ebuild, wmctrl-1.07.ebuild:
+  Fixed DEPEND for modular X.
 
   12 Dec 2005; Luis Medinas <metalgod@gentoo.org> wmctrl-1.07.ebuild:
   Added ~amd64 keyword.
diff --git a/x11-misc/wmctrl/files/digest-wmctrl-1.04 b/x11-misc/wmctrl/files/digest-wmctrl-1.04
deleted file mode 100644
index 77aa4d0cb4ce..000000000000
--- a/x11-misc/wmctrl/files/digest-wmctrl-1.04
+++ /dev/null
@@ -1 +0,0 @@
-MD5 63955f6859033025d7fb60c919e2a39f wmctrl-1.04.tar.gz 82758
diff --git a/x11-misc/wmctrl/files/digest-wmctrl-1.05 b/x11-misc/wmctrl/files/digest-wmctrl-1.05
deleted file mode 100644
index 31ea5604ca96..000000000000
--- a/x11-misc/wmctrl/files/digest-wmctrl-1.05
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ab184d3a68d90ad0eefb493f12b109d8 wmctrl-1.05.tar.gz 83049
diff --git a/x11-misc/wmctrl/wmctrl-1.04.ebuild b/x11-misc/wmctrl/wmctrl-1.04.ebuild
deleted file mode 100644
index d213591c7f45..000000000000
--- a/x11-misc/wmctrl/wmctrl-1.04.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/wmctrl/wmctrl-1.04.ebuild,v 1.7 2005/02/20 10:42:49 usata Exp $
-
-IUSE=""
-
-DESCRIPTION="command line tool to interact with an EWMH/NetWM compatible X Window Manager"
-HOMEPAGE="http://sweb.cz/tripie/utils/wmctrl/"
-SRC_URI="http://sweb.cz/tripie/utils/wmctrl/dist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc"
-
-DEPEND="virtual/x11"
-
-src_install () {
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
-	make DESTDIR=${D} install || die
-}
diff --git a/x11-misc/wmctrl/wmctrl-1.05.ebuild b/x11-misc/wmctrl/wmctrl-1.05.ebuild
deleted file mode 100644
index c54145a28b56..000000000000
--- a/x11-misc/wmctrl/wmctrl-1.05.ebuild
+++ /dev/null
@@ -1,19 +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/wmctrl/wmctrl-1.05.ebuild,v 1.5 2005/02/20 10:42:49 usata Exp $
-
-DESCRIPTION="command line tool to interact with an EWMH/NetWM compatible X Window Manager"
-HOMEPAGE="http://sweb.cz/tripie/utils/wmctrl/"
-SRC_URI="http://sweb.cz/tripie/utils/wmctrl/dist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc"
-IUSE=""
-
-DEPEND="virtual/x11"
-
-src_install () {
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
-	make DESTDIR=${D} install || die
-}
diff --git a/x11-misc/wmctrl/wmctrl-1.07.ebuild b/x11-misc/wmctrl/wmctrl-1.07.ebuild
index 90fe8c31581c..aceb6b0e4ee1 100644
--- a/x11-misc/wmctrl/wmctrl-1.07.ebuild
+++ b/x11-misc/wmctrl/wmctrl-1.07.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/wmctrl/wmctrl-1.07.ebuild,v 1.4 2005/12/12 19:47:31 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wmctrl/wmctrl-1.07.ebuild,v 1.5 2006/02/11 11:25:51 nelchael Exp $
 
 DESCRIPTION="command line tool to interact with an EWMH/NetWM compatible X Window Manager"
 HOMEPAGE="http://sweb.cz/tripie/utils/wmctrl/"
@@ -11,7 +11,13 @@ SLOT="0"
 KEYWORDS="~amd64 ppc ~sparc x86"
 IUSE=""
 
-DEPEND="virtual/x11
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXmu )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xproto virtual/x11 )
 	>=dev-libs/glib-2"
 
 src_install () {