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