ppc64 stable, drop old

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)

5 files changed, 10 insertions, 115 deletions

diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog
index d398319b1401..413f9b9c97c5 100644
--- a/dev-haskell/haddock/ChangeLog
+++ b/dev-haskell/haddock/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/haddock
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.115 2014/10/28 03:57:33 mjo Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.116 2015/01/02 23:16:40 slyfox Exp $
+
+  02 Jan 2015; Sergei Trofimovich <slyfox@gentoo.org>
+  -files/ghc-paths-1.0.5.0-GHC-Paths.hs, -files/haddock-2.6.1-cabal-1.8.patch,
+  -haddock-2.6.1.ebuild, haddock-2.10.0-r2.ebuild:
+  ppc64 stable, drop old
 
   28 Oct 2014; Michael Orlitzky <mjo@gentoo.org> haddock-2.13.2.ebuild:
   Update GHC dependency for haddock-2.13.2 as part of bug #511004.
diff --git a/dev-haskell/haddock/files/ghc-paths-1.0.5.0-GHC-Paths.hs b/dev-haskell/haddock/files/ghc-paths-1.0.5.0-GHC-Paths.hs
deleted file mode 100644
index c87565d9cd4a..000000000000
--- a/dev-haskell/haddock/files/ghc-paths-1.0.5.0-GHC-Paths.hs
+++ /dev/null
@@ -1,13 +0,0 @@
-{-# LANGUAGE CPP #-}
-
-module GHC.Paths (
-        ghc, ghc_pkg, libdir, docdir
-  ) where
-
-libdir, docdir, ghc, ghc_pkg :: FilePath
-
-libdir  = GHC_PATHS_LIBDIR
-docdir  = GHC_PATHS_DOCDIR
-
-ghc     = GHC_PATHS_GHC
-ghc_pkg = GHC_PATHS_GHC_PKG
diff --git a/dev-haskell/haddock/files/haddock-2.6.1-cabal-1.8.patch b/dev-haskell/haddock/files/haddock-2.6.1-cabal-1.8.patch
deleted file mode 100644
index d23cd2508df5..000000000000
--- a/dev-haskell/haddock/files/haddock-2.6.1-cabal-1.8.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/haddock.cabal b/haddock.cabal
-index 4a00ce1..5323628 100644
---- a/haddock.cabal
-+++ b/haddock.cabal
-@@ -71,7 +71,7 @@ executable haddock
-     pretty,
-     containers,
-     array,
--    Cabal >= 1.5,
-+    Cabal >= 1.5 && <1.10,
-     ghc >= 6.12 && < 6.14
- 
-   if flag(in-ghc-tree)
diff --git a/dev-haskell/haddock/haddock-2.10.0-r2.ebuild b/dev-haskell/haddock/haddock-2.10.0-r2.ebuild
index ccfe13b1a54d..6d98fd2e7dcd 100644
--- a/dev-haskell/haddock/haddock-2.10.0-r2.ebuild
+++ b/dev-haskell/haddock/haddock-2.10.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.10.0-r2.ebuild,v 1.9 2013/04/25 18:48:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.10.0-r2.ebuild,v 1.10 2015/01/02 23:16:40 slyfox Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 # ppc64 needs to be rekeyworded due to xhtml not being keyworded
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-haskell/ghc-paths[profile?]
diff --git a/dev-haskell/haddock/haddock-2.6.1.ebuild b/dev-haskell/haddock/haddock-2.6.1.ebuild
deleted file mode 100644
index 72adfdc0a71c..000000000000
--- a/dev-haskell/haddock/haddock-2.6.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.6.1.ebuild,v 1.16 2013/02/10 14:26:06 slyfox Exp $
-
-CABAL_FEATURES="bin lib"
-# don't enable profiling as the 'ghc' package is not built with profiling
-inherit eutils haskell-cabal autotools pax-utils
-
-DESCRIPTION="A documentation-generation tool for Haskell libraries"
-HOMEPAGE="http://www.haskell.org/haddock/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-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...
-
-RDEPEND=">=dev-lang/ghc-6.12 <dev-lang/ghc-7"
-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}
-
-	# remove dependency on ghc-paths, we include it right into haddock instead
-	sed -e "s|build-depends: ghc-paths|build-depends:|" \
-		-i "${S}/${PN}.cabal"
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-cabal-1.8.patch
-
-	# copy of slightly modified version of GHC.Paths
-	mkdir "${S}/src/GHC"
-	cp "${FILESDIR}/ghc-paths-1.0.5.0-GHC-Paths.hs" "${S}/src/GHC/Paths.hs"
-
-	# a few things we need to replace, and example values
-	# GHC_PATHS_LIBDIR /usr/lib64/ghc-6.12.0.20091010
-	# GHC_PATHS_DOCDIR /usr/share/doc/ghc-6.12.0.20091010/html
-	# GHC_PATHS_GHC_PKG /usr/bin/ghc-pkg
-	# GHC_PATHS_GHC /usr/bin/ghc (be careful: GHC_PATHS_GHC is a substring of GHC_PATHS_GHC_PKG)
-
-	# hardcode stuff above:
-	sed \
-	    -e "s|GHC_PATHS_LIBDIR|\"$(ghc-libdir)\"|" \
-	    -e "s|GHC_PATHS_DOCDIR|\"/usr/share/doc/ghc-$(ghc-version)/html\"|" \
-	    -e "s|GHC_PATHS_GHC_PKG|\"$(ghc-getghcpkg)\"|" \
-	    -e "s|GHC_PATHS_GHC|\"$(ghc-getghc)\"|" \
-	  -i "${S}/src/GHC/Paths.hs"
-
-	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
-}