Fixed DEPEND for modular X.

(Portage version: 2.1_pre4-r1)

6 files changed, 38 insertions, 16 deletions

diff --git a/x11-plugins/wmmail/ChangeLog b/x11-plugins/wmmail/ChangeLog
index 8bf02deccee4..53974c2634fa 100644
--- a/x11-plugins/wmmail/ChangeLog
+++ b/x11-plugins/wmmail/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmmail
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmail/ChangeLog,v 1.12 2005/11/11 08:48:23 s4t4n Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmail/ChangeLog,v 1.13 2006/01/31 19:45:08 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmmail-0.64-r3.ebuild:
+  Fixed DEPEND for modular X.
 
   11 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmmail-0.64-r3.ebuild:
   Removed COPYING from dodoc.
diff --git a/x11-plugins/wmmail/wmmail-0.64-r3.ebuild b/x11-plugins/wmmail/wmmail-0.64-r3.ebuild
index d950c369ec06..e2cbc32d56f8 100644
--- a/x11-plugins/wmmail/wmmail-0.64-r3.ebuild
+++ b/x11-plugins/wmmail/wmmail-0.64-r3.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/wmmail/wmmail-0.64-r3.ebuild,v 1.7 2005/11/11 08:48:23 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmail/wmmail-0.64-r3.ebuild,v 1.8 2006/01/31 19:45:08 nelchael Exp $
 
 IUSE=""
 MY_PN=WMMail.app
@@ -14,7 +14,14 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 sparc amd64 ppc"
 
-DEPEND="virtual/x11
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xextproto virtual/x11 )
 	x11-libs/libPropList"
 
 src_compile() {
diff --git a/x11-plugins/wmmaiload/ChangeLog b/x11-plugins/wmmaiload/ChangeLog
index 1af62d70ccca..e8c8a95f0a36 100644
--- a/x11-plugins/wmmaiload/ChangeLog
+++ b/x11-plugins/wmmaiload/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmmaiload
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmaiload/ChangeLog,v 1.19 2005/04/11 07:40:13 s4t4n Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmaiload/ChangeLog,v 1.20 2006/01/31 19:46:38 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmmaiload-1.0.2.ebuild:
+  Fixed DEPEND for modular X.
 
   11 Apr 2005; Michele Noberasco <s4t4n@gentoo.org> wmmaiload-1.0.1.ebuild:
   Wiped out older version.
diff --git a/x11-plugins/wmmaiload/wmmaiload-1.0.2.ebuild b/x11-plugins/wmmaiload/wmmaiload-1.0.2.ebuild
index 6f45959cef3a..22d3aa91366f 100644
--- a/x11-plugins/wmmaiload/wmmaiload-1.0.2.ebuild
+++ b/x11-plugins/wmmaiload/wmmaiload-1.0.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/wmmaiload/wmmaiload-1.0.2.ebuild,v 1.4 2005/04/10 11:55:42 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmaiload/wmmaiload-1.0.2.ebuild,v 1.5 2006/01/31 19:46:38 nelchael Exp $
 
 DESCRIPTION="dockapp that monitors one or more mailboxes."
 SRC_URI="http://tnemeth.free.fr/projets/programmes/${P}.tar.gz"
@@ -10,8 +10,7 @@ SLOT="0"
 KEYWORDS="x86 amd64 ppc ~sparc"
 LICENSE="GPL-2"
 
-DEPEND="virtual/x11
-	>=x11-libs/gtk+-1.2.10-r11"
+DEPEND=">=x11-libs/gtk+-1.2.10-r11"
 IUSE=""
 
 src_compile() {
diff --git a/x11-plugins/wmmemfree/ChangeLog b/x11-plugins/wmmemfree/ChangeLog
index 38a2da3e3d10..91d219061f9b 100644
--- a/x11-plugins/wmmemfree/ChangeLog
+++ b/x11-plugins/wmmemfree/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmmemfree
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemfree/ChangeLog,v 1.8 2005/11/11 09:08:44 s4t4n Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemfree/ChangeLog,v 1.9 2006/01/31 19:48:13 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  wmmemfree-0.7-r1.ebuild:
+  Fixed DEPEND for modular X.
 
   11 Nov 2005; Michele Noberasco <s4t4n@gentoo.org> wmmemfree-0.7-r1.ebuild:
   Removed INSTALL and COPYING from dodoc.
diff --git a/x11-plugins/wmmemfree/wmmemfree-0.7-r1.ebuild b/x11-plugins/wmmemfree/wmmemfree-0.7-r1.ebuild
index d0cc01f17c71..8cf584c74fbf 100644
--- a/x11-plugins/wmmemfree/wmmemfree-0.7-r1.ebuild
+++ b/x11-plugins/wmmemfree/wmmemfree-0.7-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/wmmemfree/wmmemfree-0.7-r1.ebuild,v 1.6 2005/11/11 09:08:44 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmemfree/wmmemfree-0.7-r1.ebuild,v 1.7 2006/01/31 19:48:13 nelchael Exp $
 
 inherit eutils
 
@@ -13,7 +13,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc ppc64 ~sparc"
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xextproto virtual/x11 )"
 
 src_unpack()
 {