[gentoo-commits] repo/gentoo:master commit in: net-ftp/filezilla/

[Mike Gilbert]

commit:     555f6586abf209a046ebf8002d89f1f8601f2cde
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 19 16:41:44 2015 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 14:36:11 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=555f6586

net-ftp/filezilla: Replace C++14 check with simpler test-flag-CXX

Package-Manager: portage-2.2.20_p134

 net-ftp/filezilla/filezilla-3.13.0.ebuild | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/net-ftp/filezilla/filezilla-3.13.0.ebuild 
b/net-ftp/filezilla/filezilla-3.13.0.ebuild
index 3f0e7a0..2678ed5 100644
--- a/net-ftp/filezilla/filezilla-3.13.0.ebuild
+++ b/net-ftp/filezilla/filezilla-3.13.0.ebuild
@@ -37,16 +37,13 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}"/${PN}-${MY_PV}
 
 pkg_pretend() {
-if [[ ${MERGE_TYPE} != binary ]]; then
-               echo 'int main() {return 0;}' > "${T}"/test.cxx || die
-               ebegin "Trying to build a C++14 test program"
-               if ! $(tc-getCXX) -std=c++14 -o /dev/null "${T}"/test.cxx; then
+       if [[ ${MERGE_TYPE} != binary ]]; then
+               if ! test-flag-CXX -std=c++14; then
                        eerror "${P} requires C++14-capable C++ compiler. Your 
current compiler"
                        eerror "does not seem to support -std=c++14 option. 
Please upgrade your compiler"
                        eerror "to gcc-4.9 or an equivalent version supporting 
C++14."
                        die "Currently active compiler does not support 
-std=c++14"
                fi
-               eend ${?}
        fi
 }