1 |
--- |
2 |
bin/ebuild-helpers/prepall | 7 ++++++- |
3 |
bin/ebuild-helpers/prepallman | 20 +++----------------- |
4 |
2 files changed, 9 insertions(+), 18 deletions(-) |
5 |
|
6 |
diff --git a/bin/ebuild-helpers/prepall b/bin/ebuild-helpers/prepall |
7 |
index c2d879f37..87e1ca20c 100755 |
8 |
--- a/bin/ebuild-helpers/prepall |
9 |
+++ b/bin/ebuild-helpers/prepall |
10 |
@@ -16,7 +16,12 @@ if has chflags $FEATURES ; then |
11 |
chflags -R nosunlnk,nouunlnk "${ED}" 2>/dev/null |
12 |
fi |
13 |
|
14 |
-prepallman |
15 |
+if ! ___eapi_has_docompress; then |
16 |
+ while IFS= read -r -d '' mandir ; do |
17 |
+ mandir=${mandir#${ED}} |
18 |
+ prepman "${mandir%/man}" |
19 |
+ done < <(find "${ED}" -type d -name man -print0) |
20 |
+fi |
21 |
[[ -d ${ED%/}/usr/share/info ]] && prepinfo |
22 |
|
23 |
___eapi_has_dostrip || prepallstrip |
24 |
diff --git a/bin/ebuild-helpers/prepallman b/bin/ebuild-helpers/prepallman |
25 |
index 03b10a8da..e23a6d410 100755 |
26 |
--- a/bin/ebuild-helpers/prepallman |
27 |
+++ b/bin/ebuild-helpers/prepallman |
28 |
@@ -1,22 +1,8 @@ |
29 |
#!/bin/bash |
30 |
-# Copyright 1999-2012 Gentoo Foundation |
31 |
+# Copyright 1999-2018 Gentoo Foundation |
32 |
# Distributed under the terms of the GNU General Public License v2 |
33 |
|
34 |
source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1 |
35 |
|
36 |
-# replaced by controllable compression in EAPI 4 |
37 |
-___eapi_has_docompress && exit 0 |
38 |
- |
39 |
-if ! ___eapi_has_prefix_variables; then |
40 |
- ED=${D} |
41 |
-fi |
42 |
- |
43 |
-ret=0 |
44 |
- |
45 |
-while IFS= read -r -d '' mandir ; do |
46 |
- mandir=${mandir#${ED}} |
47 |
- prepman "${mandir%/man}" |
48 |
- ((ret|=$?)) |
49 |
-done < <(find "${ED}" -type d -name man -print0) |
50 |
- |
51 |
-exit ${ret} |
52 |
+die "'${0##*/}' is not allowed in ebuild scope" |
53 |
+exit 1 |
54 |
-- |
55 |
2.19.0 |