diff options
| -rw-r--r-- | dev-lang/ghc/ghc-7.10.2-r1.ebuild | 6 | ||||
| -rw-r--r-- | dev-lang/ghc/ghc-7.10.2.ebuild | 6 | ||||
| -rw-r--r-- | dev-lang/ghc/ghc-7.4.2.ebuild | 5 | ||||
| -rw-r--r-- | dev-lang/ghc/ghc-7.6.3-r1.ebuild | 5 | ||||
| -rw-r--r-- | dev-lang/ghc/ghc-7.8.3.ebuild | 6 | ||||
| -rw-r--r-- | dev-lang/ghc/ghc-7.8.4.ebuild | 6 |
6 files changed, 18 insertions, 16 deletions
diff --git a/dev-lang/ghc/ghc-7.10.2-r1.ebuild b/dev-lang/ghc/ghc-7.10.2-r1.ebuild index fe3ce0db6d69..c010b36d0746 100644 --- 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 21c79e5128b6..719778ce02fe 100644 --- 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 679f1ba9eaeb..366f1d473b1a 100644 --- 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 5dc2f89a804f..c5c2e89c41d5 100644 --- 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 2831f4df44c4..8bc6574929bf 100644 --- 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 c7640dd3bfe2..aa9c5ccff19a 100644 --- 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 |