[gentoo-commits] repo/gentoo:master commit in: dev-lang/ghc/

["Benda XU" <heroxbd@gentoo.org>]

commit:     5743a390cd13fabfe096738328a2a83bd5691708
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sun May 28 00:27:24 2017 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun May 28 00:41:15 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5743a390

dev-lang/ghc: drop outdated docbook xsl prefix hacks.

  sys-libs/ncurses:5/6 SLOT has been removed.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-lang/ghc/ghc-8.0.2.ebuild | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/dev-lang/ghc/ghc-8.0.2.ebuild b/dev-lang/ghc/ghc-8.0.2.ebuild
index 6ca4874cefe..606ecbb43d3 100644
--- a/dev-lang/ghc/ghc-8.0.2.ebuild
+++ b/dev-lang/ghc/ghc-8.0.2.ebuild
@@ -84,10 +84,7 @@ RDEPEND="
 # gentoo binaries are built against ncurses-6
 RDEPEND+="
 	binary? (
-		|| (
-			sys-libs/ncurses:0/6
-			sys-libs/ncurses:5/6
-		)
+		sys-libs/ncurses:0/6
 	)
 "
 
@@ -461,12 +458,6 @@ src_prepare() {
 		epatch "${FILESDIR}"/${PN}-8.0.2-libffi-alpha.patch
 		epatch "${FILESDIR}"/${PN}-8.0.2-O2-unreg.patch
 
-		if use prefix; then
-			# Make configure find docbook-xsl-stylesheets from Prefix
-			sed -e '/^FP_DIR_DOCBOOK_XSL/s:\[.*\]:['"${EPREFIX}"'/usr/share/sgml/docbook/xsl-stylesheets/]:' \
-				-i utils/haddock/doc/configure.ac || die
-		fi
-
 		bump_libs
 
 		# as we have changed the build system