summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Pawlik <nelchael@gentoo.org>2006-02-03 15:02:20 +0000
committerKrzysztof Pawlik <nelchael@gentoo.org>2006-02-03 15:02:20 +0000
commitddad0e2afc5d3560e63c9d7fddddb47e17956f6e (patch)
tree271d2d23e642f20ff7931fc6d1ec4cec1a09b20e /x11-wm/aewm++
parentStable on hppa. (diff)
downloadgentoo-2-ddad0e2afc5d3560e63c9d7fddddb47e17956f6e.tar.gz
gentoo-2-ddad0e2afc5d3560e63c9d7fddddb47e17956f6e.tar.bz2
gentoo-2-ddad0e2afc5d3560e63c9d7fddddb47e17956f6e.zip
Fixed DEPEND for modular X.
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'x11-wm/aewm++')
-rw-r--r--x11-wm/aewm++/ChangeLog8
-rw-r--r--x11-wm/aewm++/aewm++-1.0.22.ebuild15
-rw-r--r--x11-wm/aewm++/aewm++-1.0.24.ebuild15
3 files changed, 30 insertions, 8 deletions
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}