[gentoo-portage-dev] [PATCH 09/10] domo: force /usr prefix in EAPI 7

[Michał Górny]

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 b8b493f45..d8c487b69 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
-- 
2.16.2