diff options
| author |   Michael Cummings <mcummings@gentoo.org> | 2005-03-17 21:06:04 +0000 |
|---|---|---|
| committer | Michael Cummings <mcummings@gentoo.org> | 2005-03-17 21:06:04 +0000 |
| commit | f20d6fe385f1d5f43d1e021d8c6c99077111b2a2 (patch) | |
| tree | 11491161d1a974cf0d80e592fcabfcd7f62d0e62 /dev-lang | |
| parent | add mysql readme for postgres install #85585 (diff) | |
| download | historical-f20d6fe385f1d5f43d1e021d8c6c99077111b2a2.tar.gz historical-f20d6fe385f1d5f43d1e021d8c6c99077111b2a2.tar.bz2 historical-f20d6fe385f1d5f43d1e021d8c6c99077111b2a2.zip | |
Better handling of the either/or dep
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/pugs/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-lang/pugs/Manifest | 10 | ||||
| -rw-r--r-- | dev-lang/pugs/pugs-6.0.11.ebuild | 20 |
3 files changed, 12 insertions, 23 deletions
diff --git a/dev-lang/pugs/ChangeLog b/dev-lang/pugs/ChangeLog index 7ef7a676c801..b77316aa6fa1 100644 --- a/dev-lang/pugs/ChangeLog +++ b/dev-lang/pugs/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/pugs # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/pugs/ChangeLog,v 1.1 2005/03/14 14:43:20 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/pugs/ChangeLog,v 1.2 2005/03/17 21:06:04 mcummings Exp $ + + 17 Mar 2005; Michael Cummings <mcummings@gentoo.org> pugs-6.0.11.ebuild: + Better handling of the either/or dep *pugs-6.0.11 (14 Mar 2005) diff --git a/dev-lang/pugs/Manifest b/dev-lang/pugs/Manifest index dd7fc88f4dee..c9834dbadac2 100644 --- a/dev-lang/pugs/Manifest +++ b/dev-lang/pugs/Manifest @@ -1,14 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +MD5 0ab75828ddab6c37bcfbb32ac56cff1a pugs-6.0.11.ebuild 641 +MD5 d980d12ac7f6a828046aa8d24422442e ChangeLog 710 MD5 e195d07dd8c771cb3816ab6cece1510e metadata.xml 464 -MD5 071b0e3e4022ab788fa5c846cc4d45a9 pugs-6.0.11.ebuild 1077 -MD5 1138bd9f086106dced69d5b13e84f757 ChangeLog 595 MD5 9b22fae8c9c831a52de40862635a0763 files/digest-pugs-6.0.11 69 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) -iD8DBQFCNaMVtG5z4I8BtQoRAmMwAJ0Uo+6nLYDaPfnHwm9TMiyOA5M4mwCcCqrO -ETU+nxiLsq+KaDYYNaH4cY0= -=eIgo +iD8DBQFCOfBCtG5z4I8BtQoRAsSXAJ9LDFDDPwQVRIwOz6AE/M5jGEnb7QCfbm1e +iMRcVpm1AZq+FpmiiBf/JHQ= +=b4ZE -----END PGP SIGNATURE----- diff --git a/dev-lang/pugs/pugs-6.0.11.ebuild b/dev-lang/pugs/pugs-6.0.11.ebuild index 01fbe18c4910..13edaeb53de7 100644 --- a/dev-lang/pugs/pugs-6.0.11.ebuild +++ b/dev-lang/pugs/pugs-6.0.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/pugs/pugs-6.0.11.ebuild,v 1.1 2005/03/14 14:43:20 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/pugs/pugs-6.0.11.ebuild,v 1.2 2005/03/17 21:06:04 mcummings Exp $ inherit perl-module @@ -18,20 +18,6 @@ KEYWORDS="~x86 ~amd64" IUSE="" -# Not sure how kosher this approach is - basically didn't want to force -# the user to compile ghc if they didn't already have a copy - but didn't want -# to force ghc-bin if they had a copy of ghc already installed. - -if has "dev-lang/ghc" ; then - DEPEND=">=dev-lang/ghc-6.2.1 - dev-perl/Term-ReadLine-Perl" -else - DEPEND=">=dev-lang/ghc-bin-6.2.1 - dev-perl/Term-ReadLine-Perl" -fi - -#TODO: -#headers for readline are missing -> does not work yet ! - #readline? (>=dev-perl/Term-ReadLine-Perl-1.0203 - #>=sys-libs/readline-4.3-r5) +DEPEND="dev-perl/Term-ReadLine-Perl + ||( >=dev-lang/ghc-bin-6.2.1 >=dev-lang/ghc-6.2.1 ) " |