diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-07-14 18:18:48 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-07-14 18:18:48 +0200 |
| commit | e13af6858b4c65a6a1bdd54d8b05160655958bd8 (patch) | |
| tree | 38c7b055e39532251fb59113058377ca020d7010 | |
| parent | dev-ruby/httparty: add ruby25, ignore failing test (diff) | |
| download | gentoo-e13af6858b4c65a6a1bdd54d8b05160655958bd8.tar.gz gentoo-e13af6858b4c65a6a1bdd54d8b05160655958bd8.tar.bz2 gentoo-e13af6858b4c65a6a1bdd54d8b05160655958bd8.zip | |
app-office/libreoffice: Simpler check-reqs
Package-Manager: Portage-2.3.41, Repoman-2.3.9
| -rw-r--r-- | app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild | 11 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-6.0.9999.ebuild | 11 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-6.1.9999.ebuild | 11 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999.ebuild | 11 |
4 files changed, 12 insertions, 32 deletions
diff --git a/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild index 8d2c709d0992..df31a0f84f82 100644 --- a/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild +++ b/app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild @@ -267,6 +267,7 @@ _check_reqs() { else CHECKREQS_DISK_BUILD="6G" fi + check-reqs_$1 } pkg_pretend() { @@ -279,10 +280,7 @@ pkg_pretend() { ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base" fi - if [[ ${MERGE_TYPE} != binary ]]; then - _check_reqs - check-reqs_pkg_pretend - fi + [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend } pkg_setup() { @@ -290,10 +288,7 @@ pkg_setup() { python-single-r1_pkg_setup xdg_environment_reset - if [[ ${MERGE_TYPE} != binary ]]; then - _check_reqs - check-reqs_pkg_setup - fi + [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup } src_unpack() { diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild index b25f7e8074b8..7fa72b5977b8 100644 --- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild @@ -264,6 +264,7 @@ _check_reqs() { else CHECKREQS_DISK_BUILD="6G" fi + check-reqs_$1 } pkg_pretend() { @@ -276,10 +277,7 @@ pkg_pretend() { ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base" fi - if [[ ${MERGE_TYPE} != binary ]]; then - _check_reqs - check-reqs_pkg_pretend - fi + [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend } pkg_setup() { @@ -287,10 +285,7 @@ pkg_setup() { python-single-r1_pkg_setup xdg_environment_reset - if [[ ${MERGE_TYPE} != binary ]]; then - _check_reqs - check-reqs_pkg_setup - fi + [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup } src_unpack() { diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild index 1a45077dea2c..46abef27e981 100644 --- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild @@ -261,6 +261,7 @@ _check_reqs() { else CHECKREQS_DISK_BUILD="6G" fi + check-reqs_$1 } pkg_pretend() { @@ -273,10 +274,7 @@ pkg_pretend() { ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base" fi - if [[ ${MERGE_TYPE} != binary ]]; then - _check_reqs - check-reqs_pkg_pretend - fi + [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend } pkg_setup() { @@ -284,10 +282,7 @@ pkg_setup() { python-single-r1_pkg_setup xdg_environment_reset - if [[ ${MERGE_TYPE} != binary ]]; then - _check_reqs - check-reqs_pkg_setup - fi + [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup } src_unpack() { diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 1a45077dea2c..46abef27e981 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -261,6 +261,7 @@ _check_reqs() { else CHECKREQS_DISK_BUILD="6G" fi + check-reqs_$1 } pkg_pretend() { @@ -273,10 +274,7 @@ pkg_pretend() { ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base" fi - if [[ ${MERGE_TYPE} != binary ]]; then - _check_reqs - check-reqs_pkg_pretend - fi + [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_pretend } pkg_setup() { @@ -284,10 +282,7 @@ pkg_setup() { python-single-r1_pkg_setup xdg_environment_reset - if [[ ${MERGE_TYPE} != binary ]]; then - _check_reqs - check-reqs_pkg_setup - fi + [[ ${MERGE_TYPE} != binary ]] && _check_reqs pkg_setup } src_unpack() { |