[gentoo-dev] tcltk project has no members
Dear all, the tcltk project has no members, and noone is cc'ed on the tcltk@ alias. If you want to help maintaining this, please sign up for project and alias. If both are still empty in two weeks, the 39 packages become maintainer-needed (so there is no "illusion of maintainership") and the project is removed. Cheers, Andreas -- Andreas K. Hüttel dilfri...@gentoo.org Gentoo Linux developer (council, toolchain, perl, libreoffice, comrel) signature.asc Description: This is a digitally signed message part.
Re: [gentoo-dev] [PATCH 1/2] python-utils-r1.eclass: Simplify sed call in python_fix_shebang
On Sat, 15 Sep 2018 16:27:28 +0200
Michał Górny wrote:
> On Fri, 2018-09-14 at 23:44 +0100, James Le Cuirot wrote:
> > There's no need for two separate sed calls here.
> > ---
> > eclass/python-utils-r1.eclass | 6 +-
> > 1 file changed, 1 insertion(+), 5 deletions(-)
> >
> > diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
> > index e3cf82b4b58f..121f2382ba78 100644
> > --- a/eclass/python-utils-r1.eclass
> > +++ b/eclass/python-utils-r1.eclass
> > @@ -1247,11 +1247,7 @@ python_fix_shebang() {
> > if [[ ! ${error} ]]; then
> > # We either want to match ${from} followed by
> > space
> > # or at end-of-string.
> > - if [[ ${shebang} == *${from}" "* ]]; then
> > - sed -i -e "1s:${from} :${EPYTHON} :"
> > "${f}" || die
> > - else
> > - sed -i -e "1s:${from}$:${EPYTHON}:"
> > "${f}" || die
> > - fi
> > + sed -i -e "1s:${from}\( \|\$\):${EPYTHON}\1:"
> > "${f}" || die
>
> Hmm, I wonder if we could just utilize '\b' here.
I also considered it but that would match /, which is no good. For
example, it would replace python in /usr/python/foo.
I am now working on a new approach to better accommodate my cross stuff
that would supersede this anyway but it's not ready yet.
> > any_fixed=1
> > else
> > eerror "The file has incompatible shebang:"
--
James Le Cuirot (chewi)
Gentoo Linux Developer
pgpAKEeU7xASq.pgp
Description: OpenPGP digital signature
[gentoo-dev] [PATCH 2/2] git-r3.eclass: Undocument deprecated EGIT_LIVE_* API
---
eclass/git-r3.eclass | 9 +
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
index 3c09b6682ef5..a1ad0d238dc9 100644
--- a/eclass/git-r3.eclass
+++ b/eclass/git-r3.eclass
@@ -122,8 +122,6 @@ fi
# URIs are completely unsecured and their use (even if only as
# a fallback) renders the ebuild completely vulnerable to MITM attacks.
#
-# It can be overridden via env using ${PN}_LIVE_REPO variable.
-#
# Can be a whitespace-separated list or an array.
#
# Example:
@@ -152,8 +150,6 @@ fi
# @DESCRIPTION:
# The branch name to check out. If unset, the upstream default (HEAD)
# will be used.
-#
-# It can be overridden via env using ${PN}_LIVE_BRANCH variable.
# @ECLASS-VARIABLE: EGIT_COMMIT
# @DEFAULT_UNSET
@@ -162,8 +158,6 @@ fi
# commit from the branch will be used. Note that if set to a commit
# not on HEAD branch, EGIT_BRANCH needs to be set to a branch on which
# the commit is available.
-#
-# It can be overridden via env using ${PN}_LIVE_COMMIT variable.
# @ECLASS-VARIABLE: EGIT_COMMIT_DATE
# @DEFAULT_UNSET
@@ -178,8 +172,6 @@ fi
# (assuming that merges are done correctly). In other words, each merge
# will be considered alike a single commit with date corresponding
# to the merge commit date.
-#
-# It can be overridden via env using ${PN}_LIVE_COMMIT_DATE variable.
# @ECLASS-VARIABLE: EGIT_CHECKOUT_DIR
# @DESCRIPTION:
@@ -262,6 +254,7 @@ _git-r3_env_setup() {
esc_pn=${PN//[-+]/_}
[[ ${esc_pn} == [0-9]* ]] && esc_pn=_${esc_pn}
+ # note: deprecated, use EGIT_OVERRIDE_* instead
livevar=${esc_pn}_LIVE_REPO
EGIT_REPO_URI=${!livevar-${EGIT_REPO_URI}}
[[ ${!livevar} ]] \
--
2.19.0
[gentoo-dev] [PATCH 1/2] git-r3.eclass: Print possible override vars for user convenience
---
eclass/git-r3.eclass | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
index 48fac96ee358..3c09b6682ef5 100644
--- a/eclass/git-r3.eclass
+++ b/eclass/git-r3.eclass
@@ -586,6 +586,8 @@ git-r3_fetch() {
local -x GIT_DIR
_git-r3_set_gitdir "${repos[0]}"
+ einfo "Repository id: ${GIT_DIR##*/}"
+
# prepend the local mirror if applicable
if [[ ${EGIT_MIRROR_URI} ]]; then
repos=(
@@ -618,10 +620,11 @@ git-r3_fetch() {
COMMIT_DATE:commit_date
)
- local localvar livevar live_warn=
+ local localvar livevar live_warn= override_vars=()
for localvar in "${varmap[@]}"; do
livevar=EGIT_OVERRIDE_${localvar%:*}_${override_name}
localvar=${localvar#*:}
+ override_vars+=( "${livevar}" )
if [[ -n ${!livevar} ]]; then
[[ ${localvar} == repos ]] && repos=()
@@ -633,6 +636,13 @@ git-r3_fetch() {
if [[ ${live_warn} ]]; then
ewarn "No support will be provided."
+ else
+ einfo "To override fetched repository properties, use:"
+ local x
+ for x in "${override_vars[@]}"; do
+ einfo " ${x}"
+ done
+ einfo
fi
fi
--
2.19.0
[gentoo-dev] Re: The state of libav stabilisation
On Donnerstag, 13. September 2018 12:44:24 CEST Luca Barbato wrote: > I guess nobody had time to, libav-12 is working correctly on those arches. > > Thanks for reminding us. Thanks for getting it going. Could someone please add themselves as a dedicated maintainer to media-video/libav? amd64 has a question regarding stabilisation[1] and it seems that assigning media-video does not suffice. Relaying via gentoo-dev list does not scale. [1] https://bugs.gentoo.org/617508
Re: [gentoo-dev] [PATCH 1/2] python-utils-r1.eclass: Simplify sed call in python_fix_shebang
On Fri, 2018-09-14 at 23:44 +0100, James Le Cuirot wrote:
> There's no need for two separate sed calls here.
> ---
> eclass/python-utils-r1.eclass | 6 +-
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
> index e3cf82b4b58f..121f2382ba78 100644
> --- a/eclass/python-utils-r1.eclass
> +++ b/eclass/python-utils-r1.eclass
> @@ -1247,11 +1247,7 @@ python_fix_shebang() {
> if [[ ! ${error} ]]; then
> # We either want to match ${from} followed by
> space
> # or at end-of-string.
> - if [[ ${shebang} == *${from}" "* ]]; then
> - sed -i -e "1s:${from} :${EPYTHON} :"
> "${f}" || die
> - else
> - sed -i -e "1s:${from}$:${EPYTHON}:"
> "${f}" || die
> - fi
> + sed -i -e "1s:${from}\( \|\$\):${EPYTHON}\1:"
> "${f}" || die
Hmm, I wonder if we could just utilize '\b' here.
> any_fixed=1
> else
> eerror "The file has incompatible shebang:"
--
Best regards,
Michał Górny
signature.asc
Description: This is a digitally signed message part
[gentoo-portage-dev] [PATCH v2 3/4] Ban prepalldocs in ebuild scope
---
bin/ebuild-helpers/prepalldocs | 19 ++-
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/bin/ebuild-helpers/prepalldocs b/bin/ebuild-helpers/prepalldocs
index 6cdceb318..e23a6d410 100755
--- a/bin/ebuild-helpers/prepalldocs
+++ b/bin/ebuild-helpers/prepalldocs
@@ -4,20 +4,5 @@
source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
-if ___eapi_has_docompress; then
- die "'${0##*/}' has been banned for EAPI '$EAPI'"
- exit 1
-fi
-
-if [[ -n $1 ]] ; then
- __vecho "${0##*/}: invalid usage; takes no arguments" 1>&2
-fi
-
-if ! ___eapi_has_prefix_variables; then
- ED=${D}
-fi
-
-[[ -d ${ED%/}/usr/share/doc ]] || exit 0
-
-ecompressdir --ignore /usr/share/doc/${PF}/html
-ecompressdir --queue /usr/share/doc
+die "'${0##*/}' is not allowed in ebuild scope"
+exit 1
--
2.19.0
[gentoo-portage-dev] [PATCH v2 2/4] Ban prepallman in ebuild scope
---
bin/ebuild-helpers/prepall| 7 ++-
bin/ebuild-helpers/prepallman | 20 +++-
2 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/bin/ebuild-helpers/prepall b/bin/ebuild-helpers/prepall
index c2d879f37..87e1ca20c 100755
--- a/bin/ebuild-helpers/prepall
+++ b/bin/ebuild-helpers/prepall
@@ -16,7 +16,12 @@ if has chflags $FEATURES ; then
chflags -R nosunlnk,nouunlnk "${ED}" 2>/dev/null
fi
-prepallman
+if ! ___eapi_has_docompress; then
+ while IFS= read -r -d '' mandir ; do
+ mandir=${mandir#${ED}}
+ prepman "${mandir%/man}"
+ done < <(find "${ED}" -type d -name man -print0)
+fi
[[ -d ${ED%/}/usr/share/info ]] && prepinfo
___eapi_has_dostrip || prepallstrip
diff --git a/bin/ebuild-helpers/prepallman b/bin/ebuild-helpers/prepallman
index 03b10a8da..e23a6d410 100755
--- a/bin/ebuild-helpers/prepallman
+++ b/bin/ebuild-helpers/prepallman
@@ -1,22 +1,8 @@
#!/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
-# replaced by controllable compression in EAPI 4
-___eapi_has_docompress && exit 0
-
-if ! ___eapi_has_prefix_variables; then
- ED=${D}
-fi
-
-ret=0
-
-while IFS= read -r -d '' mandir ; do
- mandir=${mandir#${ED}}
- prepman "${mandir%/man}"
- ((ret|=$?))
-done < <(find "${ED}" -type d -name man -print0)
-
-exit ${ret}
+die "'${0##*/}' is not allowed in ebuild scope"
+exit 1
--
2.19.0
[gentoo-portage-dev] [PATCH v2 1/4] Ban prepallinfo for ebuild scope use
---
bin/ebuild-helpers/prepall | 4 ++--
bin/ebuild-helpers/prepallinfo | 9 ++---
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/bin/ebuild-helpers/prepall b/bin/ebuild-helpers/prepall
index bc77af4a1..c2d879f37 100755
--- a/bin/ebuild-helpers/prepall
+++ b/bin/ebuild-helpers/prepall
@@ -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
@@ -17,7 +17,7 @@ if has chflags $FEATURES ; then
fi
prepallman
-prepallinfo
+[[ -d ${ED%/}/usr/share/info ]] && prepinfo
___eapi_has_dostrip || prepallstrip
diff --git a/bin/ebuild-helpers/prepallinfo b/bin/ebuild-helpers/prepallinfo
index 34d6a74b7..e23a6d410 100755
--- a/bin/ebuild-helpers/prepallinfo
+++ b/bin/ebuild-helpers/prepallinfo
@@ -4,10 +4,5 @@
source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
-if ! ___eapi_has_prefix_variables; then
- ED=${D}
-fi
-
-[[ -d ${ED%/}/usr/share/info ]] || exit 0
-
-exec prepinfo
+die "'${0##*/}' is not allowed in ebuild scope"
+exit 1
--
2.19.0
[gentoo-portage-dev] [PATCH v2 4/4] Ban prepall in ebuild scope
---
bin/ebuild-helpers/prepall | 28 ++--
bin/misc-functions.sh | 27 ++-
2 files changed, 28 insertions(+), 27 deletions(-)
Changed in v2:
- fixed calling prepallstrip in EAPI 7
diff --git a/bin/ebuild-helpers/prepall b/bin/ebuild-helpers/prepall
index 87e1ca20c..e23a6d410 100755
--- a/bin/ebuild-helpers/prepall
+++ b/bin/ebuild-helpers/prepall
@@ -4,29 +4,5 @@
source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
-if ! ___eapi_has_prefix_variables; then
- ED=${D}
-fi
-
-if has chflags $FEATURES ; then
- # Save all the file flags for restoration at the end of prepall.
- mtree -c -p "${ED}" -k flags > "${T}/bsdflags.mtree"
- # Remove all the file flags so that prepall can do anything necessary.
- chflags -R noschg,nouchg,nosappnd,nouappnd "${ED}"
- chflags -R nosunlnk,nouunlnk "${ED}" 2>/dev/null
-fi
-
-if ! ___eapi_has_docompress; then
- while IFS= read -r -d '' mandir ; do
- mandir=${mandir#${ED}}
- prepman "${mandir%/man}"
- done < <(find "${ED}" -type d -name man -print0)
-fi
-[[ -d ${ED%/}/usr/share/info ]] && prepinfo
-
-___eapi_has_dostrip || prepallstrip
-
-if has chflags $FEATURES ; then
- # Restore all the file flags that were saved at the beginning of
prepall.
- mtree -U -e -p "${ED}" -k flags < "${T}/bsdflags.mtree" &> /dev/null
-fi
+die "'${0##*/}' is not allowed in ebuild scope"
+exit 1
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 34492e086..d25bc8498 100755
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -162,6 +162,31 @@ prepcompress() {
return 0
}
+__prepall() {
+ if has chflags $FEATURES ; then
+ # Save all the file flags for restoration at the end of prepall.
+ mtree -c -p "${ED}" -k flags > "${T}/bsdflags.mtree"
+ # Remove all the file flags so that prepall can do anything
necessary.
+ chflags -R noschg,nouchg,nosappnd,nouappnd "${ED}"
+ chflags -R nosunlnk,nouunlnk "${ED}" 2>/dev/null
+ fi
+
+ if ! ___eapi_has_docompress; then
+ while IFS= read -r -d '' mandir ; do
+ mandir=${mandir#${ED}}
+ prepman "${mandir%/man}"
+ done < <(find "${ED}" -type d -name man -print0)
+ fi
+ [[ -d ${ED%/}/usr/share/info ]] && prepinfo
+
+ ___eapi_has_dostrip || prepallstrip
+
+ if has chflags $FEATURES ; then
+ # Restore all the file flags that were saved at the beginning
of prepall.
+ mtree -U -e -p "${ED}" -k flags < "${T}/bsdflags.mtree" &>
/dev/null
+ fi
+}
+
install_qa_check() {
local d f i qa_var x paths qa_checks=() checks_run=()
if ! ___eapi_has_prefix_variables; then
@@ -219,7 +244,7 @@ install_qa_check() {
done < <(printf "%s\0" "${qa_checks[@]}" | LC_ALL=C sort -u -z)
export STRIP_MASK
- prepall
+ __prepall
___eapi_has_docompress && prepcompress
ecompressdir --dequeue
ecompress --dequeue
--
2.19.0
[gentoo-portage-dev] [PATCH 0/4] Unused prepall* removal
Hi, This series removes unused prepall* helpers. Their code is integrated into prepall, then prepall is moved into misc-functions as internal function rather than ebuild-visible helper. There is still one use of prepalldocs but it will be removed before the patch is merged. This is the first step of refactoring for ecompress replacement. -- Best regards, Michał Górny Michał Górny (4): Ban prepallinfo for ebuild scope use Ban prepallman in ebuild scope Ban prepalldocs in ebuild scope Ban prepall in ebuild scope bin/ebuild-helpers/prepall | 25 +++-- bin/ebuild-helpers/prepalldocs | 19 ++- bin/ebuild-helpers/prepallinfo | 9 ++--- bin/ebuild-helpers/prepallman | 20 +++- bin/misc-functions.sh | 27 ++- 5 files changed, 36 insertions(+), 64 deletions(-) -- 2.19.0
[gentoo-portage-dev] [PATCH 2/4] Ban prepallman in ebuild scope
---
bin/ebuild-helpers/prepall| 7 ++-
bin/ebuild-helpers/prepallman | 20 +++-
2 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/bin/ebuild-helpers/prepall b/bin/ebuild-helpers/prepall
index c2d879f37..87e1ca20c 100755
--- a/bin/ebuild-helpers/prepall
+++ b/bin/ebuild-helpers/prepall
@@ -16,7 +16,12 @@ if has chflags $FEATURES ; then
chflags -R nosunlnk,nouunlnk "${ED}" 2>/dev/null
fi
-prepallman
+if ! ___eapi_has_docompress; then
+ while IFS= read -r -d '' mandir ; do
+ mandir=${mandir#${ED}}
+ prepman "${mandir%/man}"
+ done < <(find "${ED}" -type d -name man -print0)
+fi
[[ -d ${ED%/}/usr/share/info ]] && prepinfo
___eapi_has_dostrip || prepallstrip
diff --git a/bin/ebuild-helpers/prepallman b/bin/ebuild-helpers/prepallman
index 03b10a8da..e23a6d410 100755
--- a/bin/ebuild-helpers/prepallman
+++ b/bin/ebuild-helpers/prepallman
@@ -1,22 +1,8 @@
#!/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
-# replaced by controllable compression in EAPI 4
-___eapi_has_docompress && exit 0
-
-if ! ___eapi_has_prefix_variables; then
- ED=${D}
-fi
-
-ret=0
-
-while IFS= read -r -d '' mandir ; do
- mandir=${mandir#${ED}}
- prepman "${mandir%/man}"
- ((ret|=$?))
-done < <(find "${ED}" -type d -name man -print0)
-
-exit ${ret}
+die "'${0##*/}' is not allowed in ebuild scope"
+exit 1
--
2.19.0
[gentoo-portage-dev] [PATCH 3/4] Ban prepalldocs in ebuild scope
---
bin/ebuild-helpers/prepalldocs | 19 ++-
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/bin/ebuild-helpers/prepalldocs b/bin/ebuild-helpers/prepalldocs
index 6cdceb318..e23a6d410 100755
--- a/bin/ebuild-helpers/prepalldocs
+++ b/bin/ebuild-helpers/prepalldocs
@@ -4,20 +4,5 @@
source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
-if ___eapi_has_docompress; then
- die "'${0##*/}' has been banned for EAPI '$EAPI'"
- exit 1
-fi
-
-if [[ -n $1 ]] ; then
- __vecho "${0##*/}: invalid usage; takes no arguments" 1>&2
-fi
-
-if ! ___eapi_has_prefix_variables; then
- ED=${D}
-fi
-
-[[ -d ${ED%/}/usr/share/doc ]] || exit 0
-
-ecompressdir --ignore /usr/share/doc/${PF}/html
-ecompressdir --queue /usr/share/doc
+die "'${0##*/}' is not allowed in ebuild scope"
+exit 1
--
2.19.0
[gentoo-portage-dev] [PATCH 4/4] Ban prepall in ebuild scope
---
bin/ebuild-helpers/prepall | 28 ++--
bin/misc-functions.sh | 27 ++-
2 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/bin/ebuild-helpers/prepall b/bin/ebuild-helpers/prepall
index 87e1ca20c..e23a6d410 100755
--- a/bin/ebuild-helpers/prepall
+++ b/bin/ebuild-helpers/prepall
@@ -4,29 +4,5 @@
source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
-if ! ___eapi_has_prefix_variables; then
- ED=${D}
-fi
-
-if has chflags $FEATURES ; then
- # Save all the file flags for restoration at the end of prepall.
- mtree -c -p "${ED}" -k flags > "${T}/bsdflags.mtree"
- # Remove all the file flags so that prepall can do anything necessary.
- chflags -R noschg,nouchg,nosappnd,nouappnd "${ED}"
- chflags -R nosunlnk,nouunlnk "${ED}" 2>/dev/null
-fi
-
-if ! ___eapi_has_docompress; then
- while IFS= read -r -d '' mandir ; do
- mandir=${mandir#${ED}}
- prepman "${mandir%/man}"
- done < <(find "${ED}" -type d -name man -print0)
-fi
-[[ -d ${ED%/}/usr/share/info ]] && prepinfo
-
-___eapi_has_dostrip || prepallstrip
-
-if has chflags $FEATURES ; then
- # Restore all the file flags that were saved at the beginning of
prepall.
- mtree -U -e -p "${ED}" -k flags < "${T}/bsdflags.mtree" &> /dev/null
-fi
+die "'${0##*/}' is not allowed in ebuild scope"
+exit 1
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 34492e086..7120717b7 100755
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -162,6 +162,31 @@ prepcompress() {
return 0
}
+__prepall() {
+ if has chflags $FEATURES ; then
+ # Save all the file flags for restoration at the end of prepall.
+ mtree -c -p "${ED}" -k flags > "${T}/bsdflags.mtree"
+ # Remove all the file flags so that prepall can do anything
necessary.
+ chflags -R noschg,nouchg,nosappnd,nouappnd "${ED}"
+ chflags -R nosunlnk,nouunlnk "${ED}" 2>/dev/null
+ fi
+
+ if ! ___eapi_has_docompress; then
+ while IFS= read -r -d '' mandir ; do
+ mandir=${mandir#${ED}}
+ prepman "${mandir%/man}"
+ done < <(find "${ED}" -type d -name man -print0)
+ fi
+ [[ -d ${ED%/}/usr/share/info ]] && prepinfo
+
+ prepallstrip
+
+ if has chflags $FEATURES ; then
+ # Restore all the file flags that were saved at the beginning
of prepall.
+ mtree -U -e -p "${ED}" -k flags < "${T}/bsdflags.mtree" &>
/dev/null
+ fi
+}
+
install_qa_check() {
local d f i qa_var x paths qa_checks=() checks_run=()
if ! ___eapi_has_prefix_variables; then
@@ -219,7 +244,7 @@ install_qa_check() {
done < <(printf "%s\0" "${qa_checks[@]}" | LC_ALL=C sort -u -z)
export STRIP_MASK
- prepall
+ __prepall
___eapi_has_docompress && prepcompress
ecompressdir --dequeue
ecompress --dequeue
--
2.19.0
[gentoo-portage-dev] [PATCH 1/4] Ban prepallinfo for ebuild scope use
---
bin/ebuild-helpers/prepall | 4 ++--
bin/ebuild-helpers/prepallinfo | 9 ++---
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/bin/ebuild-helpers/prepall b/bin/ebuild-helpers/prepall
index bc77af4a1..c2d879f37 100755
--- a/bin/ebuild-helpers/prepall
+++ b/bin/ebuild-helpers/prepall
@@ -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
@@ -17,7 +17,7 @@ if has chflags $FEATURES ; then
fi
prepallman
-prepallinfo
+[[ -d ${ED%/}/usr/share/info ]] && prepinfo
___eapi_has_dostrip || prepallstrip
diff --git a/bin/ebuild-helpers/prepallinfo b/bin/ebuild-helpers/prepallinfo
index 34d6a74b7..e23a6d410 100755
--- a/bin/ebuild-helpers/prepallinfo
+++ b/bin/ebuild-helpers/prepallinfo
@@ -4,10 +4,5 @@
source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1
-if ! ___eapi_has_prefix_variables; then
- ED=${D}
-fi
-
-[[ -d ${ED%/}/usr/share/info ]] || exit 0
-
-exec prepinfo
+die "'${0##*/}' is not allowed in ebuild scope"
+exit 1
--
2.19.0
