From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 9205F139694 for ; Mon, 3 Jul 2017 19:57:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9956B1FC008; Mon, 3 Jul 2017 19:57:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 65A071FC008 for ; Mon, 3 Jul 2017 19:57:34 +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 0A3893417E9 for ; Mon, 3 Jul 2017 19:57:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A15817487 for ; Mon, 3 Jul 2017 19:57:31 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1499111847.43fbec44acb0b56b2443f99e0994d5636c98d916.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/ghc/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/ghc/ghc-7.10.3.ebuild dev-lang/ghc/ghc-7.8.4.ebuild dev-lang/ghc/ghc-8.0.2.ebuild X-VCS-Directories: dev-lang/ghc/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 43fbec44acb0b56b2443f99e0994d5636c98d916 X-VCS-Branch: master Date: Mon, 3 Jul 2017 19:57:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 89b20e6c-7588-4498-80b7-7a728046550c X-Archives-Hash: 0eedde613e09e376ff6cc2db4adafd59 commit: 43fbec44acb0b56b2443f99e0994d5636c98d916 Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Jul 3 19:57:17 2017 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Jul 3 19:57:27 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43fbec44 dev-lang/ghc: add a ncurses:5/5 binary dependency, bug #561276 Reported-by: Erich Seifert Bug: https://bugs.gentoo.org/561276 Package-Manager: Portage-2.3.6, Repoman-2.3.2 dev-lang/ghc/ghc-7.10.3.ebuild | 21 +++++++-------------- dev-lang/ghc/ghc-7.8.4.ebuild | 21 +++++++-------------- dev-lang/ghc/ghc-8.0.2.ebuild | 12 ++++++------ 3 files changed, 20 insertions(+), 34 deletions(-) diff --git a/dev-lang/ghc/ghc-7.10.3.ebuild b/dev-lang/ghc/ghc-7.10.3.ebuild index 9945f481669..fb6bc873376 100644 --- a/dev-lang/ghc/ghc-7.10.3.ebuild +++ b/dev-lang/ghc/ghc-7.10.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -83,27 +83,20 @@ RDEPEND=" sys-libs/ncurses:=[unicode] !ghcmakebinary? ( virtual/libffi:= ) " -# gentoo binaries are built against ncurses-5 -RDEPEND+=" - binary? ( - || ( - sys-libs/ncurses:0/5 - sys-libs/ncurses:5/5 - ) - ) + +PREBUILT_BINARY_DEPENDS=" + !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) + sys-libs/ncurses:5/5 " -# force dependency on >=gmp-5, even if >=gmp-4.1 would be enough. this is due to -# that we want the binaries to use the latest versioun available, and not to be -# built against gmp-4 +RDEPEND+="binary? ( ${PREBUILT_BINARY_DEPENDS} )" -# similar for glibc. we have bootstrapped binaries against glibc-2.17 DEPEND="${RDEPEND} doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 ) - !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) )" + !ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )" PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )" diff --git a/dev-lang/ghc/ghc-7.8.4.ebuild b/dev-lang/ghc/ghc-7.8.4.ebuild index 00c4b0e0dfa..659446b80e5 100644 --- a/dev-lang/ghc/ghc-7.8.4.ebuild +++ b/dev-lang/ghc/ghc-7.8.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -76,28 +76,21 @@ RDEPEND=" sys-libs/ncurses:=[unicode] !ghcmakebinary? ( virtual/libffi:= ) " -# gentoo binaries are built against ncurses-5 -RDEPEND+=" - binary? ( - || ( - sys-libs/ncurses:0/5 - sys-libs/ncurses:5/5 - ) - ) + +PREBUILT_BINARY_DEPENDS=" + !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) + sys-libs/ncurses:5/5 " -# force dependency on >=gmp-5, even if >=gmp-4.1 would be enough. this is due to -# that we want the binaries to use the latest versioun available, and not to be -# built against gmp-4 +RDEPEND+="binary? ( ${PREBUILT_BINARY_DEPENDS} )" -# similar for glibc. we have bootstrapped binaries against glibc-2.17 DEPEND="${RDEPEND} ghcbootstrap? ( doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 ) ) - !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) )" + !ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )" PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )" diff --git a/dev-lang/ghc/ghc-8.0.2.ebuild b/dev-lang/ghc/ghc-8.0.2.ebuild index 35b9ae7f93a..61c62ccf6fa 100644 --- a/dev-lang/ghc/ghc-8.0.2.ebuild +++ b/dev-lang/ghc/ghc-8.0.2.ebuild @@ -81,20 +81,20 @@ RDEPEND=" sys-libs/ncurses:=[unicode] !ghcmakebinary? ( virtual/libffi:= ) " -# gentoo binaries are built against ncurses-6 -RDEPEND+=" - binary? ( - sys-libs/ncurses:0/6 - ) + +PREBUILT_BINARY_DEPENDS=" + sys-libs/ncurses:0/6 " +RDEPEND+="binary? ( ${PREBUILT_BINARY_DEPENDS} )" + DEPEND="${RDEPEND} doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-python/sphinx >=dev-libs/libxslt-1.1.2 ) -" + !ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )" PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )"