Fixed DEPEND for modular X.

(Portage version: 2.1_pre4-r1)

4 files changed, 48 insertions, 17 deletions

diff --git a/x11-plugins/wmbiff/ChangeLog b/x11-plugins/wmbiff/ChangeLog
index 66bc81082ef9..b28eeaeb8cc8 100644
--- a/x11-plugins/wmbiff/ChangeLog
+++ b/x11-plugins/wmbiff/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/wmbiff
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/ChangeLog,v 1.21 2005/12/15 09:09:40 s4t4n Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/ChangeLog,v 1.22 2006/01/31 21:20:02 nelchael Exp $
+
+  31 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> wmbiff-0.4.25.ebuild,
+  wmbiff-0.4.25-r1.ebuild, wmbiff-0.4.27.ebuild:
+  Fixed DEPEND for modular X.
 
 *wmbiff-0.4.27 (15 Dec 2005)
 
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.25-r1.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.25-r1.ebuild
index 1d2af1dcd9cc..152372f60ce2 100644
--- a/x11-plugins/wmbiff/wmbiff-0.4.25-r1.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.4.25-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/wmbiff/wmbiff-0.4.25-r1.ebuild,v 1.4 2005/06/17 20:22:59 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/wmbiff-0.4.25-r1.ebuild,v 1.5 2006/01/31 21:20:02 nelchael Exp $
 
 inherit eutils
 
@@ -8,9 +8,18 @@ DESCRIPTION="WMBiff is a dock applet for WindowMaker which can monitor up to 5 m
 SRC_URI="mirror://sourceforge/wmbiff/${P}.tar.gz"
 HOMEPAGE="http://sourceforge.net/projects/wmbiff/"
 
-DEPEND="virtual/x11
-		crypt? ( >=net-libs/gnutls-1.0.4
-			>=dev-libs/libgcrypt-1.1.94 )"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xproto
+		x11-proto/xextproto )
+	virtual/x11 )
+	crypt? ( >=net-libs/gnutls-1.0.4
+		>=dev-libs/libgcrypt-1.1.94 )"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.25.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.25.ebuild
index d5477170fc46..7526bbffeb54 100644
--- a/x11-plugins/wmbiff/wmbiff-0.4.25.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.4.25.ebuild
@@ -1,14 +1,23 @@
-# 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/wmbiff/wmbiff-0.4.25.ebuild,v 1.6 2005/05/10 08:34:04 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/wmbiff-0.4.25.ebuild,v 1.7 2006/01/31 21:20:02 nelchael Exp $
 
 DESCRIPTION="WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes."
 SRC_URI="mirror://sourceforge/wmbiff/${P}.tar.gz"
 HOMEPAGE="http://sourceforge.net/projects/wmbiff/"
 
-DEPEND="virtual/x11
-		crypt? ( >=net-libs/gnutls-1.0.4
-			>=dev-libs/libgcrypt-1.1.94 )"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xproto
+		x11-proto/xextproto )
+	virtual/x11 )
+	crypt? ( >=net-libs/gnutls-1.0.4
+		>=dev-libs/libgcrypt-1.1.94 )"
 
 SLOT="0"
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.27.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.27.ebuild
index c4cb5a66a775..e73db60884f2 100644
--- a/x11-plugins/wmbiff/wmbiff-0.4.27.ebuild
+++ b/x11-plugins/wmbiff/wmbiff-0.4.27.ebuild
@@ -1,14 +1,23 @@
-# 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/wmbiff/wmbiff-0.4.27.ebuild,v 1.1 2005/12/15 09:09:40 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/wmbiff-0.4.27.ebuild,v 1.2 2006/01/31 21:20:02 nelchael Exp $
 
 DESCRIPTION="WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes."
 SRC_URI="mirror://sourceforge/wmbiff/${P}.tar.gz"
 HOMEPAGE="http://sourceforge.net/projects/wmbiff/"
 
-DEPEND="virtual/x11
-		crypt? ( >=net-libs/gnutls-1.2.3
-			>=dev-libs/libgcrypt-1.2.1 )"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xproto
+		x11-proto/xextproto )
+	virtual/x11 )
+	crypt? ( >=net-libs/gnutls-1.2.3
+		>=dev-libs/libgcrypt-1.2.1 )"
 
 SLOT="0"
 LICENSE="GPL-2"