Removed old (needed ancient ghc and Cabal).

(Portage version: 2.1.9.50/cvs/Linux x86_64)

4 files changed, 5 insertions, 204 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/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
-}