On Mon, 1 Dec 2014 22:28:34 +0100
Michał Górny mgo...@gentoo.org wrote:
Disallow calling most of the ebuild helpers in global scope since they
are meaningless in that context. Most of them are also prohibited by PMS
for all EAPIs, so EAPI 6 sounds like a good moment to finally enforce
that restriction.
---
bin/eapi.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/eapi.sh b/bin/eapi.sh
index e0ade02..5ab92f4 100644
--- a/bin/eapi.sh
+++ b/bin/eapi.sh
@@ -159,7 +159,7 @@ ___eapi_helpers_can_die() {
}
___eapi_disallows_helpers_in_global_scope() {
- [[ ${1-${EAPI}} =~ ^(4-python|5-progress)$ ]]
+ [[ ! ${1-${EAPI}} =~ ^(0|1|2|3|4|4-slot-abi|5|5-hdepend)$ ]]
}
___eapi_unpack_is_case_sensitive() {
Looks like it cries on ebuilds with unset EAPI in main tree (attached).
Can be easily fixed in tree by adding EAPI=0, but better handle it
here: ${EAPI-0} (untested!)
It also changed binutils: it used to be slotted only in presence of USE flag.
Now it's always slotted even with USE=-multislot (at least eix thinks so).
--
Sergei
[31;01m*[0m ERROR: dev-java/ibm-jdk-bin-1.6.0.9_p1::gentoo failed (depend
phase):
[31;01m*[0m use() calls are not allowed in global scope
[31;01m*[0m
[31;01m*[0m Call stack:
[31;01m*[0m ebuild.sh, line 584: Called source
'/gentoo-32k/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p1.ebuild'
[31;01m*[0m ERROR: dev-java/ibm-jdk-bin-1.6.0.9_p2::gentoo failed (depend
phase):
[31;01m*[0m use() calls are not allowed in global scope
[31;01m*[0m ibm-jdk-bin-1.6.0.9_p1.ebuild, line 50: Called use 'x86'
[31;01m*[0m
[31;01m*[0m Call stack:
[31;01m*[0m ebuild.sh, line 47: Called die
[31;01m*[0m The specific snippet of code:
[31;01m*[0m ebuild.sh, line 584: Called source
'/gentoo-32k/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p2.ebuild'
[31;01m*[0m # These functions die because calls to them during the
depend phase
[31;01m*[0m ERROR: dev-java/ibm-jre-bin-1.6.0.9_p1::gentoo failed (depend
phase):
[31;01m*[0m
[31;01m*[0m use() calls are not allowed in global scope
[31;01m*[0m
[31;01m*[0m ibm-jdk-bin-1.6.0.9_p2.ebuild, line 50: Called use 'x86'
[31;01m*[0m Call stack:
[31;01m*[0m If you need support, post the output of `emerge --info
'=dev-java/ibm-jdk-bin-1.6.0.9_p1::gentoo'`,
[31;01m*[0m the complete build log and the output of `emerge -pqv
'=dev-java/ibm-jdk-bin-1.6.0.9_p1::gentoo'`.
[31;01m*[0m ebuild.sh, line 47: Called die
[31;01m*[0m The specific snippet of code:
[31;01m*[0m Working directory: '/usr/lib64/python3.3/site-packages'
[31;01m*[0m ERROR: dev-java/ibm-jre-bin-1.6.0.9_p2::gentoo failed (depend
phase):
[31;01m*[0m S:
'/tmp/portage-tmpdir/portage/dev-java/ibm-jdk-bin-1.6.0.9_p1/work/ibm-jdk-bin-1.6.0.9_p1'
[31;01m*[0m use() calls are not allowed in global scope
[31;01m*[0m
[31;01m*[0m # These functions die because calls to them during the
depend phase
[31;01m*[0m Call stack:
[31;01m*[0m
[31;01m*[0m If you need support, post the output of `emerge --info
'=dev-java/ibm-jdk-bin-1.6.0.9_p2::gentoo'`,
[31;01m*[0m the complete build log and the output of `emerge -pqv
'=dev-java/ibm-jdk-bin-1.6.0.9_p2::gentoo'`.
[31;01m*[0m ebuild.sh, line 584: Called source
'/gentoo-32k/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p2.ebuild'
[31;01m*[0m ebuild.sh, line 584: Called source
'/gentoo-32k/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p1.ebuild'
[31;01m*[0m Working directory: '/usr/lib64/python3.3/site-packages'
[31;01m*[0m S:
'/tmp/portage-tmpdir/portage/dev-java/ibm-jdk-bin-1.6.0.9_p2/work/ibm-jdk-bin-1.6.0.9_p2'
[31;01m*[0m ibm-jre-bin-1.6.0.9_p2.ebuild, line 31: Called use 'x86'
[31;01m*[0m ibm-jre-bin-1.6.0.9_p1.ebuild, line 31: Called use 'x86'
[31;01m*[0m ebuild.sh, line 47: Called die
[31;01m*[0m ebuild.sh, line 47: Called die
[31;01m*[0m The specific snippet of code:
[31;01m*[0m The specific snippet of code:
[31;01m*[0m # These functions die because calls to them during the
depend phase
[31;01m*[0m # These functions die because calls to them during the
depend phase
[31;01m*[0m
[31;01m*[0m
[31;01m*[0m If you need support, post the output of `emerge --info
'=dev-java/ibm-jre-bin-1.6.0.9_p2::gentoo'`,
[31;01m*[0m If you need support, post the output of `emerge --info
'=dev-java/ibm-jre-bin-1.6.0.9_p1::gentoo'`,
[31;01m*[0m the complete build log and the output of `emerge -pqv
'=dev-java/ibm-jre-bin-1.6.0.9_p2::gentoo'`.
[31;01m*[0m the complete build log and the output of `emerge -pqv
'=dev-java/ibm-jre-bin-1.6.0.9_p1::gentoo'`.
[31;01m*[0m Working directory:
