Fixed DEPEND for modular X.

(Portage version: 2.1_pre4-r1)

6 files changed, 15 insertions, 46 deletions

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