From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-952456-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id BC184139694
for <garchives@archives.gentoo.org>; Sun, 28 May 2017 00:41:30 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 8443921C012;
Sun, 28 May 2017 00:41:27 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 5FA1921C012
for <gentoo-commits@lists.gentoo.org>; Sun, 28 May 2017 00:41:27 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 1152534164B
for <gentoo-commits@lists.gentoo.org>; Sun, 28 May 2017 00:41:26 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 79D9D745E
for <gentoo-commits@lists.gentoo.org>; Sun, 28 May 2017 00:41:24 +0000 (UTC)
From: "Benda XU" <heroxbd@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" <heroxbd@gentoo.org>
Message-ID: <1495932075.5743a390cd13fabfe096738328a2a83bd5691708.heroxbd@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/ghc/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-lang/ghc/ghc-8.0.2.ebuild
X-VCS-Directories: dev-lang/ghc/
X-VCS-Committer: heroxbd
X-VCS-Committer-Name: Benda XU
X-VCS-Revision: 5743a390cd13fabfe096738328a2a83bd5691708
X-VCS-Branch: master
Date: Sun, 28 May 2017 00:41:24 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: d4cb8e61-39fd-46ed-a3f5-e07d350971ff
X-Archives-Hash: d37d1b62c7e5325ad9601a14b59f841e
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