1 |
Closes: https://bugs.gentoo.org/649946 |
2 |
--- |
3 |
bin/ebuild-helpers/doconfd | 9 +++++++-- |
4 |
bin/ebuild-helpers/doenvd | 9 +++++++-- |
5 |
bin/ebuild-helpers/doheader | 6 +++++- |
6 |
3 files changed, 19 insertions(+), 5 deletions(-) |
7 |
|
8 |
diff --git a/bin/ebuild-helpers/doconfd b/bin/ebuild-helpers/doconfd |
9 |
index 38cf58234..15ad980f3 100755 |
10 |
--- a/bin/ebuild-helpers/doconfd |
11 |
+++ b/bin/ebuild-helpers/doconfd |
12 |
@@ -2,10 +2,15 @@ |
13 |
# Copyright 1999-2018 Gentoo Foundation |
14 |
# Distributed under the terms of the GNU General Public License v2 |
15 |
|
16 |
+source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1 |
17 |
+ |
18 |
if [[ $# -lt 1 ]] ; then |
19 |
- source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1 |
20 |
__helpers_die "${0##*/}: at least one argument needed" |
21 |
exit 1 |
22 |
fi |
23 |
|
24 |
-_E_INSDESTTREE_='/etc/conf.d/' exec doins "$@" |
25 |
+export _E_INSDESTTREE_='/etc/conf.d/' |
26 |
+if ___eapi_has_DESTTREE_INSDESTTREE; then |
27 |
+ export INSDESTTREE=${_E_INSDESTTREE_} |
28 |
+fi |
29 |
+exec doins "$@" |
30 |
diff --git a/bin/ebuild-helpers/doenvd b/bin/ebuild-helpers/doenvd |
31 |
index a15cec7f2..f14b95104 100755 |
32 |
--- a/bin/ebuild-helpers/doenvd |
33 |
+++ b/bin/ebuild-helpers/doenvd |
34 |
@@ -2,10 +2,15 @@ |
35 |
# Copyright 1999-2018 Gentoo Foundation |
36 |
# Distributed under the terms of the GNU General Public License v2 |
37 |
|
38 |
+source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1 |
39 |
+ |
40 |
if [[ $# -lt 1 ]] ; then |
41 |
- source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1 |
42 |
__helpers_die "${0##*/}: at least one argument needed" |
43 |
exit 1 |
44 |
fi |
45 |
|
46 |
-_E_INSDESTTREE_='/etc/env.d/' exec doins "$@" |
47 |
+export _E_INSDESTTREE_='/etc/env.d/' |
48 |
+if ___eapi_has_DESTTREE_INSDESTTREE; then |
49 |
+ export INSDESTTREE=${_E_INSDESTTREE_} |
50 |
+fi |
51 |
+exec doins "$@" |
52 |
diff --git a/bin/ebuild-helpers/doheader b/bin/ebuild-helpers/doheader |
53 |
index 03bf23b1c..aedc2322a 100755 |
54 |
--- a/bin/ebuild-helpers/doheader |
55 |
+++ b/bin/ebuild-helpers/doheader |
56 |
@@ -13,4 +13,8 @@ if [[ $# -lt 1 ]] || [[ $1 == -r && $# -lt 2 ]] ; then |
57 |
exit 1 |
58 |
fi |
59 |
|
60 |
-_E_INSDESTTREE_='/usr/include/' exec doins "$@" |
61 |
+export _E_INSDESTTREE_='/usr/include/' |
62 |
+if ___eapi_has_DESTTREE_INSDESTTREE; then |
63 |
+ export INSDESTTREE=${_E_INSDESTTREE_} |
64 |
+fi |
65 |
+exec doins "$@" |
66 |
-- |
67 |
2.16.2 |