dev-lang/ghc: move QA_PREBUILT to pkg_setup(), bug #566534

Should fix paludis users.
The change requires yet unreleased portage 2.2.28
to make QA_PREBUILT work as expected.

Bug: https://bugs.gentoo.org/566534

Package-Manager: portage-2.2.27

diff --git a/dev-lang/ghc/ghc-7.10.2-r1.ebuild b/dev-lang/ghc/ghc-7.10.2-r1.ebuild
index fe3ce0db6d69188c494a3c3f25a9700c5b4edb00..c010b36d0746f0ddb4cbce754a4c37e7ed60b408 100644 (file)
--- a/dev-lang/ghc/ghc-7.10.2-r1.ebuild
+++ b/dev-lang/ghc/ghc-7.10.2-r1.ebuild
@@ -107,9 +107,6 @@ PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )"
 
 REQUIRED_USE="?? ( ghcbootstrap binary )"
 
-# yeah, top-level 'use' sucks. I'd like to have it in 'src_install()'
-use binary && QA_PREBUILT="*"
-
 # haskell libraries built with cabal in configure mode, #515354
 QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
 
@@ -317,6 +314,9 @@ relocate_ghc() {
 }
 
 pkg_setup() {
+       # quiet portage about prebuilt binaries
+       use binary && QA_PREBUILT="*"
+
        [[ ${MERGE_TYPE} == binary ]] && return
 
        if use ghcbootstrap; then

diff --git a/dev-lang/ghc/ghc-7.10.2.ebuild b/dev-lang/ghc/ghc-7.10.2.ebuild
index 21c79e5128b6378835f59174b059134ca7f7e617..719778ce02fe46bb4f13dae30427635575172e68 100644 (file)
--- a/dev-lang/ghc/ghc-7.10.2.ebuild
+++ b/dev-lang/ghc/ghc-7.10.2.ebuild
@@ -107,9 +107,6 @@ PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )"
 
 REQUIRED_USE="?? ( ghcbootstrap binary )"
 
-# yeah, top-level 'use' sucks. I'd like to have it in 'src_install()'
-use binary && QA_PREBUILT="*"
-
 # haskell libraries built with cabal in configure mode, #515354
 QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
 
@@ -317,6 +314,9 @@ relocate_ghc() {
 }
 
 pkg_setup() {
+       # quiet portage about prebuilt binaries
+       use binary && QA_PREBUILT="*"
+
        [[ ${MERGE_TYPE} == binary ]] && return
 
        if use ghcbootstrap; then

diff --git a/dev-lang/ghc/ghc-7.4.2.ebuild b/dev-lang/ghc/ghc-7.4.2.ebuild
index 679f1ba9eaebe68bd9fd62a3c8fadd418e843b39..366f1d473b1a32cfb701df0ffad4643119e3e36c 100644 (file)
--- a/dev-lang/ghc/ghc-7.4.2.ebuild
+++ b/dev-lang/ghc/ghc-7.4.2.ebuild
@@ -111,8 +111,6 @@ PDEPEND="
 # ia64 fails to return from STG GMP primitives (stage2 always SIGSEGVs)
 REQUIRED_USE="ia64? ( !gmp )"
 
-use binary && QA_PREBUILT="*"
-
 append-ghc-cflags() {
        local flag compile assemble link
        for flag in $*; do
@@ -248,6 +246,9 @@ relocate_ghc() {
 }
 
 pkg_setup() {
+       # quiet portage about prebuilt binaries
+       use binary && QA_PREBUILT="*"
+
        if use ghcbootstrap; then
                ewarn "You requested ghc bootstrapping, this is usually only used"
                ewarn "by Gentoo developers to make binary .tbz2 packages for"

diff --git a/dev-lang/ghc/ghc-7.6.3-r1.ebuild b/dev-lang/ghc/ghc-7.6.3-r1.ebuild
index 5dc2f89a804f5a4546c3c127c7b2fccf9c51145c..c5c2e89c41d54a3e39b9ea5d2f5e508372b63cad 100644 (file)
--- a/dev-lang/ghc/ghc-7.6.3-r1.ebuild
+++ b/dev-lang/ghc/ghc-7.6.3-r1.ebuild
@@ -122,8 +122,6 @@ PDEPEND="
 # ia64 fails to return from STG GMP primitives (stage2 always SIGSEGVs)
 REQUIRED_USE="ia64? ( !gmp )"
 
-use binary && QA_PREBUILT="*"
-
 # haskell libraries built with cabal in configure mode, #515354
 QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
 
@@ -301,6 +299,9 @@ relocate_ghc() {
 }
 
 pkg_setup() {
+       # quiet portage about prebuilt binaries
+       use binary && QA_PREBUILT="*"
+
        if use ghcbootstrap; then
                ewarn "You requested ghc bootstrapping, this is usually only used"
                ewarn "by Gentoo developers to make binary .tbz2 packages for"

diff --git a/dev-lang/ghc/ghc-7.8.3.ebuild b/dev-lang/ghc/ghc-7.8.3.ebuild
index 2831f4df44c4f39d4626de001868e98e6468bb4c..8bc6574929bff412c1788b9089e4e553e9a7b029 100644 (file)
--- a/dev-lang/ghc/ghc-7.8.3.ebuild
+++ b/dev-lang/ghc/ghc-7.8.3.ebuild
@@ -97,9 +97,6 @@ PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )"
 
 REQUIRED_USE="?? ( ghcbootstrap binary )"
 
-# yeah, top-level 'use' sucks. I'd like to have it in 'src_install()'
-use binary && QA_PREBUILT="*"
-
 # haskell libraries built with cabal in configure mode, #515354
 QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
 
@@ -268,6 +265,9 @@ relocate_ghc() {
 }
 
 pkg_setup() {
+       # quiet portage about prebuilt binaries
+       use binary && QA_PREBUILT="*"
+
        if use ghcbootstrap; then
                ewarn "You requested ghc bootstrapping, this is usually only used"
                ewarn "by Gentoo developers to make binary .tbz2 packages."

diff --git a/dev-lang/ghc/ghc-7.8.4.ebuild b/dev-lang/ghc/ghc-7.8.4.ebuild
index c7640dd3bfe2fce06a5a99ad7a2137fb88e88fbc..aa9c5ccff19ada7ede2afd37b52b84fe93c29346 100644 (file)
--- a/dev-lang/ghc/ghc-7.8.4.ebuild
+++ b/dev-lang/ghc/ghc-7.8.4.ebuild
@@ -98,9 +98,6 @@ PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )"
 
 REQUIRED_USE="?? ( ghcbootstrap binary )"
 
-# yeah, top-level 'use' sucks. I'd like to have it in 'src_install()'
-use binary && QA_PREBUILT="*"
-
 # haskell libraries built with cabal in configure mode, #515354
 QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
 
@@ -269,6 +266,9 @@ relocate_ghc() {
 }
 
 pkg_setup() {
+       # quiet portage about prebuilt binaries
+       use binary && QA_PREBUILT="*"
+
        [[ ${MERGE_TYPE} == binary ]] && return
 
        if use ghcbootstrap; then