app-text/poppler: Unconditionally build with -std=c++11

Closes: https://bugs.gentoo.org/643278
Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/app-text/poppler/poppler-0.61.1.ebuild b/app-text/poppler/poppler-0.61.1.ebuild
index 64b5eec0d538e02ecc1f0e7f24eb4a3f9b4f245a..250e315dbb985fa137b43fe10493ada41f1e989e 100644 (file)
--- a/app-text/poppler/poppler-0.61.1.ebuild
+++ b/app-text/poppler/poppler-0.61.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils toolchain-funcs xdg-utils
+inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
 
 if [[ "${PV}" == "9999" ]] ; then
        inherit git-r3
@@ -84,10 +84,8 @@ src_prepare() {
                einfo "policy(SET CMP0002 OLD) - workaround can be removed"
        fi
 
-       if tc-is-clang && [[ ${CHOST} == *-darwin* ]] ; then
-               # we need to up the C++ version, bug #622526
-               export CXX="$(tc-getCXX) -std=c++11"
-       fi
+       # we need to up the C++ version, bug #622526, #643278
+       append-cxxflags -std=c++11
 }
 
 src_configure() {

diff --git a/app-text/poppler/poppler-0.62.0.ebuild b/app-text/poppler/poppler-0.62.0.ebuild
index b2677478d773cb057a0e45693cc3338870d4dc3f..49e0196feea03dd14481bef855842ff509cbb1b2 100644 (file)
--- a/app-text/poppler/poppler-0.62.0.ebuild
+++ b/app-text/poppler/poppler-0.62.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils toolchain-funcs xdg-utils
+inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
 
 if [[ "${PV}" == "9999" ]] ; then
        inherit git-r3
@@ -79,10 +79,8 @@ src_prepare() {
                einfo "policy(SET CMP0002 OLD) - workaround can be removed"
        fi
 
-       if tc-is-clang && [[ ${CHOST} == *-darwin* ]] ; then
-               # we need to up the C++ version, bug #622526
-               export CXX="$(tc-getCXX) -std=c++11"
-       fi
+       # we need to up the C++ version, bug #622526, #643278
+       append-cxxflags -std=c++11
 }
 
 src_configure() {

diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index f84bcf398fb830e3fbf0564d7cdb01b3d045c9a8..99060e661f2246cc0b2a06e2b3663016e22088d2 100644 (file)
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils toolchain-funcs xdg-utils
+inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
 
 if [[ "${PV}" == "9999" ]] ; then
        inherit git-r3
@@ -79,10 +79,8 @@ src_prepare() {
                einfo "policy(SET CMP0002 OLD) - workaround can be removed"
        fi
 
-       if tc-is-clang && [[ ${CHOST} == *-darwin* ]] ; then
-               # we need to up the C++ version, bug #622526
-               export CXX="$(tc-getCXX) -std=c++11"
-       fi
+       # we need to up the C++ version, bug #622526, #643278
+       append-cxxflags -std=c++11
 }
 
 src_configure() {