Fixed DEPEND for modular X.

(Portage version: 2.1_pre4-r1)

7 files changed, 68 insertions, 18 deletions

diff --git a/x11-wm/aewm++-goodies/ChangeLog b/x11-wm/aewm++-goodies/ChangeLog
index 8ea48bc2058d..12eb5e141377 100644
--- a/x11-wm/aewm++-goodies/ChangeLog
+++ b/x11-wm/aewm++-goodies/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/aewm++-goodies
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm++-goodies/ChangeLog,v 1.8 2005/06/30 18:16:13 josejx Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm++-goodies/ChangeLog,v 1.9 2006/02/03 15:02:20 nelchael Exp $
+
+  03 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  aewm++-goodies-1.0.ebuild:
+  Fixed DEPEND for modular X.
 
   30 Jun 2005; Joseph Jezak <josejx@gentoo.org> aewm++-goodies-1.0.ebuild:
   Marked ppc stable for bug #97512. Thanks nixnut.
diff --git a/x11-wm/aewm++-goodies/aewm++-goodies-1.0.ebuild b/x11-wm/aewm++-goodies/aewm++-goodies-1.0.ebuild
index b9c9d4cc4a3d..345ee2289917 100644
--- a/x11-wm/aewm++-goodies/aewm++-goodies-1.0.ebuild
+++ b/x11-wm/aewm++-goodies/aewm++-goodies-1.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-wm/aewm++-goodies/aewm++-goodies-1.0.ebuild,v 1.10 2005/06/30 18:16:13 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm++-goodies/aewm++-goodies-1.0.ebuild,v 1.11 2006/02/03 15:02:20 nelchael Exp $
 
 inherit eutils
 
@@ -13,7 +13,16 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xproto
+		x11-proto/xextproto )
+	virtual/x11 )"
 
 S="${WORKDIR}/${PN/-/_}"
 
diff --git a/x11-wm/aewm++/ChangeLog b/x11-wm/aewm++/ChangeLog
index 77662290ff64..099f7767f300 100644
--- a/x11-wm/aewm++/ChangeLog
+++ b/x11-wm/aewm++/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/aewm++
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm++/ChangeLog,v 1.9 2005/06/30 18:00:27 josejx Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm++/ChangeLog,v 1.10 2006/02/03 14:59:45 nelchael Exp $
+
+  03 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org> aewm++-1.0.22.ebuild,
+  aewm++-1.0.24.ebuild:
+  Fixed DEPEND for modular X.
 
   30 Jun 2005; Joseph Jezak <josejx@gentoo.org> aewm++-1.0.24.ebuild:
   Marked ppc stable for bug #97511.  Thanks nixnut.
diff --git a/x11-wm/aewm++/aewm++-1.0.22.ebuild b/x11-wm/aewm++/aewm++-1.0.22.ebuild
index cd2b7ccb5e54..86ab0dd10e08 100644
--- a/x11-wm/aewm++/aewm++-1.0.22.ebuild
+++ b/x11-wm/aewm++/aewm++-1.0.22.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-wm/aewm++/aewm++-1.0.22.ebuild,v 1.9 2005/01/07 04:56:40 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm++/aewm++-1.0.22.ebuild,v 1.10 2006/02/03 14:59:45 nelchael Exp $
 
 IUSE=""
 
@@ -10,7 +10,16 @@ SRC_URI="mirror://sourceforge/sapphire/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
-DEPEND="virtual/x11"
+
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xproto
+		x11-proto/xextproto )
+	virtual/x11 )"
 
 src_compile() {
 	make CFLAGS="${CXXFLAGS}" || die
diff --git a/x11-wm/aewm++/aewm++-1.0.24.ebuild b/x11-wm/aewm++/aewm++-1.0.24.ebuild
index ca237f1e33f4..16ee8818f585 100644
--- a/x11-wm/aewm++/aewm++-1.0.24.ebuild
+++ b/x11-wm/aewm++/aewm++-1.0.24.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-wm/aewm++/aewm++-1.0.24.ebuild,v 1.8 2005/06/30 18:00:27 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm++/aewm++-1.0.24.ebuild,v 1.9 2006/02/03 14:59:45 nelchael Exp $
 
 inherit eutils
 
@@ -10,9 +10,18 @@ SRC_URI="mirror://sourceforge/sapphire/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-DEPEND="virtual/x11"
 IUSE=""
 
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXext )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xproto
+		x11-proto/xextproto )
+	virtual/x11 )"
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
diff --git a/x11-wm/aewm/ChangeLog b/x11-wm/aewm/ChangeLog
index 5251aec473c9..aace73ac9c40 100644
--- a/x11-wm/aewm/ChangeLog
+++ b/x11-wm/aewm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-wm/aewm
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm/ChangeLog,v 1.11 2005/06/30 17:50:47 josejx Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm/ChangeLog,v 1.12 2006/02/03 14:57:43 nelchael Exp $
+
+  03 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org> aewm-1.2.3.ebuild:
+  Fixed DEPEND for modular X.
 
   30 Jun 2005; Joseph Jezak <josejx@gentoo.org> aewm-1.2.3.ebuild:
   Marked ppc stable for bug #97510. Thanks nixnut.
diff --git a/x11-wm/aewm/aewm-1.2.3.ebuild b/x11-wm/aewm/aewm-1.2.3.ebuild
index 8a5d35fa762c..a61516589740 100644
--- a/x11-wm/aewm/aewm-1.2.3.ebuild
+++ b/x11-wm/aewm/aewm-1.2.3.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-wm/aewm/aewm-1.2.3.ebuild,v 1.8 2005/06/30 17:50:47 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm/aewm-1.2.3.ebuild,v 1.9 2006/02/03 14:57:43 nelchael Exp $
 
 inherit eutils
 
@@ -12,7 +12,19 @@ SRC_URI="http://www.red-bean.com/%7Edecklin/aewm/${P}.tar.gz"
 LICENSE="aewm"
 SLOT="0"
 KEYWORDS="ppc x86"
-DEPEND="virtual/x11
+
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXaw
+		x11-libs/libXft
+		x11-libs/libXext )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xproto
+		x11-proto/xextproto )
+	virtual/x11 )
 	gtk2? ( >=x11-libs/gtk+-2.0.0 ) !gtk2? ( =x11-libs/gtk+-1.2* )
 	>=sys-apps/sed-4"