diff options
| author |   Andres Loeh <kosmikus@gentoo.org> | 2005-03-24 14:54:39 +0000 |
|---|---|---|
| committer | Andres Loeh <kosmikus@gentoo.org> | 2005-03-24 14:54:39 +0000 |
| commit | cd92a905cbee07c8e2c5f7dcce53ceb817e403a5 (patch) | |
| tree | eafa057f6bfcbd2160cdaa998adbd451994927b4 /dev-haskell | |
| parent | Fix typo, thanks to Herbie Hopkins <herbie@hopkins.net>, bug #84324. (diff) | |
| download | historical-cd92a905cbee07c8e2c5f7dcce53ceb817e403a5.tar.gz historical-cd92a905cbee07c8e2c5f7dcce53ceb817e403a5.tar.bz2 historical-cd92a905cbee07c8e2c5f7dcce53ceb817e403a5.zip | |
haddock-0.6-r3 works with ghc-6.4 now
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'dev-haskell')
| -rw-r--r-- | dev-haskell/haddock/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-haskell/haddock/Manifest | 10 | ||||
| -rw-r--r-- | dev-haskell/haddock/haddock-0.6-r3.ebuild | 13 |
3 files changed, 16 insertions, 12 deletions
diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog index b1e21926b701..b47f1aca8020 100644 --- a/dev-haskell/haddock/ChangeLog +++ b/dev-haskell/haddock/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-haskell/haddock # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.20 2005/03/23 14:03:58 kosmikus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.21 2005/03/24 14:54:39 kosmikus Exp $ + + 24 Mar 2005; Andres Loeh <kosmikus@gentoo.org> haddock-0.6-r3.ebuild: + haddock-0.6-r3 works with ghc-6.4 now. 23 Mar 2005; Andres Loeh <kosmikus@gentoo.org> haddock-0.6-r2.ebuild, haddock-0.6-r3.ebuild: diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest index dee05c583cb3..008fb5090e90 100644 --- a/dev-haskell/haddock/Manifest +++ b/dev-haskell/haddock/Manifest @@ -2,8 +2,8 @@ Hash: SHA1 MD5 128b9a894439f7226495b06aa0ea7b3c haddock-0.6-r2.ebuild 1981 -MD5 ab4ffb3f071cdfebb0878a7eb65bb810 haddock-0.6-r3.ebuild 2271 -MD5 1334c64c4c586cb3a857c729283e029e ChangeLog 3316 +MD5 03482b72095314a06ab7144d9c34775d haddock-0.6-r3.ebuild 2217 +MD5 c684e8e503b63fb2dd2caf251794656f ChangeLog 3430 MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224 MD5 6c35081e22594c96591797459c28da01 files/digest-haddock-0.6-r2 67 MD5 6c35081e22594c96591797459c28da01 files/digest-haddock-0.6-r3 67 @@ -11,7 +11,7 @@ MD5 bd211a7c5442dadeee6975dbb15f2e45 files/haddock-0.6-gcc3.4.patch 1967 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFCQXh5OKSBj1ObwosRAvNvAJ4pqfzAoE+dS9C1xgQ7GceUOnkbsgCfcRL3 -GatqCM3g1VGzYI6wC8Kx/P4= -=w933 +iD8DBQFCQtX/OKSBj1ObwosRAqL1AJ4nXoqDpejZfGBnQjHIVGENjjg80wCghH6g +SGxUJ+ZvOxkJnSIjMZVAUpU= +=VBqW -----END PGP SIGNATURE----- diff --git a/dev-haskell/haddock/haddock-0.6-r3.ebuild b/dev-haskell/haddock/haddock-0.6-r3.ebuild index 2c70754d80c5..fba40bf96472 100644 --- a/dev-haskell/haddock/haddock-0.6-r3.ebuild +++ b/dev-haskell/haddock/haddock-0.6-r3.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/haddock/haddock-0.6-r3.ebuild,v 1.5 2005/03/23 14:03:58 kosmikus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.6-r3.ebuild,v 1.6 2005/03/24 14:54:39 kosmikus Exp $ # # USE variable summary: # doc - Build extra documenation from DocBook sources, @@ -20,7 +20,6 @@ KEYWORDS="x86 ~ppc ~amd64" LICENSE="as-is" DEPEND="virtual/ghc - !>=virtual/ghc-6.4 doc? ( >=app-text/openjade-1.3.1 >=app-text/sgml-common-0.6.3 ~app-text/docbook-sgml-dtd-3.1 @@ -30,9 +29,6 @@ DEPEND="virtual/ghc RDEPEND="" -# extend path to /opt/ghc/bin to guarantee that ghc-bin is found -GHCPATH="${PATH}:/opt/ghc/bin" - src_unpack() { base_src_unpack epatch ${FILESDIR}/${P}-gcc3.4.patch @@ -41,7 +37,12 @@ src_unpack() { src_compile() { # unset SGML_CATALOG_FILES because documentation installation # breaks otherwise ... - PATH="${GHCPATH}" SGML_CATALOG_FILES="" econf || die "econf failed" + SGML_CATALOG_FILES="" econf || die "econf failed" + + if $(ghc-cabal); then + echo "SRC_HC_OPTS += -package mtl" >> mk/build.mk + fi + # using -j1 because -j2 behaved strangely on my machine emake -j1 || die "make failed" |