app-office/libreoffice: Really exclude clang from GCC version check

Gentoo-bug: 589948

Package-Manager: portage-2.2.28

diff --git a/app-office/libreoffice/libreoffice-5.1.4.2.ebuild b/app-office/libreoffice/libreoffice-5.1.4.2.ebuild
index 49088e7326944a45836ea9a0778c663f28cbaec6..e8cee345501c92109761a07d58cee78cd050a6b7 100644 (file)
--- 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 68e7b73e08b18d75e15fccf37482feca659b1f77..d2494129c60b5022a913eee3bc7540c6ff77740c 100644 (file)
--- 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 b95de748e3ed359da2de58c3c0ad8816713ce404..7dff9ae439b177696b30b522d9c4a650a24ec4a8 100644 (file)
--- 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."