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 6AFFA138330 for ; Sat, 17 Sep 2016 21:32:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7DE9621C087; Sat, 17 Sep 2016 21:32:31 +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 8804921C082 for ; Sat, 17 Sep 2016 21:32:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 A469C340BF6 for ; Sat, 17 Sep 2016 21:32:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A55EE2498 for ; Sat, 17 Sep 2016 21:32:25 +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: <1474147932.34bdd64bb7c039a459f0442af74eb128e5600498.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.1.4.2.ebuild 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: 34bdd64bb7c039a459f0442af74eb128e5600498 X-VCS-Branch: master Date: Sat, 17 Sep 2016 21:32:25 +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: ffbc3b1e-639a-471f-8a63-877fd4895fcf X-Archives-Hash: f0f9c4e9b6f644027bff18f459238ca5 commit: 34bdd64bb7c039a459f0442af74eb128e5600498 Author: Andreas Sturmlechner gmail com> AuthorDate: Wed Aug 31 19:57:22 2016 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Sat Sep 17 21:32:12 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34bdd64b app-office/libreoffice: Really exclude clang from GCC version check Gentoo-bug: 589948 Package-Manager: portage-2.2.28 app-office/libreoffice/libreoffice-5.1.4.2.ebuild | 4 +--- app-office/libreoffice/libreoffice-5.2.9999.ebuild | 4 +--- app-office/libreoffice/libreoffice-9999.ebuild | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild index 49088e73..e8cee34 100644 --- a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild +++ b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild @@ -265,9 +265,7 @@ pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]]; then check-reqs_pkg_pretend - if [[ $(tc-getCC) == clang ]] ; then - : # ignore clang, which works - elif [[ $(gcc-major-version) -lt 4 ]] || { + if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || { [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then eerror "Compilation with gcc older than 4.7 is not supported" die "Too old gcc found." diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild index 68e7b73..d249412 100644 --- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild +++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild @@ -259,9 +259,7 @@ pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]]; then check-reqs_pkg_pretend - if [[ $(tc-getCC) == clang ]] ; then - : # ignore clang, which works - elif [[ $(gcc-major-version) -lt 4 ]] || { + if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || { [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then eerror "Compilation with gcc older than 4.7 is not supported" die "Too old gcc found." diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index b95de74..7dff9ae 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -259,9 +259,7 @@ pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]]; then check-reqs_pkg_pretend - if [[ $(tc-getCC) == clang ]] ; then - : # ignore clang, which works - elif [[ $(gcc-major-version) -lt 4 ]] || { + if ! $(tc-is-clang) && [[ $(gcc-major-version) -lt 4 ]] || { [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; } then eerror "Compilation with gcc older than 4.7 is not supported" die "Too old gcc found."