summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Kolmodin <kolmodin@gentoo.org>2009-07-23 06:21:39 +0000
committerLennart Kolmodin <kolmodin@gentoo.org>2009-07-23 06:21:39 +0000
commit6ce0013085892ce9d235fe353ae445a9cd15456d (patch)
treecb06a690d7f09ed38d98916cd6aa0495a492b599 /dev-haskell/haddock
parentBump uclibc patchset to fix a digest screwup (diff)
downloadhistorical-6ce0013085892ce9d235fe353ae445a9cd15456d.tar.gz
historical-6ce0013085892ce9d235fe353ae445a9cd15456d.tar.bz2
historical-6ce0013085892ce9d235fe353ae445a9cd15456d.zip
Update DEPEND for dev-haskell/haddock, relax deps.
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'dev-haskell/haddock')
-rw-r--r--dev-haskell/haddock/ChangeLog5
-rw-r--r--dev-haskell/haddock/Manifest10
-rw-r--r--dev-haskell/haddock/haddock-2.4.2.ebuild6
3 files changed, 12 insertions, 9 deletions
diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog
index e216273f7516..6154c0880c84 100644
--- a/dev-haskell/haddock/ChangeLog
+++ b/dev-haskell/haddock/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-haskell/haddock
# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.60 2009/07/15 17:54:37 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.61 2009/07/23 06:21:39 kolmodin Exp $
+
+ 23 Jul 2009; Lennart Kolmodin <kolmodin@gentoo.org> haddock-2.4.2.ebuild:
+ Relax deps, haddock works with dev-lang/ghc-6.10.4 too.
15 Jul 2009; Lennart Kolmodin <kolmodin@gentoo.org> haddock-2.4.2.ebuild:
Haddock 2.4.2 supports ghc-6.10.3 too, update DEPEND.
diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
index a4960ba87c03..d8ac1020032b 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -8,13 +8,13 @@ DIST haddock-0.9.tar.gz 163380 RMD160 27685313184e70270d7e4f043c7d671b84acfb23 S
DIST haddock-2.4.2.tar.gz 103033 RMD160 18317b3ffd60f2b0925d635ce1ea2ab35825860c SHA1 cd1de409029bcabdf79b05b4c00c7702c836c765 SHA256 dbf0a7d0103a3ce6a91b2a3b96148c1b9c13ea7f8bd74260c21fe98df7839547
EBUILD haddock-0.8.ebuild 1691 RMD160 2275082d63a82cdf2e50b3b35ad3f4b8cc93adee SHA1 3feb6d51b114e201d48f185af86532ce859725fd SHA256 c311f887dff9e748689f969524d8e923735d1026282e95fbe5fe20c8dae2522e
EBUILD haddock-0.9.ebuild 1160 RMD160 afbaecefe7e2e5259cb932b1057a254d6ac07ae1 SHA1 18d8b08c71a9de4be90cef743905a783221a37c7 SHA256 3a36527c9f8f772eeb65757e4574c344af79025599edf68cadde0eed6ec4203e
-EBUILD haddock-2.4.2.ebuild 2260 RMD160 f5686ec7b736f6d43a5c38f1155e4401e4488966 SHA1 d2eaa0a49601d3c10ad9bdbad99379127f0261a4 SHA256 bac5d3a95983598f3d72e89516c3469109084e53ad7268ebdea80fdb2cb316e4
-MISC ChangeLog 8112 RMD160 dae9572b4072e022fdd1971b6c183229d6f511e8 SHA1 c9a06d372b68ce2771aaaa95ac87fc518fd87874 SHA256 4699661809adf9d0ce71a7dd174a83ce60803b603737553c61b15f1a9c8246a5
+EBUILD haddock-2.4.2.ebuild 2258 RMD160 f078944a1260370fbbdd42a0bff3b5c45abb7a25 SHA1 543b415df531b9920188fae5e3d9fb13757b9353 SHA256 d14af2455b0e92f5495e0a19d22687d9cbebd6cf8df5c3f8be55db2a837f5a45
+MISC ChangeLog 8247 RMD160 13dcccd25b6bad8836193b7e856c4eaddd7647f8 SHA1 119c6f188c48565897769757057ef8e1adc72e4b SHA256 08278f25bc0892cf7845865e3caf799536eec832ab8b37c78e3a091ed9fc0d93
MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkpeF+YACgkQ1n/CYbXjntIqXwCgoK4fTYsVp8bqFircJfD+Dc/Z
-1oIAmQGKwh/HOUQ0gLQozYN9zwVaxBXC
-=legR
+iEYEARECAAYFAkpoAXYACgkQ1n/CYbXjntLD0wCfQNh16B1Nx7EaxgNw00AKi2Zk
+1TUAn0i1FokzZZfXtwOczyy34LeZ9TZY
+=ZGAl
-----END PGP SIGNATURE-----
diff --git a/dev-haskell/haddock/haddock-2.4.2.ebuild b/dev-haskell/haddock/haddock-2.4.2.ebuild
index 9f23ea17a49a..331d25763dcf 100644
--- a/dev-haskell/haddock/haddock-2.4.2.ebuild
+++ b/dev-haskell/haddock/haddock-2.4.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.2.ebuild,v 1.4 2009/07/15 17:54:37 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.2.ebuild,v 1.5 2009/07/23 06:21:39 kolmodin Exp $
CABAL_FEATURES="bin lib"
# don't enable profiling as the 'ghc' package is not built with profiling
@@ -28,8 +28,8 @@ IUSE="doc"
# package. ghc-paths would like to be compiled with USE=doc, which pulls in
# haddock, which requires ghc-paths, which pulls in haddock...
-# builds with ghc-6.10.2/3, but not .1
-RDEPEND="|| ( =dev-lang/ghc-6.10.2* =dev-lang/ghc-6.10.3* )"
+# doesn't build with ghc-6.10.1, but that has never been in portage
+RDEPEND="=dev-lang/ghc-6.10*"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.6
doc? ( ~app-text/docbook-xml-dtd-4.2