diff options
| author |   Lennart Kolmodin <kolmodin@gentoo.org> | 2009-07-29 17:31:30 +0000 |
|---|---|---|
| committer | Lennart Kolmodin <kolmodin@gentoo.org> | 2009-07-29 17:31:30 +0000 |
| commit | 420e64d6e0380bc072e36c3521f8450f053ff37b (patch) | |
| tree | c84c5e3e623e7849071ea0939e785d4d8558b59f /dev-haskell/haddock | |
| parent | Initial commit from kde-testing. Per bug #238458. (diff) | |
| download | historical-420e64d6e0380bc072e36c3521f8450f053ff37b.tar.gz historical-420e64d6e0380bc072e36c3521f8450f053ff37b.tar.bz2 historical-420e64d6e0380bc072e36c3521f8450f053ff37b.zip | |
Make cabal dep to dev-haskell/haddock more strict
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'dev-haskell/haddock')
| -rw-r--r-- | dev-haskell/haddock/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-haskell/haddock/Manifest | 10 | ||||
| -rw-r--r-- | dev-haskell/haddock/haddock-2.4.1.ebuild | 6 |
3 files changed, 14 insertions, 8 deletions
diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog index 32a52aa1734a..43cf52a55408 100644 --- a/dev-haskell/haddock/ChangeLog +++ b/dev-haskell/haddock/ChangeLog @@ -1,6 +1,10 @@ # 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.63 2009/07/28 18:51:01 kolmodin Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.64 2009/07/29 17:31:30 kolmodin Exp $ + + 29 Jul 2009; Lennart Kolmodin <kolmodin@gentoo.org> haddock-2.4.1.ebuild: + Update cabal dependency due to bundled ghc-paths, ghc-paths needs + >=cabal-1.6. 28 Jul 2009; Lennart Kolmodin <kolmodin@gentoo.org> haddock-2.4.1.ebuild: Don't depend on dev-haskell/filepath to avoid circular dependency. diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest index 68caf4d2187e..a689459b77b1 100644 --- a/dev-haskell/haddock/Manifest +++ b/dev-haskell/haddock/Manifest @@ -9,14 +9,14 @@ DIST haddock-2.4.1.tar.gz 100122 RMD160 f950b5b719ad655cdd3bd6878d99163cfcd04097 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.1.ebuild 2567 RMD160 78c50ca4935abd97efc20db78eb5c0940727dcef SHA1 532c83e192dc22dc20f2dea345e1c5de5babfec1 SHA256 6c8ea7f513599d0c4cd77cdb0f56837c41f68fdfe42e8b197889ddb5b4e1249a +EBUILD haddock-2.4.1.ebuild 2648 RMD160 03d6aea3cff114ac48af768f016a6a7b81d469b7 SHA1 34ef4408d1d880ea27b9a1fc322cf4c59ed6116b SHA256 6f6d7a6327d8d995357127fab337df820e36a006c7893f1ffbf0a2ad875f0374 EBUILD haddock-2.4.2.ebuild 2258 RMD160 f078944a1260370fbbdd42a0bff3b5c45abb7a25 SHA1 543b415df531b9920188fae5e3d9fb13757b9353 SHA256 d14af2455b0e92f5495e0a19d22687d9cbebd6cf8df5c3f8be55db2a837f5a45 -MISC ChangeLog 8625 RMD160 63f2302a3041ace8c817a0addc4aa09acb1c5be6 SHA1 8708ed82dd0bd8b7c918ca27b75786359beaf905 SHA256 10647941c90db94bf740b52d06414a72161bde71ef741d23b916fbf92f7f7302 +MISC ChangeLog 8785 RMD160 1639113391ba0190597a59cb43e0de015b0aa503 SHA1 26e3a9413c43ff2462a85d77ac3385c0f6661e07 SHA256 76550b7d3a9d934ceeb2f94c220098c0d9d3271777771cd07738a13ba5e93cac MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAkpvSJkACgkQ1n/CYbXjntLjWQCeIwiVzWKH6yC8BlJjNoSXTo5n -bW8AoJD7H8/PAt4NX5QuWCvyWjhucSAA -=5ejW +iEYEARECAAYFAkpwh4IACgkQ1n/CYbXjntJoLACfbFK9ciUsaPzFfkQUlbcKtTQy +0HsAn3ZPNM8S/LTnX0NVkN4/JHPnxKF9 +=OqWg -----END PGP SIGNATURE----- diff --git a/dev-haskell/haddock/haddock-2.4.1.ebuild b/dev-haskell/haddock/haddock-2.4.1.ebuild index b0c3ec7b6db5..c3185ba7ed26 100644 --- a/dev-haskell/haddock/haddock-2.4.1.ebuild +++ b/dev-haskell/haddock/haddock-2.4.1.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.1.ebuild,v 1.3 2009/07/28 18:51:02 kolmodin Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.1.ebuild,v 1.4 2009/07/29 17:31:30 kolmodin Exp $ CABAL_FEATURES="bin lib" # don't enable profiling as the 'ghc' package is not built with profiling @@ -29,10 +29,11 @@ IUSE="doc" # we bundle the dep on ghc-paths to reduce the dependencies on this critical # package. ghc-paths would like to be compiled with USE=doc, which pulls in # haddock, which requires ghc-paths, which pulls in haddock... +# bundling ghc-paths forces us to depend on >=cabal-1.6 rather than >=cabal-1.2 RDEPEND=">=dev-lang/ghc-6.8.2" DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.2 + >=dev-haskell/cabal-1.6 doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 )" @@ -82,3 +83,4 @@ src_install () { fi dodoc CHANGES README } + |