commit: bab6cc7268d0788d501e05f15b79b220de71664f Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Sep 21 15:07:17 2017 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Mar 4 21:03:53 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=bab6cc72
domo: force /usr prefix in EAPI 7 Bug: https://bugs.gentoo.org/595924 bin/eapi.sh | 4 ++++ bin/ebuild-helpers/domo | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/bin/eapi.sh b/bin/eapi.sh index 5a1a9aa40..ba4008acf 100644 --- a/bin/eapi.sh +++ b/bin/eapi.sh @@ -186,6 +186,10 @@ ___eapi_die_can_respect_nonfatal() { [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-hdepend|5-progress)$ ]] } +___eapi_domo_respects_into() { + [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-hdepend|5-progress|6)$ ]] +} + # OTHERS ___eapi_enables_failglob_in_global_scope() { diff --git a/bin/ebuild-helpers/domo b/bin/ebuild-helpers/domo index 9742173ac..e08e55a3a 100755 --- a/bin/ebuild-helpers/domo +++ b/bin/ebuild-helpers/domo @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1 @@ -14,6 +14,11 @@ if ! ___eapi_has_prefix_variables; then ED=${D} fi +# newer EAPIs force /usr consistently with other /usr/share helpers +if ! ___eapi_domo_respects_into; then + DESTTREE=/usr +fi + if [ ! -d "${ED}${DESTTREE}/share/locale" ] ; then install -d "${ED}${DESTTREE}/share/locale/" fi
