diff options
| -rw-r--r-- | dev-haskell/haddock/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-haskell/haddock/Manifest | 14 | ||||
| -rw-r--r-- | dev-haskell/haddock/haddock-0.8.ebuild | 66 | ||||
| -rw-r--r-- | dev-haskell/haddock/haddock-0.9.ebuild | 48 | ||||
| -rw-r--r-- | dev-haskell/haddock/haddock-2.4.1.ebuild | 89 |
5 files changed, 9 insertions, 214 deletions
diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog index a2d6765bf6b5..623308ea81c8 100644 --- a/dev-haskell/haddock/ChangeLog +++ b/dev-haskell/haddock/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/haddock # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.83 2011/06/05 12:19:18 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.84 2011/06/05 12:20:59 slyfox Exp $ + + 05 Jun 2011; Sergei Trofimovich <slyfox@gentoo.org> -haddock-0.8.ebuild, + -haddock-0.9.ebuild, -haddock-2.4.1.ebuild: + Removed old (needed ancient ghc and Cabal). 05 Jun 2011; Sergei Trofimovich <slyfox@gentoo.org> haddock-2.6.1.ebuild: restored lost ~x86-fbsd (we have ghc there now) diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest index b146ba86220d..108045bd9c63 100644 --- a/dev-haskell/haddock/Manifest +++ b/dev-haskell/haddock/Manifest @@ -4,22 +4,16 @@ Hash: SHA1 AUX ghc-paths-1.0.5.0-GHC-Paths.hs 238 RMD160 e00a3771dc7e9b2b4dbf3e77cd12fa424f635198 SHA1 a147a60f803f63cf475e7ba5e7d24bbbe50feae3 SHA256 a86c668fba73a97e14aa58e7dbf9c9bdbcee0c4782bff185b4d905d048c47a9e AUX haddock-2.4.2-Setup.hs 3200 RMD160 11c340505daf3a7bf7bbac1abbebc279dabb1744 SHA1 8f0d5ef94365528586750062a77b06f064082a7b SHA256 a9dd6ebc855781897d0357450859202ce553574f9cec0c5cda381c343ce1eb09 DIST ghc-paths-0.1.0.5.tar.gz 2304 RMD160 098804e5a48ce9381174245601b3896304464219 SHA1 f9a70a8564be268e4aa88436ea18fc84a1ce303a SHA256 ea9e97425894e3dbd7915e00e107e2e7fc07b6e8293fd2dd66a813f0673cba10 -DIST haddock-0.8-src.tar.gz 162872 RMD160 80b7a582ea91fb36b97675d7ea8a027221a28b8e SHA1 e171d4446ac6fcef526cad4c688892fe587fe90e SHA256 d54078dd9dc75aa589cb05fbe1136c1fb41d4a346e30b71de948425ea7c05a55 -DIST haddock-0.9.tar.gz 163380 RMD160 27685313184e70270d7e4f043c7d671b84acfb23 SHA1 f3c5299b657b170e7a44b66ebd60d3e0947a35aa SHA256 beefd4a6da577978e7a79cabba60970accc5cd48fbb04c424a6b36ace3a9f8d0 -DIST haddock-2.4.1.tar.gz 100122 RMD160 f950b5b719ad655cdd3bd6878d99163cfcd04097 SHA1 452f80bf274c14ace5d6e0fd05af34c2980a1cfb SHA256 59418f086fc3726d50130137dcab20c32d50392991c35d74df8ce11c16ce39a3 DIST haddock-2.4.2.tar.gz 103033 RMD160 18317b3ffd60f2b0925d635ce1ea2ab35825860c SHA1 cd1de409029bcabdf79b05b4c00c7702c836c765 SHA256 dbf0a7d0103a3ce6a91b2a3b96148c1b9c13ea7f8bd74260c21fe98df7839547 DIST haddock-2.6.1.tar.gz 128158 RMD160 32be5206f0caab3e6aa7582b9ad23a22581082ab SHA1 f088795826a155f0a207219a45ad643dcaeccf65 SHA256 626bfbc51f33ada003fbbfe1b40f3147039369e9898f8e8d2f5c1c863436ea6a -EBUILD haddock-0.8.ebuild 1681 RMD160 7ef1b6e514db604b05c32d090225a037a96e771a SHA1 9bccb980d2685622a74a21ab1b5aad739fe178e6 SHA256 72141630ea3149cc35f4706c844a1b500ca1cdb7e1d5bf824cd95c16e881be56 -EBUILD haddock-0.9.ebuild 1149 RMD160 36f127a66683fdb3a5ee2e01e35c6815ae326927 SHA1 9ff2f36d2ad904ea094a8d8de53d04d6b498a052 SHA256 3a0ac49c89dd6bad1a8c19ed68456a5757db719f2f5b40ecbb2b0c277b2e08e7 -EBUILD haddock-2.4.1.ebuild 2793 RMD160 fb60f50c801e5c0340432a5737da2f7727c6fca0 SHA1 89a0aa428e91b916d3f3d7e63beccec7e65a7577 SHA256 803e7019215e6b32f5a1d949f4406db7b0ec94b941d46b8b580a2b724aa0df26 EBUILD haddock-2.4.2.ebuild 2425 RMD160 4bc2d79fe5a71cba14c06cf1c5a9d9e467db1379 SHA1 a65439584d366164200a16ab485841b4d12d7579 SHA256 d77ea400a62ccead9e4060c70b2c63d51ed04598d3c4c36ce861c1addc0b05d2 EBUILD haddock-2.6.1.ebuild 2493 RMD160 a9bbabaa61c2accd4c5212849b5fc4a309ca8888 SHA1 4975c694400b02363ba845aea035b22886f86cc3 SHA256 c430761c0b3e1109c320b7227d9d629da76c6ba8354744e72b1288a83e6d3c18 -MISC ChangeLog 11446 RMD160 ead88b4452a62391a066c5dfed057cc61b7dabf6 SHA1 87c84ad406e55cb26d1b8a3a8212845568558eb1 SHA256 a9bb547acf6fb5b1e023408a0d3f325f1887d2d1e8bbd7c7ace93c4c43b7b63a +MISC ChangeLog 11614 RMD160 d6a80d200bb6ccc0e6f2cbfa61d1f5c9ef42c654 SHA1 7456823c2fe036d2bd25793eb19364a78c0802e6 SHA256 217cf47692604fa223695f8a880b7e222c89bc99383aa16f5d054134022ab752 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk3rdQAACgkQcaHudmEf86oMvQCeJ+vCEadRjGCYMr05aiE46sLO -YSYAnRvE5+FZZ3xuZ3ysByiWV24W0EcZ -=fxnq +iEYEARECAAYFAk3rdWIACgkQcaHudmEf86oJiACfecrS255YjzTIqEVs1g8oiGVl +jaIAn0v/yHYvOJ4ywLCenUCI3aQ7R5RY +=MRi2 -----END PGP SIGNATURE----- diff --git a/dev-haskell/haddock/haddock-0.8.ebuild b/dev-haskell/haddock/haddock-0.8.ebuild deleted file mode 100644 index 86fc736f3a2c..000000000000 --- a/dev-haskell/haddock/haddock-0.8.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.8.ebuild,v 1.17 2010/07/01 19:24:02 jer Exp $ - -CABAL_FEATURES="bin" -inherit haskell-cabal eutils versionator autotools - -MY_PF=$(replace_version_separator 3 '-' ${PF}) - -DESCRIPTION="A documentation tool for Haskell." -HOMEPAGE="http://haskell.org/haddock/" -SRC_URI="http://haskell.org/haddock/${MY_PF}-src.tar.gz" -LICENSE="as-is" -SLOT="0" - -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd" - -IUSE="doc" - -DEPEND="<dev-lang/ghc-6.10 - >=dev-haskell/cabal-1.1.4 - doc? ( ~app-text/docbook-xml-dtd-4.2 - app-text/docbook-xsl-stylesheets - >=dev-libs/libxslt-1.1.2 )" -RDEPEND="" - -S="${WORKDIR}/${MY_PF}" - -src_unpack () { - unpack ${A} - - #FIXME: remove the following two workarounds when haddock-0.9 is released - - # Cabal 1.2 expects the pre-processed sources in a different location: - mkdir -p "${S}/dist/build/haddock/haddock-tmp/" - cp "${S}/src/HaddockLex.hs" \ - "${S}/src/HaddockParse.hs" \ - "${S}/src/HsParser.hs" \ - "${S}/dist/build/haddock/haddock-tmp/" - - # Add in the extra split-base deps - if version_is_at_least "6.8" "$(ghc-version)"; then - sed -i -e '/build-depends:/a \ - ,array, containers, directory, pretty, process' \ - "${S}/haddock.cabal" - fi -} - -src_compile () { - cabal_src_compile - if use doc; then - cd "${S}/doc" - eautoconf - ./configure --prefix="${D}/usr/" \ - || die 'error configuring documentation.' - make html || die 'error building documentation.' - fi -} - -src_install () { - cabal_src_install - if use doc; then - dohtml -r "${S}/doc/haddock/"* - fi - dodoc CHANGES README -} diff --git a/dev-haskell/haddock/haddock-0.9.ebuild b/dev-haskell/haddock/haddock-0.9.ebuild deleted file mode 100644 index 172d8d21672f..000000000000 --- a/dev-haskell/haddock/haddock-0.9.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.9.ebuild,v 1.3 2010/07/01 19:24:02 jer Exp $ - -CABAL_FEATURES="bin" -inherit haskell-cabal eutils autotools - -DESCRIPTION="A documentation tool for Haskell." -HOMEPAGE="http://haskell.org/haddock/" -SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="doc" - -DEPEND="<dev-lang/ghc-6.10 - >=dev-haskell/cabal-1.2 - doc? ( ~app-text/docbook-xml-dtd-4.2 - app-text/docbook-xsl-stylesheets - >=dev-libs/libxslt-1.1.2 )" -RDEPEND="" - -src_unpack() { - unpack ${A} - if use doc; then - cd "${S}/doc" - eautoreconf - fi -} - -src_compile () { - cabal_src_compile - if use doc; then - cd "${S}/doc" - ./configure --prefix="${D}/usr/" \ - || die 'error configuring documentation.' - emake html || die 'error building documentation.' - fi -} - -src_install () { - cabal_src_install - if use doc; then - dohtml -r "${S}/doc/haddock/"* || die "installing docs failed" - fi - dodoc CHANGES README -} diff --git a/dev-haskell/haddock/haddock-2.4.1.ebuild b/dev-haskell/haddock/haddock-2.4.1.ebuild deleted file mode 100644 index 8ed1842a89b6..000000000000 --- a/dev-haskell/haddock/haddock-2.4.1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2010 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.9 2010/09/19 17:01:23 slyfox Exp $ - -CABAL_FEATURES="bin lib" -# don't enable profiling as the 'ghc' package is not built with profiling -inherit haskell-cabal autotools pax-utils - -GHCPATHS_PN="ghc-paths" -GHCPATHS_PV="0.1.0.5" -GHCPATHS_P="${GHCPATHS_PN}-${GHCPATHS_PV}" - -DESCRIPTION="A documentation-generation tool for Haskell libraries" -HOMEPAGE="http://www.haskell.org/haddock/" -SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz - http://hackage.haskell.org/packages/archive/${GHCPATHS_PN}/${GHCPATHS_PV}/${GHCPATHS_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" -IUSE="doc" - -# haddock-2.4.1 also deps on the upgradeable package dev-haskell/filepath. -# however, it's included in >=ghc-6.8.2, so we use the core package without -# stating the dependency in DEPEND. -# ghc-6.8.2 has filepath-1.1.0.0 -# ghc-6.10.4 has filepath-1.1.0.2 - -# 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.6* - doc? ( ~app-text/docbook-xml-dtd-4.2 - app-text/docbook-xsl-stylesheets - >=dev-libs/libxslt-1.1.2 )" - -src_unpack() { - unpack ${A} - - # use ghc-paths directly, not as a library - sed -e "s|build-depends: ghc-paths|hs-source-dirs: ../${GHCPATHS_P}|" \ - -e "s|Simple|Custom|" \ - -i "${S}/${PN}.cabal" - - # ghc-paths has a custom Setup.hs, haddock has the default Setup.lhs. - # we use a somewhat modified ghc-paths Setup.hs that works better for our - # purposes. - rm "${S}/Setup.lhs" - cp "${FILESDIR}/${PN}-2.4.2-Setup.hs" "${S}/Setup.hs" - - # -O2 is not needed and just prolongs compile time - # missing module in other-modules declaration - sed -e "s/-O2//" \ - -e 's/other-modules:/other-modules:\n Haddock.DocName/' \ - -e 's/other-modules:/other-modules:\n Haddock.GHC.Utils/' \ - -i "${S}/${PN}.cabal" - - if use doc; then - cd "${S}/doc" - eautoreconf - fi - -} - -src_compile () { - cabal_src_compile - if use doc; then - cd "${S}/doc" - ./configure --prefix="${D}/usr/" \ - || die 'error configuring documentation.' - emake html || die 'error building documentation.' - fi -} - -src_install () { - cabal_src_install - # haddock uses GHC-api to process TH source. - # TH requires GHCi which needs mmap('rwx') (bug #299709) - pax-mark -m "${D}/usr/bin/${PN}" - - if use doc; then - dohtml -r "${S}/doc/haddock/"* - fi - dodoc CHANGES README -} |