summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Cummings <mcummings@gentoo.org>2005-03-17 21:06:04 +0000
committerMichael Cummings <mcummings@gentoo.org>2005-03-17 21:06:04 +0000
commit7512d1fad4a4f7820fe0503f2dd3dfd6f3d500c1 (patch)
tree0364b63c653310d6cd7151a37c3c84574d367c34 /dev-lang/pugs
parentebuild updates for GNUstep base, libs, and apps across the board; proper vers... (diff)
downloadgentoo-2-7512d1fad4a4f7820fe0503f2dd3dfd6f3d500c1.tar.gz
gentoo-2-7512d1fad4a4f7820fe0503f2dd3dfd6f3d500c1.tar.bz2
gentoo-2-7512d1fad4a4f7820fe0503f2dd3dfd6f3d500c1.zip
Better handling of the either/or dep
(Portage version: 2.0.51.19)
Diffstat (limited to 'dev-lang/pugs')
-rw-r--r--dev-lang/pugs/ChangeLog5
-rw-r--r--dev-lang/pugs/pugs-6.0.11.ebuild20
2 files changed, 7 insertions, 18 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/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 ) "