From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AFB2F138334 for ; Sat, 14 Jul 2018 16:19:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 79940E0AD6; Sat, 14 Jul 2018 16:19:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 35B8AE0AD6 for ; Sat, 14 Jul 2018 16:19:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4615B335C99 for ; Sat, 14 Jul 2018 16:19:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 21FDE358 for ; Sat, 14 Jul 2018 16:19:27 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1531585128.e13af6858b4c65a6a1bdd54d8b05160655958bd8.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild app-office/libreoffice/libreoffice-6.0.9999.ebuild app-office/libreoffice/libreoffice-6.1.9999.ebuild app-office/libreoffice/libreoffice-9999.ebuild X-VCS-Directories: app-office/libreoffice/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e13af6858b4c65a6a1bdd54d8b05160655958bd8 X-VCS-Branch: master Date: Sat, 14 Jul 2018 16:19:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6bd866c5-283e-4428-baf3-c9a3cfdcd42f X-Archives-Hash: d28b3fba168799ae02a88adc52cdba1d commit: e13af6858b4c65a6a1bdd54d8b05160655958bd8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jul 14 16:18:48 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jul 14 16:18:48 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e13af685 app-office/libreoffice: Simpler check-reqs Package-Manager: Portage-2.3.41, Repoman-2.3.9 app-office/libreoffice/libreoffice-6.0.5.2-r1.ebuild | 11 +++-------- app-office/libreoffice/libreoffice-6.0.9999.ebuild | 11 +++-------- app-office/libreoffice/libreoffice-6.1.9999.ebuild | 11 +++-------- 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 8d2c709d099..df31a0f84f8 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 b25f7e8074b..7fa72b5977b 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 1a45077dea2..46abef27e98 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 1a45077dea2..46abef27e98 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() {