| 1 |
commit: 43fbec44acb0b56b2443f99e0994d5636c98d916 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 3 19:57:17 2017 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 3 19:57:27 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43fbec44 |
| 7 |
|
| 8 |
dev-lang/ghc: add a ncurses:5/5 binary dependency, bug #561276 |
| 9 |
|
| 10 |
Reported-by: Erich Seifert |
| 11 |
Bug: https://bugs.gentoo.org/561276 |
| 12 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 13 |
|
| 14 |
dev-lang/ghc/ghc-7.10.3.ebuild | 21 +++++++-------------- |
| 15 |
dev-lang/ghc/ghc-7.8.4.ebuild | 21 +++++++-------------- |
| 16 |
dev-lang/ghc/ghc-8.0.2.ebuild | 12 ++++++------ |
| 17 |
3 files changed, 20 insertions(+), 34 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-lang/ghc/ghc-7.10.3.ebuild b/dev-lang/ghc/ghc-7.10.3.ebuild |
| 20 |
index 9945f481669..fb6bc873376 100644 |
| 21 |
--- a/dev-lang/ghc/ghc-7.10.3.ebuild |
| 22 |
+++ b/dev-lang/ghc/ghc-7.10.3.ebuild |
| 23 |
@@ -1,4 +1,4 @@ |
| 24 |
-# Copyright 1999-2016 Gentoo Foundation |
| 25 |
+# Copyright 1999-2017 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
EAPI=5 |
| 29 |
@@ -83,27 +83,20 @@ RDEPEND=" |
| 30 |
sys-libs/ncurses:=[unicode] |
| 31 |
!ghcmakebinary? ( virtual/libffi:= ) |
| 32 |
" |
| 33 |
-# gentoo binaries are built against ncurses-5 |
| 34 |
-RDEPEND+=" |
| 35 |
- binary? ( |
| 36 |
- || ( |
| 37 |
- sys-libs/ncurses:0/5 |
| 38 |
- sys-libs/ncurses:5/5 |
| 39 |
- ) |
| 40 |
- ) |
| 41 |
+ |
| 42 |
+PREBUILT_BINARY_DEPENDS=" |
| 43 |
+ !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) |
| 44 |
+ sys-libs/ncurses:5/5 |
| 45 |
" |
| 46 |
|
| 47 |
-# force dependency on >=gmp-5, even if >=gmp-4.1 would be enough. this is due to |
| 48 |
-# that we want the binaries to use the latest versioun available, and not to be |
| 49 |
-# built against gmp-4 |
| 50 |
+RDEPEND+="binary? ( ${PREBUILT_BINARY_DEPENDS} )" |
| 51 |
|
| 52 |
-# similar for glibc. we have bootstrapped binaries against glibc-2.17 |
| 53 |
DEPEND="${RDEPEND} |
| 54 |
doc? ( app-text/docbook-xml-dtd:4.2 |
| 55 |
app-text/docbook-xml-dtd:4.5 |
| 56 |
app-text/docbook-xsl-stylesheets |
| 57 |
>=dev-libs/libxslt-1.1.2 ) |
| 58 |
- !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) )" |
| 59 |
+ !ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )" |
| 60 |
|
| 61 |
PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )" |
| 62 |
|
| 63 |
|
| 64 |
diff --git a/dev-lang/ghc/ghc-7.8.4.ebuild b/dev-lang/ghc/ghc-7.8.4.ebuild |
| 65 |
index 00c4b0e0dfa..659446b80e5 100644 |
| 66 |
--- a/dev-lang/ghc/ghc-7.8.4.ebuild |
| 67 |
+++ b/dev-lang/ghc/ghc-7.8.4.ebuild |
| 68 |
@@ -1,4 +1,4 @@ |
| 69 |
-# Copyright 1999-2016 Gentoo Foundation |
| 70 |
+# Copyright 1999-2017 Gentoo Foundation |
| 71 |
# Distributed under the terms of the GNU General Public License v2 |
| 72 |
|
| 73 |
EAPI=5 |
| 74 |
@@ -76,28 +76,21 @@ RDEPEND=" |
| 75 |
sys-libs/ncurses:=[unicode] |
| 76 |
!ghcmakebinary? ( virtual/libffi:= ) |
| 77 |
" |
| 78 |
-# gentoo binaries are built against ncurses-5 |
| 79 |
-RDEPEND+=" |
| 80 |
- binary? ( |
| 81 |
- || ( |
| 82 |
- sys-libs/ncurses:0/5 |
| 83 |
- sys-libs/ncurses:5/5 |
| 84 |
- ) |
| 85 |
- ) |
| 86 |
+ |
| 87 |
+PREBUILT_BINARY_DEPENDS=" |
| 88 |
+ !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) |
| 89 |
+ sys-libs/ncurses:5/5 |
| 90 |
" |
| 91 |
|
| 92 |
-# force dependency on >=gmp-5, even if >=gmp-4.1 would be enough. this is due to |
| 93 |
-# that we want the binaries to use the latest versioun available, and not to be |
| 94 |
-# built against gmp-4 |
| 95 |
+RDEPEND+="binary? ( ${PREBUILT_BINARY_DEPENDS} )" |
| 96 |
|
| 97 |
-# similar for glibc. we have bootstrapped binaries against glibc-2.17 |
| 98 |
DEPEND="${RDEPEND} |
| 99 |
ghcbootstrap? ( |
| 100 |
doc? ( app-text/docbook-xml-dtd:4.2 |
| 101 |
app-text/docbook-xml-dtd:4.5 |
| 102 |
app-text/docbook-xsl-stylesheets |
| 103 |
>=dev-libs/libxslt-1.1.2 ) ) |
| 104 |
- !ghcbootstrap? ( !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) ) )" |
| 105 |
+ !ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )" |
| 106 |
|
| 107 |
PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )" |
| 108 |
|
| 109 |
|
| 110 |
diff --git a/dev-lang/ghc/ghc-8.0.2.ebuild b/dev-lang/ghc/ghc-8.0.2.ebuild |
| 111 |
index 35b9ae7f93a..61c62ccf6fa 100644 |
| 112 |
--- a/dev-lang/ghc/ghc-8.0.2.ebuild |
| 113 |
+++ b/dev-lang/ghc/ghc-8.0.2.ebuild |
| 114 |
@@ -81,20 +81,20 @@ RDEPEND=" |
| 115 |
sys-libs/ncurses:=[unicode] |
| 116 |
!ghcmakebinary? ( virtual/libffi:= ) |
| 117 |
" |
| 118 |
-# gentoo binaries are built against ncurses-6 |
| 119 |
-RDEPEND+=" |
| 120 |
- binary? ( |
| 121 |
- sys-libs/ncurses:0/6 |
| 122 |
- ) |
| 123 |
+ |
| 124 |
+PREBUILT_BINARY_DEPENDS=" |
| 125 |
+ sys-libs/ncurses:0/6 |
| 126 |
" |
| 127 |
|
| 128 |
+RDEPEND+="binary? ( ${PREBUILT_BINARY_DEPENDS} )" |
| 129 |
+ |
| 130 |
DEPEND="${RDEPEND} |
| 131 |
doc? ( app-text/docbook-xml-dtd:4.2 |
| 132 |
app-text/docbook-xml-dtd:4.5 |
| 133 |
app-text/docbook-xsl-stylesheets |
| 134 |
dev-python/sphinx |
| 135 |
>=dev-libs/libxslt-1.1.2 ) |
| 136 |
-" |
| 137 |
+ !ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )" |
| 138 |
|
| 139 |
PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )" |
Archives