Fixed DEPEND for modular X.

(Portage version: 2.1_pre4-r1)

9 files changed, 47 insertions, 43 deletions

diff --git a/x11-plugins/wmweather/ChangeLog b/x11-plugins/wmweather/ChangeLog
index 2eff9b872ef0..765a624bec28 100644
--- a/x11-plugins/wmweather/ChangeLog
+++ b/x11-plugins/wmweather/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmweather
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmweather/ChangeLog,v 1.15 2005/02/06 17:21:56 corsair Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmweather/ChangeLog,v 1.16 2006/01/31 21:08:32 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmweather-2.4.0.ebuild:
+  Fixed DEPEND for modular X.
 
   06 Feb 2005; Markus Rothe <corsair@gentoo.org> wmweather-2.4.0.ebuild:
   Stable on ppc64
diff --git a/x11-plugins/wmweather/wmweather-2.4.0.ebuild b/x11-plugins/wmweather/wmweather-2.4.0.ebuild
index e163c0201be0..afa29182da0e 100644
--- a/x11-plugins/wmweather/wmweather-2.4.0.ebuild
+++ b/x11-plugins/wmweather/wmweather-2.4.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-plugins/wmweather/wmweather-2.4.0.ebuild,v 1.14 2005/02/06 17:21:56 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmweather/wmweather-2.4.0.ebuild,v 1.15 2006/01/31 21:08:32 nelchael Exp $
 
 IUSE=""
 DESCRIPTION="Dockable applet for WindowMaker that shows weather."
@@ -11,8 +11,15 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 sparc amd64 ~mips ppc ppc64"
 
-DEPEND="virtual/x11
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )
 	net-misc/curl"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xextproto virtual/x11 )"
 
 src_compile() {
 	cd ${S}/src
diff --git a/x11-plugins/wmxkb/ChangeLog b/x11-plugins/wmxkb/ChangeLog
index b4c61508388a..d9328a933bcb 100644
--- a/x11-plugins/wmxkb/ChangeLog
+++ b/x11-plugins/wmxkb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmxkb
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxkb/ChangeLog,v 1.6 2005/08/29 08:36:58 s4t4n Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxkb/ChangeLog,v 1.7 2006/01/31 21:11:35 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> -wmxkb-1.2.0.ebuild,
+  wmxkb-1.2.2.ebuild:
+  Fixed DEPEND for modular X.
 
   29 Aug 2005; Michele Noberasco <s4t4n@gentoo.org> wmxkb-1.2.2.ebuild:
   Stable for x86.
diff --git a/x11-plugins/wmxkb/files/digest-wmxkb-1.2.0 b/x11-plugins/wmxkb/files/digest-wmxkb-1.2.0
deleted file mode 100644
index c7d7305648e9..000000000000
--- a/x11-plugins/wmxkb/files/digest-wmxkb-1.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9bd783e623568754fc855ad87ea11bb7 wmxkb-1.2.0.tar.gz 187488
diff --git a/x11-plugins/wmxkb/wmxkb-1.2.0.ebuild b/x11-plugins/wmxkb/wmxkb-1.2.0.ebuild
deleted file mode 100644
index 0544c48f15e6..000000000000
--- a/x11-plugins/wmxkb/wmxkb-1.2.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxkb/wmxkb-1.2.0.ebuild,v 1.3 2004/06/24 23:20:22 agriffis Exp $
-
-IUSE=""
-
-DESCRIPTION="Dockable keyboard layout switcher for Window Maker"
-HOMEPAGE="http://www.geocities.com/wmalms/#WMXKB"
-SRC_URI="http://www.geocities.com/wmalms/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~sparc"
-
-DEPEND="virtual/x11"
-
-src_install () {
-	make DESTDIR=${D} BINDIR=${D}/usr/bin DOCDIR=${D}/usr/share/doc DATADIR=${D}/usr/share install
-	dodoc README
-	cd ${WORKDIR}/${P}/doc
-	dodoc manual_body.html manual_title.html manual.book
-}
diff --git a/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild b/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild
index 14a5bc8cc98c..23c3fd8bd611 100644
--- a/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild
+++ b/x11-plugins/wmxkb/wmxkb-1.2.2.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-plugins/wmxkb/wmxkb-1.2.2.ebuild,v 1.3 2005/08/29 08:36:58 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild,v 1.4 2006/01/31 21:11:35 nelchael Exp $
 
 IUSE=""
 
@@ -12,7 +12,18 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~ppc ~sparc x86"
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xproto
+		x11-proto/xextproto
+		x11-proto/inputproto )
+	virtual/x11 )"
 
 src_install () {
 	make DESTDIR=${D} BINDIR=${D}/usr/bin DOCDIR=${D}/usr/share/doc DATADIR=${D}/usr/share install
diff --git a/x11-plugins/wmxmms/ChangeLog b/x11-plugins/wmxmms/ChangeLog
index 384cb5004b15..54b3b6f612a0 100644
--- a/x11-plugins/wmxmms/ChangeLog
+++ b/x11-plugins/wmxmms/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmxmms
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxmms/ChangeLog,v 1.11 2005/11/19 11:30:40 killerfox Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxmms/ChangeLog,v 1.12 2006/01/31 21:13:19 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmxmms-0.1.4.ebuild,
+  wmxmms-0.1.4-r1.ebuild:
+  Fixed DEPEND for modular X.
 
   19 Nov 2005; Rene Nussbaumer <killerfox@gentoo.org>
   wmxmms-0.1.4-r1.ebuild:
diff --git a/x11-plugins/wmxmms/wmxmms-0.1.4-r1.ebuild b/x11-plugins/wmxmms/wmxmms-0.1.4-r1.ebuild
index 978daa58bd99..a80d55293cf0 100644
--- a/x11-plugins/wmxmms/wmxmms-0.1.4-r1.ebuild
+++ b/x11-plugins/wmxmms/wmxmms-0.1.4-r1.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-plugins/wmxmms/wmxmms-0.1.4-r1.ebuild,v 1.5 2005/11/19 11:30:40 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxmms/wmxmms-0.1.4-r1.ebuild,v 1.6 2006/01/31 21:13:19 nelchael Exp $
 
 inherit eutils
 
@@ -15,8 +15,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="alpha ~amd64 hppa ppc ~sparc x86"
 
-DEPEND="virtual/x11
-	media-sound/xmms"
+DEPEND="media-sound/xmms"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-plugins/wmxmms/wmxmms-0.1.4.ebuild b/x11-plugins/wmxmms/wmxmms-0.1.4.ebuild
index 109d977dd38a..f27465204c26 100644
--- a/x11-plugins/wmxmms/wmxmms-0.1.4.ebuild
+++ b/x11-plugins/wmxmms/wmxmms-0.1.4.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-plugins/wmxmms/wmxmms-0.1.4.ebuild,v 1.9 2005/04/11 08:52:04 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxmms/wmxmms-0.1.4.ebuild,v 1.10 2006/01/31 21:13:19 nelchael Exp $
 
 IUSE=""
 MY_P=${P/wm/WM}
@@ -13,8 +13,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc ~sparc ~alpha hppa amd64"
 
-DEPEND="virtual/x11
-	media-sound/xmms"
+DEPEND="media-sound/xmms"
 
 src_unpack() {
 	unpack ${A}