1 |
--- |
2 |
bin/ebuild-helpers/prepall | 4 ++-- |
3 |
bin/ebuild-helpers/prepallinfo | 9 ++------- |
4 |
2 files changed, 4 insertions(+), 9 deletions(-) |
5 |
|
6 |
diff --git a/bin/ebuild-helpers/prepall b/bin/ebuild-helpers/prepall |
7 |
index bc77af4a1..c2d879f37 100755 |
8 |
--- a/bin/ebuild-helpers/prepall |
9 |
+++ b/bin/ebuild-helpers/prepall |
10 |
@@ -1,5 +1,5 @@ |
11 |
#!/bin/bash |
12 |
-# Copyright 1999-2012 Gentoo Foundation |
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 |
@@ -17,7 +17,7 @@ if has chflags $FEATURES ; then |
18 |
fi |
19 |
|
20 |
prepallman |
21 |
-prepallinfo |
22 |
+[[ -d ${ED%/}/usr/share/info ]] && prepinfo |
23 |
|
24 |
___eapi_has_dostrip || prepallstrip |
25 |
|
26 |
diff --git a/bin/ebuild-helpers/prepallinfo b/bin/ebuild-helpers/prepallinfo |
27 |
index 34d6a74b7..e23a6d410 100755 |
28 |
--- a/bin/ebuild-helpers/prepallinfo |
29 |
+++ b/bin/ebuild-helpers/prepallinfo |
30 |
@@ -4,10 +4,5 @@ |
31 |
|
32 |
source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1 |
33 |
|
34 |
-if ! ___eapi_has_prefix_variables; then |
35 |
- ED=${D} |
36 |
-fi |
37 |
- |
38 |
-[[ -d ${ED%/}/usr/share/info ]] || exit 0 |
39 |
- |
40 |
-exec prepinfo |
41 |
+die "'${0##*/}' is not allowed in ebuild scope" |
42 |
+exit 1 |
43 |
-- |
44 |
2.19.0 |