dev-lang/ghc: remove build-type dependency on ncurses, bug #561276

Re-adding ncurses:5 buildtime-only dependency was
an accidental bug. ghc binaries explicitly avoid
ncurses for bootstrap.

Reported-by: Zac Medico
Bug: https://bugs.gentoo.org/561276
Package-Manager: Portage-2.3.6, Repoman-2.3.2

diff --git a/dev-lang/ghc/ghc-7.10.3.ebuild b/dev-lang/ghc/ghc-7.10.3.ebuild
index fb6bc873376f09d78da36ccd61331104f4fa8821..71edaa18a56cd4edea0f0fa70bc90e847d8b13ae 100644 (file)
--- a/dev-lang/ghc/ghc-7.10.3.ebuild
+++ b/dev-lang/ghc/ghc-7.10.3.ebuild
@@ -84,12 +84,21 @@ RDEPEND="
        !ghcmakebinary? ( virtual/libffi:= )
 "
 
+# This set of dependencies is needed to run
+# prebuilt ghc. We specifically avoid ncurses
+# dependency with:
+#    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
 PREBUILT_BINARY_DEPENDS="
        !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
+"
+# This set of dependencies is needed to install
+# ghc[binary] in system. terminfo package is linked
+# against ncurses.
+PREBUILT_BINARY_RDEPENDS="${PREBUILT_BINARY_DEPENDS}
        sys-libs/ncurses:5/5
 "
 
-RDEPEND+="binary? ( ${PREBUILT_BINARY_DEPENDS} )"
+RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )"
 
 DEPEND="${RDEPEND}
        doc? ( app-text/docbook-xml-dtd:4.2

diff --git a/dev-lang/ghc/ghc-8.0.2.ebuild b/dev-lang/ghc/ghc-8.0.2.ebuild
index 1fd964ad3149fbcff71ce490bad9e722cbeb320e..bed207b7b136f00e649f4a445fd08f29264aa26b 100644 (file)
--- a/dev-lang/ghc/ghc-8.0.2.ebuild
+++ b/dev-lang/ghc/ghc-8.0.2.ebuild
@@ -82,11 +82,21 @@ RDEPEND="
        !ghcmakebinary? ( virtual/libffi:= )
 "
 
+# This set of dependencies is needed to run
+# prebuilt ghc. We specifically avoid ncurses
+# dependency with:
+#    utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING
 PREBUILT_BINARY_DEPENDS="
+       !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.17 ) )
+"
+# This set of dependencies is needed to install
+# ghc[binary] in system. terminfo package is linked
+# against ncurses.
+PREBUILT_BINARY_RDEPENDS="${PREBUILT_BINARY_DEPENDS}
        sys-libs/ncurses:0/6
 "
 
-RDEPEND+="binary? ( ${PREBUILT_BINARY_DEPENDS} )"
+RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )"
 
 DEPEND="${RDEPEND}
        doc? ( app-text/docbook-xml-dtd:4.2