summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Pawlik <nelchael@gentoo.org>2006-02-11 11:28:16 +0000
committerKrzysztof Pawlik <nelchael@gentoo.org>2006-02-11 11:28:16 +0000
commita0bb95579782d0deb1dc0d8ca0b66ac8a0212ef5 (patch)
treebc84b255fed6d84ea7d79d27a5dd4d6ed670ba6b /x11-wm/amiwm
parentFixed DEPEND for modular X. (diff)
downloadgentoo-2-a0bb95579782d0deb1dc0d8ca0b66ac8a0212ef5.tar.gz
gentoo-2-a0bb95579782d0deb1dc0d8ca0b66ac8a0212ef5.tar.bz2
gentoo-2-a0bb95579782d0deb1dc0d8ca0b66ac8a0212ef5.zip
Fixed DEPEND for modular X.
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'x11-wm/amiwm')
-rw-r--r--x11-wm/amiwm/ChangeLog7
-rw-r--r--x11-wm/amiwm/amiwm-0.20_p48.ebuild15
2 files changed, 17 insertions, 5 deletions
diff --git a/x11-wm/amiwm/ChangeLog b/x11-wm/amiwm/ChangeLog
index 126c132bb18c..bca2502cb121 100644
--- a/x11-wm/amiwm/ChangeLog
+++ b/x11-wm/amiwm/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-wm/amiwm
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/amiwm/ChangeLog,v 1.5 2005/12/25 04:41:37 vapier Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/amiwm/ChangeLog,v 1.6 2006/02/11 11:28:16 nelchael Exp $
+
+ 11 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org> amiwm-0.20_p48.ebuild:
+ Fixed DEPEND for modular X.
25 Dec 2005; Mike Frysinger <vapier@gentoo.org>
+files/amiwm-0.20_p48-flex.patch, amiwm-0.20_p48.ebuild:
diff --git a/x11-wm/amiwm/amiwm-0.20_p48.ebuild b/x11-wm/amiwm/amiwm-0.20_p48.ebuild
index a9b013bf3cf5..124d1ddadf8b 100644
--- a/x11-wm/amiwm/amiwm-0.20_p48.ebuild
+++ b/x11-wm/amiwm/amiwm-0.20_p48.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/amiwm/amiwm-0.20_p48.ebuild,v 1.6 2005/12/25 04:41:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/amiwm/amiwm-0.20_p48.ebuild,v 1.7 2006/02/11 11:28:16 nelchael Exp $
inherit eutils
@@ -14,7 +14,16 @@ SLOT="0"
KEYWORDS="~x86 ~ppc"
IUSE=""
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+ x11-libs/libX11
+ x11-libs/libXmu
+ x11-libs/libXext )
+ virtual/x11 )"
+DEPEND="${RDEPEND}
+ || ( (
+ x11-proto/xproto
+ x11-proto/xextproto )
+ virtual/x11 )"
S=${WORKDIR}/${MY_P}