diff options
| -rw-r--r-- | sci-physics/root/root-5.34.26.ebuild | 9 | ||||
| -rw-r--r-- | sci-physics/root/root-5.34.32.ebuild | 9 | ||||
| -rw-r--r-- | sci-physics/root/root-6.02.05-r2.ebuild | 9 | ||||
| -rw-r--r-- | sci-physics/root/root-6.04.06.ebuild | 9 |
4 files changed, 24 insertions, 12 deletions
diff --git a/sci-physics/root/root-5.34.26.ebuild b/sci-physics/root/root-5.34.26.ebuild index b498a18babee..80feeaef14f5 100644 --- a/sci-physics/root/root-5.34.26.ebuild +++ b/sci-physics/root/root-5.34.26.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -132,16 +132,19 @@ die_compiler() { # $3 - clang++ # $4 - icc/icpc check_compiler() { - local ver + local cur ver case "$(tc-getCXX)" in *clang++*) ver="$(best_version sys-devel/clang | sed 's:sys-devel/clang-::')" + cur="$3" ;; *g++*) ver="$(gcc-version)" + cur="$2" ;; *icc*|*icpc*) ver="$(best_version dev-lang/icc | sed 's:dev-lang/icc-::')" + cur="$4" ;; *) ewarn "You are using an unsupported compiler." @@ -149,7 +152,7 @@ check_compiler() { return 0 ;; esac - version_is_at_least "$3" "${ver}" || die_compiler "$1" "$2" "$3" "$4" "${ver}" + version_is_at_least "${cur}" "${ver}" || die_compiler "$1" "$2" "$3" "$4" "${ver}" } pkg_setup() { diff --git a/sci-physics/root/root-5.34.32.ebuild b/sci-physics/root/root-5.34.32.ebuild index 915e7123c314..2fb31dcb9382 100644 --- a/sci-physics/root/root-5.34.32.ebuild +++ b/sci-physics/root/root-5.34.32.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -126,16 +126,19 @@ die_compiler() { # $3 - clang++ # $4 - icc/icpc check_compiler() { - local ver + local cur ver case "$(tc-getCXX)" in *clang++*) ver="$(best_version sys-devel/clang | sed 's:sys-devel/clang-::')" + cur="$3" ;; *g++*) ver="$(gcc-version)" + cur="$2" ;; *icc*|*icpc*) ver="$(best_version dev-lang/icc | sed 's:dev-lang/icc-::')" + cur="$4" ;; *) ewarn "You are using an unsupported compiler." @@ -143,7 +146,7 @@ check_compiler() { return 0 ;; esac - version_is_at_least "$3" "${ver}" || die_compiler "$1" "$2" "$3" "$4" "${ver}" + version_is_at_least "${cur}" "${ver}" || die_compiler "$1" "$2" "$3" "$4" "${ver}" } pkg_setup() { diff --git a/sci-physics/root/root-6.02.05-r2.ebuild b/sci-physics/root/root-6.02.05-r2.ebuild index 0ce7393b96be..5bb87419d91a 100644 --- a/sci-physics/root/root-6.02.05-r2.ebuild +++ b/sci-physics/root/root-6.02.05-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -132,18 +132,21 @@ die_compiler() { # $3 - clang++ # $4 - icc/icpc check_compiler() { - local ver + local cur ver case "$(tc-getCXX)" in *clang++*) ver="$(best_version sys-devel/clang | sed 's:sys-devel/clang-::')" + cur="$3" ;; *g++*) ver="$(gcc-version)" + cur="$2" ;; *icc*|*icpc*) ver="$(best_version dev-lang/icc | sed 's:dev-lang/icc-::')" eerror "ROOT-6 is known not to build with ICC." eerror "Please report any isuses upstream." + cur="$4" ;; *) ewarn "You are using an unsupported compiler." @@ -151,7 +154,7 @@ check_compiler() { return 0 ;; esac - version_is_at_least "$3" "${ver}" || die_compiler "$1" "$2" "$3" "$4" "${ver}" + version_is_at_least "${cur}" "${ver}" || die_compiler "$1" "$2" "$3" "$4" "${ver}" } pkg_setup() { diff --git a/sci-physics/root/root-6.04.06.ebuild b/sci-physics/root/root-6.04.06.ebuild index f498a73c472f..093ad9ff55c9 100644 --- a/sci-physics/root/root-6.04.06.ebuild +++ b/sci-physics/root/root-6.04.06.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -127,18 +127,21 @@ die_compiler() { # $3 - clang++ # $4 - icc/icpc check_compiler() { - local ver + local cur ver case "$(tc-getCXX)" in *clang++*) ver="$(best_version sys-devel/clang | sed 's:sys-devel/clang-::')" + cur="$3" ;; *g++*) ver="$(gcc-version)" + cur="$2" ;; *icc*|*icpc*) ver="$(best_version dev-lang/icc | sed 's:dev-lang/icc-::')" eerror "ROOT-6 is known not to build with ICC." eerror "Please report any isuses upstream." + cur="$4" ;; *) ewarn "You are using an unsupported compiler." @@ -146,7 +149,7 @@ check_compiler() { return 0 ;; esac - version_is_at_least "$3" "${ver}" || die_compiler "$1" "$2" "$3" "$4" "${ver}" + version_is_at_least "${cur}" "${ver}" || die_compiler "$1" "$2" "$3" "$4" "${ver}" } pkg_setup() { |