diff options
| author |   Andres Loeh <kosmikus@gentoo.org> | 2005-03-19 13:12:49 +0000 |
|---|---|---|
| committer | Andres Loeh <kosmikus@gentoo.org> | 2005-03-19 13:12:49 +0000 |
| commit | 2e648ddbd7d08ec2f67b05f2634098e110512802 (patch) | |
| tree | 91fe41442567b05778e0c3bc8adae58de5cbc958 /dev-haskell/happy | |
| parent | Stable on alpha. (diff) | |
| download | historical-2e648ddbd7d08ec2f67b05f2634098e110512802.tar.gz historical-2e648ddbd7d08ec2f67b05f2634098e110512802.tar.bz2 historical-2e648ddbd7d08ec2f67b05f2634098e110512802.zip | |
ghc-6.4 compatibility
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'dev-haskell/happy')
| -rw-r--r-- | dev-haskell/happy/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-haskell/happy/Manifest | 12 | ||||
| -rw-r--r-- | dev-haskell/happy/happy-1.14.ebuild | 5 | ||||
| -rw-r--r-- | dev-haskell/happy/happy-1.15.ebuild | 5 |
4 files changed, 19 insertions, 10 deletions
diff --git a/dev-haskell/happy/ChangeLog b/dev-haskell/happy/ChangeLog index d49cdf5681d6..b9e2801ad165 100644 --- a/dev-haskell/happy/ChangeLog +++ b/dev-haskell/happy/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-haskell/happy # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/ChangeLog,v 1.9 2005/03/19 12:36:31 kosmikus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/ChangeLog,v 1.10 2005/03/19 13:12:49 kosmikus Exp $ + + 19 Mar 2005; Andres Loeh <kosmikus@gentoo.org> happy-1.14.ebuild, + happy-1.15.ebuild: + happy-1.14 is blocked by ghc-6.4 now, whereas happy-1.15 should build with + ghc-6.4. 19 Mar 2005; Andres Loeh <kosmikus@gentoo.org> happy-1.15.ebuild: Added ~amd64 keyword. diff --git a/dev-haskell/happy/Manifest b/dev-haskell/happy/Manifest index e9c0bc9e8faf..7c79fffdd590 100644 --- a/dev-haskell/happy/Manifest +++ b/dev-haskell/happy/Manifest @@ -1,9 +1,9 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 20e1ba2398d6852e91c97d54a7bca2d6 happy-1.15.ebuild 1350 -MD5 fd5ca24eb88ac4a96353617f48830446 happy-1.14.ebuild 701 -MD5 d89844079fc9f4a521c4892abf46863e ChangeLog 1260 +MD5 f7f9c465ff7e0db372d7e4e258e67183 happy-1.15.ebuild 1457 +MD5 de509a6365e2f5e31d0628ce8587d8ad happy-1.14.ebuild 719 +MD5 d9451fcd15cc10a622990d72699c5016 ChangeLog 1439 MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224 MD5 ccdd754a8212bb8a0ad2fa759a297250 files/happy-1.14-gcc3.4.patch 1849 MD5 e4734e57e0ebad5144da11376e6aed02 files/digest-happy-1.14 66 @@ -11,7 +11,7 @@ MD5 eb8bc65651f73e615f61ffc31a95a7c6 files/digest-happy-1.15 66 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) -iD8DBQFCPB3bOKSBj1ObwosRAkaTAJ0biA0xIF74ohUX7qvAy6ks3a7wCACdE2/L -iFeBkzBXL68xwub9n9lqq6k= -=SCoY +iD8DBQFCPCaSOKSBj1ObwosRAsNIAJ90fQaAAuo02XKFANg664eVvrl5XQCcD8Dh +LNsP1JM6gOVil6PJ9gpbCTs= +=uRzV -----END PGP SIGNATURE----- diff --git a/dev-haskell/happy/happy-1.14.ebuild b/dev-haskell/happy/happy-1.14.ebuild index 33e8b6ac3d2d..ed47f0fac040 100644 --- a/dev-haskell/happy/happy-1.14.ebuild +++ b/dev-haskell/happy/happy-1.14.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-haskell/happy/happy-1.14.ebuild,v 1.6 2005/01/01 18:04:41 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/happy-1.14.ebuild,v 1.7 2005/03/19 13:12:49 kosmikus Exp $ inherit base eutils @@ -12,7 +12,8 @@ SLOT="0" KEYWORDS="x86" IUSE="" -DEPEND="virtual/ghc" +DEPEND="virtual/ghc + !>=virtual/ghc-6.4" RDEPEND="" src_unpack() { diff --git a/dev-haskell/happy/happy-1.15.ebuild b/dev-haskell/happy/happy-1.15.ebuild index 625f3dcc660a..b2c1894d19cb 100644 --- a/dev-haskell/happy/happy-1.15.ebuild +++ b/dev-haskell/happy/happy-1.15.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-haskell/happy/happy-1.15.ebuild,v 1.2 2005/03/19 12:36:31 kosmikus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/happy-1.15.ebuild,v 1.3 2005/03/19 13:12:49 kosmikus Exp $ inherit base eutils @@ -24,6 +24,9 @@ src_unpack() { src_compile() { econf || die "configure failed" + if has_version '>=dev-lang/ghc-6.4'; then + echo "SRC_HC_OPTS += -ignore-package util" >> mk/build.mk + fi emake -j1 || die "make failed" if use doc; then emake -j1 html || die "make html failed" |