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 0D14B1395E2 for ; Sat, 19 Nov 2016 22:41:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4EECFE0A5F; Sat, 19 Nov 2016 22:41:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 197F1E0A5F for ; Sat, 19 Nov 2016 22:41:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6B518340AC7 for ; Sat, 19 Nov 2016 22:41:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D0538332 for ; Sat, 19 Nov 2016 22:41:06 +0000 (UTC) From: "Andreas Hüttel" 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 Hüttel" Message-ID: <1479595260.e62775916f1ef4bb75b3683dd4af90f2044ada8a.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/libreoffice-5.2.9999.ebuild app-office/libreoffice/libreoffice-9999.ebuild X-VCS-Directories: app-office/libreoffice/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: e62775916f1ef4bb75b3683dd4af90f2044ada8a X-VCS-Branch: master Date: Sat, 19 Nov 2016 22:41:06 +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: 1e09c623-3f4f-4892-b7a7-ba46815209b7 X-Archives-Hash: a0732f94b650eef51b5eb152f5d1f2bd commit: e62775916f1ef4bb75b3683dd4af90f2044ada8a Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Nov 19 22:40:04 2016 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Sat Nov 19 22:41:00 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6277591 app-office/libreoffice: do not call is-flagq in global scope, bug 593424 Package-Manager: portage-2.3.2 app-office/libreoffice/libreoffice-5.2.9999.ebuild | 25 ++++++++++++++-------- app-office/libreoffice/libreoffice-9999.ebuild | 25 ++++++++++++++-------- 2 files changed, 32 insertions(+), 18 deletions(-) diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild index 663d010..f71cc06 100644 --- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild +++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild @@ -247,19 +247,18 @@ PATCHES=( "${FILESDIR}/${PN}-5.2-system-pyuno.patch" ) -CHECKREQS_MEMORY="512M" - -if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then - CHECKREQS_DISK_BUILD="22G" -elif [[ ${MERGE_TYPE} != binary ]] ; then - CHECKREQS_DISK_BUILD="6G" -fi - pkg_pretend() { use java || \ ewarn "If you plan to use lbase application you should enable java or you will get various crashes." if [[ ${MERGE_TYPE} != binary ]]; then + + CHECKREQS_MEMORY="512M" + if is-flagq "-g*" && ! is-flagq "-g*0" ; then + CHECKREQS_DISK_BUILD="22G" + else + CHECKREQS_DISK_BUILD="6G" + fi check-reqs_pkg_pretend if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || { @@ -287,7 +286,15 @@ pkg_setup() { python-single-r1_pkg_setup xdg_environment_reset - [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup + if [[ ${MERGE_TYPE} != binary ]]; then + CHECKREQS_MEMORY="512M" + if is-flagq "-g*" && ! is-flagq "-g*0" ; then + CHECKREQS_DISK_BUILD="22G" + else + CHECKREQS_DISK_BUILD="6G" + fi + check-reqs_pkg_setup + fi } src_unpack() { diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index ebc28aa..d43f7ea 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -246,19 +246,18 @@ PATCHES=( "${FILESDIR}/${PN}-5.3-system-pyuno.patch" ) -CHECKREQS_MEMORY="512M" - -if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then - CHECKREQS_DISK_BUILD="22G" -elif [[ ${MERGE_TYPE} != binary ]] ; then - CHECKREQS_DISK_BUILD="6G" -fi - pkg_pretend() { use java || \ ewarn "If you plan to use lbase application you should enable java or you will get various crashes." if [[ ${MERGE_TYPE} != binary ]]; then + + CHECKREQS_MEMORY="512M" + if is-flagq "-g*" && ! is-flagq "-g*0" ; then + CHECKREQS_DISK_BUILD="22G" + else + CHECKREQS_DISK_BUILD="6G" + fi check-reqs_pkg_pretend if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || { @@ -286,7 +285,15 @@ pkg_setup() { python-single-r1_pkg_setup xdg_environment_reset - [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup + if [[ ${MERGE_TYPE} != binary ]]; then + CHECKREQS_MEMORY="512M" + if is-flagq "-g*" && ! is-flagq "-g*0" ; then + CHECKREQS_DISK_BUILD="22G" + else + CHECKREQS_DISK_BUILD="6G" + fi + check-reqs_pkg_setup + fi } src_unpack() {