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
commit9e69876d44f12756e66f8988df79818c9bdb930a (patch)
tree7919dd2bd1b03c89e18e95b869fe98791f7205a2 /dev-ada
parentIncorporate Ulrich Mueller's cleanups from bug #122652. (diff)
downloadhistorical-9e69876d44f12756e66f8988df79818c9bdb930a.tar.gz
historical-9e69876d44f12756e66f8988df79818c9bdb930a.tar.bz2
historical-9e69876d44f12756e66f8988df79818c9bdb930a.zip
Fix dependencies for modular X (bug #119389).
Package-Manager: portage-2.1_pre4-r1
Diffstat (limited to 'dev-ada')
-rw-r--r--dev-ada/adabindx/ChangeLog8
-rw-r--r--dev-ada/adabindx/Manifest24
-rw-r--r--dev-ada/adabindx/adabindx-0.7.2-r1.ebuild10
-rw-r--r--dev-ada/adabindx/adabindx-0.7.2.ebuild9
4 files changed, 35 insertions, 16 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/Manifest b/dev-ada/adabindx/Manifest
index 923020823a1e..625b88041bfd 100644
--- a/dev-ada/adabindx/Manifest
+++ b/dev-ada/adabindx/Manifest
@@ -1,7 +1,21 @@
-MD5 04fabdb277cc755e6cfb58b42eee6675 metadata.xml 384
-MD5 23bb5eb50f3581b3a856f6a7a6253f42 ChangeLog 1564
-MD5 71ee9a5de1d8ece7af4e0d195ac291ae adabindx-0.7.2-r1.ebuild 1880
-MD5 ec1f0439c3288378766fcc382a70a837 adabindx-0.7.2.ebuild 1795
+MD5 2f7d20df183e267dbeb73eee927ea2b4 ChangeLog 1728
+RMD160 99128e40e62bc5483f86c0a49fc092b005e418b8 ChangeLog 1728
+SHA256 04fb4cfdeab250de1d3e3620c4209ca85bb8bfef95c2636b5b77058a31650d7c ChangeLog 1728
+MD5 49ecef24f92103f56b13cc9d6252aeed adabindx-0.7.2-r1.ebuild 1920
+RMD160 50d8b93bfa5f232ea85c18b2937401e5045f630f adabindx-0.7.2-r1.ebuild 1920
+SHA256 02167d266ac0e6f25820e152ddf744d90880c98246e0537d083eb9a3ea46dea3 adabindx-0.7.2-r1.ebuild 1920
+MD5 c7b0c67a18694be5c074d14edf10b3ae adabindx-0.7.2.ebuild 1842
+RMD160 d0a08b1772620a446c3916e74c0b98c634a03268 adabindx-0.7.2.ebuild 1842
+SHA256 a7fbc693f4c9ad14b4ab6df8e6ab8a25341e26a6610523cf9cf683404bba6da6 adabindx-0.7.2.ebuild 1842
+MD5 5850752cc78726ab7e19b4574c6b6b3c files/adabindx-0.7.2.diff.bz2 20067
+RMD160 c54821c2b7c3886bfa1b3aa52a0d38523fa18577 files/adabindx-0.7.2.diff.bz2 20067
+SHA256 e3c6062475213e4de63ed4d1d1c26940bea5303d862313c1e50b32f237620dc2 files/adabindx-0.7.2.diff.bz2 20067
MD5 8c577abf12ed815ffdc1400d2aee29c8 files/digest-adabindx-0.7.2 67
+RMD160 13a050d089196e8acedc5ef5be1ae4cc336f535a files/digest-adabindx-0.7.2 67
+SHA256 ab62c2589d515f94bb41a0ff5ccc61267144f4ba62e42298323c2017d1fe2c59 files/digest-adabindx-0.7.2 67
MD5 8c577abf12ed815ffdc1400d2aee29c8 files/digest-adabindx-0.7.2-r1 67
-MD5 5850752cc78726ab7e19b4574c6b6b3c files/adabindx-0.7.2.diff.bz2 20067
+RMD160 13a050d089196e8acedc5ef5be1ae4cc336f535a files/digest-adabindx-0.7.2-r1 67
+SHA256 ab62c2589d515f94bb41a0ff5ccc61267144f4ba62e42298323c2017d1fe2c59 files/digest-adabindx-0.7.2-r1 67
+MD5 04fabdb277cc755e6cfb58b42eee6675 metadata.xml 384
+RMD160 de3c3d174f6ffcd40db0cf69d4b5852e8177c991 metadata.xml 384
+SHA256 51f47cecaf260cddeffb20a43ff39cd5c98522eb8876e998f64a1e713254cd3d metadata.xml 384
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"