summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Baergen <joshuabaergen@gentoo.org>2006-02-14 03:24:56 +0000
committerJoshua Baergen <joshuabaergen@gentoo.org>2006-02-14 03:24:56 +0000
commit88275256ed45ee27212dab199c1b0cdebfb5e15a (patch)
tree62ebb4558af968aa202b818af4df9f054db9f767 /dev-ada
parentIncorporate Ulrich Mueller's cleanups from bug #122652. (diff)
downloadgentoo-2-88275256ed45ee27212dab199c1b0cdebfb5e15a.tar.gz
gentoo-2-88275256ed45ee27212dab199c1b0cdebfb5e15a.tar.bz2
gentoo-2-88275256ed45ee27212dab199c1b0cdebfb5e15a.zip
Fix dependencies for modular X (bug #119389).
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'dev-ada')
-rw-r--r--dev-ada/adabindx/ChangeLog8
-rw-r--r--dev-ada/adabindx/adabindx-0.7.2-r1.ebuild10
-rw-r--r--dev-ada/adabindx/adabindx-0.7.2.ebuild9
3 files changed, 16 insertions, 11 deletions
diff --git a/dev-ada/adabindx/ChangeLog b/dev-ada/adabindx/ChangeLog
index bdb8919b7129..00f0a90f186a 100644
--- a/dev-ada/adabindx/ChangeLog
+++ b/dev-ada/adabindx/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-ada/adabindx
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/adabindx/ChangeLog,v 1.13 2005/04/24 03:30:33 hansmi Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/adabindx/ChangeLog,v 1.14 2006/02/14 03:24:56 joshuabaergen Exp $
+
+ 14 Feb 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+ adabindx-0.7.2.ebuild, adabindx-0.7.2-r1.ebuild:
+ Fix dependencies for modular X (bug #119389).
24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
adabindx-0.7.2-r1.ebuild:
diff --git a/dev-ada/adabindx/adabindx-0.7.2-r1.ebuild b/dev-ada/adabindx/adabindx-0.7.2-r1.ebuild
index 31c288625301..272b76dd9ac1 100644
--- a/dev-ada/adabindx/adabindx-0.7.2-r1.ebuild
+++ b/dev-ada/adabindx/adabindx-0.7.2-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/dev-ada/adabindx/adabindx-0.7.2-r1.ebuild,v 1.2 2005/04/24 03:30:34 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/adabindx/adabindx-0.7.2-r1.ebuild,v 1.3 2006/02/14 03:24:56 joshuabaergen Exp $
#
inherit eutils gnat
@@ -10,10 +10,10 @@ SRC_URI="http://home.arcor.de/hfvogt/${P}.tar.bz2"
HOMEPAGE="http://home.arcor.de/hfvogt/programming.html"
LICENSE="GMGPL"
-DEPEND=">=dev-lang/gnat-3.14p
- virtual/x11
+RDEPEND="|| ( x11-libs/libXpm virtual/x11 )"
+DEPEND="${RDEPEND}
+ >=dev-lang/gnat-3.14p
>=sys-apps/sed-4"
-RDEPEND=""
KEYWORDS="~x86 ppc"
SLOT="0"
IUSE=""
diff --git a/dev-ada/adabindx/adabindx-0.7.2.ebuild b/dev-ada/adabindx/adabindx-0.7.2.ebuild
index e03ea766859a..c891d7ee9af4 100644
--- a/dev-ada/adabindx/adabindx-0.7.2.ebuild
+++ b/dev-ada/adabindx/adabindx-0.7.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/dev-ada/adabindx/adabindx-0.7.2.ebuild,v 1.10 2005/01/01 17:22:18 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/adabindx/adabindx-0.7.2.ebuild,v 1.11 2006/02/14 03:24:56 joshuabaergen Exp $
#
inherit gnat
@@ -10,8 +10,9 @@ SRC_URI="http://home.arcor.de/hfvogt/${P}.tar.bz2"
HOMEPAGE="http://home.arcor.de/hfvogt/programming.html"
LICENSE="GMGPL"
-DEPEND=">=dev-lang/gnat-3.14p
- virtual/x11
+RDEPEND="|| ( x11-libs/libXpm virtual/x11 )"
+DEPEND="${RDEPEND}
+ >=dev-lang/gnat-3.14p
>=sys-apps/sed-4"
RDEPEND=""
KEYWORDS="x86 ~ppc"