[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/

[Andreas Hüttel]

commit:     34bdd64bb7c039a459f0442af74eb128e5600498
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Aug 31 19:57:22 2016 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> 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."