| 1 |
commit: e13af6858b4c65a6a1bdd54d8b05160655958bd8 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 14 16:18:48 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 14 16:18:48 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e13af685 |
| 7 |
|
| 8 |
app-office/libreoffice: Simpler check-reqs |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.41, Repoman-2.3.9 |
| 11 |
|
| 12 |
app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild | 11 +++-------- |
| 13 |
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 11 +++-------- |
| 14 |
app-office/libreoffice/libreoffice-6.1.9999.ebuild | 11 +++-------- |
| 15 |
app-office/libreoffice/libreoffice-9999.ebuild | 11 +++-------- |
| 16 |
4 files changed, 12 insertions(+), 32 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild |
| 19 |
index 8d2c709d099..df31a0f84f8 100644 |
| 20 |
--- a/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild |
| 21 |
+++ b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild |
| 22 |
@@ -267,6 +267,7 @@ _check_reqs() { |
| 23 |
else |
| 24 |
CHECKREQS_DISK_BUILD="6G" |
| 25 |
fi |
| 26 |
+ check-reqs_$1 |
| 27 |
} |
| 28 |
|
| 29 |
pkg_pretend() { |
| 30 |
@@ -279,10 +280,7 @@ pkg_pretend() { |
| 31 |
ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base" |
| 32 |
fi |
| 33 |
|
| 34 |
- if [[ ${MERGE_TYPE} != binary ]]; then |
| 35 |
- _check_reqs |
| 36 |
- check-reqs_pkg_pretend |
| 37 |
- fi |
| 38 |
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend |
| 39 |
} |
| 40 |
|
| 41 |
pkg_setup() { |
| 42 |
@@ -290,10 +288,7 @@ pkg_setup() { |
| 43 |
python-single-r1_pkg_setup |
| 44 |
xdg_environment_reset |
| 45 |
|
| 46 |
- if [[ ${MERGE_TYPE} != binary ]]; then |
| 47 |
- _check_reqs |
| 48 |
- check-reqs_pkg_setup |
| 49 |
- fi |
| 50 |
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup |
| 51 |
} |
| 52 |
|
| 53 |
src_unpack() { |
| 54 |
|
| 55 |
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild |
| 56 |
index b25f7e8074b..7fa72b5977b 100644 |
| 57 |
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild |
| 58 |
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild |
| 59 |
@@ -264,6 +264,7 @@ _check_reqs() { |
| 60 |
else |
| 61 |
CHECKREQS_DISK_BUILD="6G" |
| 62 |
fi |
| 63 |
+ check-reqs_$1 |
| 64 |
} |
| 65 |
|
| 66 |
pkg_pretend() { |
| 67 |
@@ -276,10 +277,7 @@ pkg_pretend() { |
| 68 |
ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base" |
| 69 |
fi |
| 70 |
|
| 71 |
- if [[ ${MERGE_TYPE} != binary ]]; then |
| 72 |
- _check_reqs |
| 73 |
- check-reqs_pkg_pretend |
| 74 |
- fi |
| 75 |
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend |
| 76 |
} |
| 77 |
|
| 78 |
pkg_setup() { |
| 79 |
@@ -287,10 +285,7 @@ pkg_setup() { |
| 80 |
python-single-r1_pkg_setup |
| 81 |
xdg_environment_reset |
| 82 |
|
| 83 |
- if [[ ${MERGE_TYPE} != binary ]]; then |
| 84 |
- _check_reqs |
| 85 |
- check-reqs_pkg_setup |
| 86 |
- fi |
| 87 |
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup |
| 88 |
} |
| 89 |
|
| 90 |
src_unpack() { |
| 91 |
|
| 92 |
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild |
| 93 |
index 1a45077dea2..46abef27e98 100644 |
| 94 |
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild |
| 95 |
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild |
| 96 |
@@ -261,6 +261,7 @@ _check_reqs() { |
| 97 |
else |
| 98 |
CHECKREQS_DISK_BUILD="6G" |
| 99 |
fi |
| 100 |
+ check-reqs_$1 |
| 101 |
} |
| 102 |
|
| 103 |
pkg_pretend() { |
| 104 |
@@ -273,10 +274,7 @@ pkg_pretend() { |
| 105 |
ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base" |
| 106 |
fi |
| 107 |
|
| 108 |
- if [[ ${MERGE_TYPE} != binary ]]; then |
| 109 |
- _check_reqs |
| 110 |
- check-reqs_pkg_pretend |
| 111 |
- fi |
| 112 |
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend |
| 113 |
} |
| 114 |
|
| 115 |
pkg_setup() { |
| 116 |
@@ -284,10 +282,7 @@ pkg_setup() { |
| 117 |
python-single-r1_pkg_setup |
| 118 |
xdg_environment_reset |
| 119 |
|
| 120 |
- if [[ ${MERGE_TYPE} != binary ]]; then |
| 121 |
- _check_reqs |
| 122 |
- check-reqs_pkg_setup |
| 123 |
- fi |
| 124 |
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup |
| 125 |
} |
| 126 |
|
| 127 |
src_unpack() { |
| 128 |
|
| 129 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
| 130 |
index 1a45077dea2..46abef27e98 100644 |
| 131 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
| 132 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
| 133 |
@@ -261,6 +261,7 @@ _check_reqs() { |
| 134 |
else |
| 135 |
CHECKREQS_DISK_BUILD="6G" |
| 136 |
fi |
| 137 |
+ check-reqs_$1 |
| 138 |
} |
| 139 |
|
| 140 |
pkg_pretend() { |
| 141 |
@@ -273,10 +274,7 @@ pkg_pretend() { |
| 142 |
ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base" |
| 143 |
fi |
| 144 |
|
| 145 |
- if [[ ${MERGE_TYPE} != binary ]]; then |
| 146 |
- _check_reqs |
| 147 |
- check-reqs_pkg_pretend |
| 148 |
- fi |
| 149 |
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend |
| 150 |
} |
| 151 |
|
| 152 |
pkg_setup() { |
| 153 |
@@ -284,10 +282,7 @@ pkg_setup() { |
| 154 |
python-single-r1_pkg_setup |
| 155 |
xdg_environment_reset |
| 156 |
|
| 157 |
- if [[ ${MERGE_TYPE} != binary ]]; then |
| 158 |
- _check_reqs |
| 159 |
- check-reqs_pkg_setup |
| 160 |
- fi |
| 161 |
+ [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup |
| 162 |
} |
| 163 |
|
| 164 |
src_unpack() { |
Archives