Fix compiler version check for ICC and Clang

Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x565953B95372756C

5 files changed, 34 insertions, 40 deletions

diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index cadec82a7443..22753f739961 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-physics/root
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.147 2015/05/15 20:23:37 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.148 2015/07/16 21:22:10 bircoph Exp $
+
+  16 Jul 2015; Andrew Savchenko <bircoph@gentoo.org> root-5.34.26.ebuild,
+  root-5.34.28-r1.ebuild, root-6.02.05-r2.ebuild:
+  Fix compiler version check for ICC and Clang. Reported by Dmitry
+  Kustov, dkustov@jinr.ru.
 
   15 May 2015; Andrew Savchenko <bircoph@gentoo.org> root-6.02.05-r2.ebuild,
   -files/root-6.02.05-dictpch.patch:
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 1de713c47778..d0c93ad4c4d0 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX proofd.confd 415 SHA256 261738817b4ba50fb07007741305d0a88e9067a45e3cbfd1d3fc8bebe70ece38 SHA512 5aa6e6313cf159d2b407286a15f7f959d966a7e9b74bd2a74f13bd3fe01c04d99b46b5fb55f4a7434ebe911cd8b6469657d96591d624a7bfc7d39d49ab62b900 WHIRLPOOL 4a0604d8827cd733a2f5b34183bfd9458aff94f036f9177f2de3283da7722cf2e6dbf6acae93fe3ccd8144ad646c283458550f97f357148cc9f903c7469c57ca
 AUX proofd.initd 717 SHA256 f60fa92173370e237e3e2cf5be7add5aa63752e3b7496cf3a0a5acc1dc927ebc SHA512 73db660c9a3ab8e9a1e1794c7a54ffff3c9c25b9aa0b8273e24c7dcdcb6ac60824a8782087529834d1c4316c1166178ac39daa0feda2971784cc3115bba2a30f WHIRLPOOL 491ccca22cf08d9dc2f61fc6e4cf1fa00c8ad995ce20e7e94cd3b1ea5438568dc23e31a01ae98ea4431aa351c4983c77b26baa3052b42a9747e84c5413cb2be9
 AUX root-5.28.00b-asneeded.patch 712 SHA256 17d1d41d8c7f78abbb7cd284af0a6aca544820db72fa72956b473c7c1817a96b SHA512 6523b0e9610d38f1b65bd0c2af122069abbaa209939073ab0f5f7c279fcc1458663255e5cbcf01787b43519d40496019a9eb4c38d5df26122674bc2435a5aabb WHIRLPOOL 3ed8f327051c118a3d1a2bc23220a89e14fc2efbf88f6ace37d2194462fa3792ac4a32a9cb52bfc94063e5d180e759d12bd85953c52415df4154c186b7864d77
@@ -37,25 +34,8 @@ DIST root_v5.34.28.source.tar.gz 75178811 SHA256 aae8fbcd86ad78ded68e764f294ab49
 DIST root_v6.02.05.source.tar.gz 99121880 SHA256 7a5d4af171ba3b8a736c462b2041f8f35bd4c1d3b6a22c32a3ebd3ffe144ae60 SHA512 b30bc4aafe294ee069ee4c884ff70c983539a48eda586cd1938d00d4688f10e94a435640965b89c6d100fdd998453a4c1ae2109d5f1427f23865a868c561d684 WHIRLPOOL de363835fa00ffa0ff6e596b3c92b59ed59378bac3a344c066f7603d6104058203f76181d4c15478fd9066aedbe6a514257d5796feedb2d5d0d789b263e92955
 DIST rootdrawing-logo.png 15051 SHA256 1dfd913cad53a3ebd6bf560d14df918cab5a295cc7d155944a8e27284af83a6b SHA512 14aa13ebfed3c9412d7d7d04c250740b25fe3af6bcb07e618045a5cec2dc23698a251fd7df2db1a6c37331084db99b029b387ea81c25ac825fc7ae10ad164a68 WHIRLPOOL 877a959a5aead73ba69dbb805c9869cbd6a047ea476bd4e7fef80781563a61d20dad49dd4d8b0005bfc58e8f7c7d38efbb3e085a95974feb81dfc9e339c18741
 EBUILD root-5.32.03-r2.ebuild 11346 SHA256 2431e382432c6cb26f556cc800c942fd0da3eb4bbe134e9fc4715074798d753f SHA512 064c484c73010598cbfa3664b6d004c33ea0766b31a39c4a59ce0a1cfc4f06f168488e4b8c9e524e1500e3d7584a51ab87f0ff82df92feff670e6b4b11266846 WHIRLPOOL 579ae021c54867895a4c627f1e06a3bba81e9d8fe84a97af3df506b485ce31b05e667b7aec940572d100b010f5d079f8ad32035185841d5eed170a97b0b81a43
-EBUILD root-5.34.26.ebuild 12363 SHA256 6759708f3fec672be4e147f57be2edf551df929c0058ad10af239e4fbb630f8f SHA512 b92141cf45d41dc4636cc82727d48da5c068822e13c9f7385bc4e7eaf1a70f65a9a71ac04263f5d9790df45f27eabff97d3c95ae73fea7e472f657c6e5ac33e4 WHIRLPOOL 80dbc9e85957f7bb9a94d005e202833a036be1a5ebf745f8bba6f7ed48e0a13bb8e814e9b9ed3dc5c3d0d755eb57db51ea336c87637a58c19fbff5e8259e4142
-EBUILD root-5.34.28-r1.ebuild 12023 SHA256 b41e63619e78c17d764cdf3662c72dd861df84811bedaabeb44e7554af43040c SHA512 cf9ae03d68c7bf2c939f7227d463d80d34dbedf9573e433cc836d944421b77c3f351f044e53292b63f343ee16e05d073339361280fb2ae80b07969fd3fc1dd68 WHIRLPOOL d52f574e8ea86073baecb0c0088e2d91b826d8bc5021040132b913bb0dee7d7277ba1cdabcf51e093ee4a81f51345fd8ec87875486af17ce3945da542770c68b
-EBUILD root-6.02.05-r2.ebuild 14415 SHA256 804410bf78c8b1e3722c45fbce85272022c793dce74bd75eeac29ea404091cd6 SHA512 db372f61eca8233f11f7c47e3a6027529adb5781b8bfce1007fb14c4eb14d2330aad590c695aff735da33dfc6fce365e97e28572d127143de042dee233fcfa69 WHIRLPOOL 0e0c23c78ad883b84c441f4e1259e2154146ca091069ad8f217df511dc429e0e3b40d3b51beca0e53faef00476dff70c30117a22e6eae824865a3d27c57d37ca
-MISC ChangeLog 42733 SHA256 64e46b303a008fc1bf9193076a0cd038064bf7ef0c7a77517bffa0a4c2d0ccd4 SHA512 a77e146051add7cb31dc77cfe4ddadbff72521844cc80b619fc9bbba6676bf50c29e73273049b6da050e29548c44ee4b7e47a5cb0f023381ade467cde4e8613d WHIRLPOOL 86beb61534a6e363054c90d46f3860d8dc726317e4786d5ea96cca8d36080e699cad06178a38bfdcc79ccf0e5f994d91aa311956d2282fdacb33bef882ab1df1
+EBUILD root-5.34.26.ebuild 12355 SHA256 296d9c69d904646749795812bf0b2a9a059cf7bfaa0c0951ab024280bc8a21af SHA512 b0124171569702178aa034e2b64777117eb508305d03547d3794b34552b8017f7dc56783bd2d63a49dcd188c1e8d31a8c271bb76430e3d93d8d5071befa81bc4 WHIRLPOOL cf06ad5e9e3d9391e38521f8a12374acfca6b411f1a4d6f89e973ec0c372e85d4274ea3ff822bc1e46b45e48de764ca411d2af44c38bb68802c2f08bbdbc45ea
+EBUILD root-5.34.28-r1.ebuild 12015 SHA256 f6c8c6f191d4d0512fc51406390019b680736178ebde7d27b4c684dbd7141145 SHA512 ae26f83799e76b040f7c9431d342d2259a02c61c083f0456030bc7314eb3c475dcdabdd3584d18678877320ac73dcbe4e2b2237db39234290c066f9d07eb7a34 WHIRLPOOL 6e25afb6d29a1b6d3411f34fc9f74f5470e0db2b99a25b229c33e22f6b146685504ca4cebc48ec38668a1a4bb6c550066666e898f8b5b72124d72b4c6af7353b
+EBUILD root-6.02.05-r2.ebuild 14407 SHA256 27ca376ebac4e06cd90d8568ad33abf962fbe3ba3f9ec5d651af2b39aac1684a SHA512 5c0df17fd8fefb4c3349b24d2f4204715dccb83676541441b4133ac979879cc1266fab3e488f3036dca81377dac7325e389c139909c70571ab0e01eb333782f8 WHIRLPOOL 691f1597630c24254fda24e4aeba41fffb385c22851f2f83a79212b0ad165579e69f4a226f6d0cc11494187ff3f75ea4373501d9b6bb6f4c79b7a73c805b7205
+MISC ChangeLog 42952 SHA256 b8fe4a7a9991442cf2bab549615ddb5452e8e806b81ea62d77652bc899765509 SHA512 ccc2f482f8e9269db096a8c9adadb57827508ef2c93b1137118cc47141a0be267e892ecd26c473a231d757ded96b6dfab1ac248f72016e6c25a2cbb0e7dcdc95 WHIRLPOOL c8fcabf95af37f7ffb4f06105cb5820287ffc3d4a48271da8a571da7121a8dbf45b7037b5deaef7667c473e3e3fb36b60c43c7c3ce1b8a807995deffafd97790
 MISC metadata.xml 2037 SHA256 782a0418ce7592d98fb0a0ea39acb4fdda34c8e5693916203c7603c2a6949d82 SHA512 2dd71edf2ef82897be6d4f7cf5454ae26c5c1aaeeca158828b79e67367f16de280c67dd26a20e783bbcb1005f5b190166ccb119abbf0b417bed69e58d6169923 WHIRLPOOL a82e8e4a80f3d5994c42137c46bc59267b64ffb89cf66f22a4803608d53cca56b763f66895ae8efc6150f747ea45f0c00905272a9c52c7f5381930509343728c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJVVlkeAAoJEPZTWjO6HuSN0KQP+gMMDCsfwj0OoSVzljH4Hj0x
-6l6ShtU3Fhi8QlPkRx4A3MQ+m6YUhZgEg6G2pKNrzWwWESzBC7vmJHxgG88HdpGW
-/jTkMzA7mOVSVZSRN6t64afRN3IZUYufWTfsOUzy6TAr+Q6Ctu7GNrkly7anVbCq
-q5zWy14iND2kPaGV7IO3FcgQ7wpbyinZ4MWNqePpt0WX04C8RR5CLUEnU0aHVCwI
-YCF/JshJFpkmJLcYeZU5INU8zsnbvNFEADwWtiiSUUYm99k0zE9GUjIhTWAbf3IW
-hd+k/g4KzhBVpuCYNyE4uD+crXCt9wDP3COfHXnJMJZukBvedq6syebpbnExLjBz
-jggVzb2FO+BOZanFkJD4Gy8ZGWE+TMdVG4Q2hite5cupytq/RsjfBfAs4p/ME++c
-aMyrneARJ5FI/OIFtkgMYgDnpbKm10/+e0fuqa4fRmEn9u4mxaMK7reU9iL8MJyQ
-NsMFRmBLtsNoNYWhzlRsnIN10UfN+qKq2vHQFxz/f/+iRIcbLPAM9I9Dg2YhSxa5
-rISWXwqgLGuCZk6U5GpdpGs3qPILYDIOjiT6U1vpBPJYV6+71ejEBnAjYUIC2JhJ
-oggkopZ4sIFjHUd4eRPXw0ShYW3pjnBxwrkNnsT18nTM52Wz0PB/ENOfZceQFnhi
-GlEWjlzxUFLDos7ey524
-=2RkH
------END PGP SIGNATURE-----
diff --git a/sci-physics/root/root-5.34.26.ebuild b/sci-physics/root/root-5.34.26.ebuild
index a2f69f1082b6..da4549a48082 100644
--- a/sci-physics/root/root-5.34.26.ebuild
+++ b/sci-physics/root/root-5.34.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.26.ebuild,v 1.4 2015/05/01 15:30:02 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.26.ebuild,v 1.5 2015/07/16 21:22:10 bircoph Exp $
 
 EAPI=5
 
@@ -120,7 +120,7 @@ S="${WORKDIR}/${PN}"
 DOC_DIR="/usr/share/doc/${P}"
 
 die_compiler() {
-	eerror "You are using a $(tc-getCXX) without C++$1 capabilities"
+	eerror "You are using a $(tc-getCXX)-$5 without C++$1 capabilities"
 	die "Need one of the following C++$1 capable compilers:\n"\
 		"    >=sys-devel/gcc[cxx]-$2\n"\
 		"    >=sys-devel/clang-$3\n"\
@@ -133,21 +133,24 @@ die_compiler() {
 # $3 - clang++
 # $4 - icc/icpc
 check_compiler() {
+	local ver
 	case "$(tc-getCXX)" in
 		*clang++*)
-			version_is_at_least "$3" "$(has_version sys-devel/clang)" || die_compiler "$1" "$2" "$3" "$4"
+			ver="$(best_version sys-devel/clang | sed 's:sys-devel/clang-::')"
 		;;
 		*g++*)
-			version_is_at_least "$2" "$(gcc-version)" || die_compiler "$1" "$2" "$3" "$4"
+			ver="$(gcc-version)"
 		;;
 		*icc*|*icpc*)
-			version_is_at_least "$4" "$(has_version dev-lang/icc)" || die_compiler "$1" "$2" "$3" "$4"
+			ver="$(best_version dev-lang/icc | sed 's:dev-lang/icc-::')"
 		;;
 		*)
 			ewarn "You are using an unsupported compiler."
 			ewarn "Please report any issues upstream."
+			return 0
 		;;
 	esac
+	version_is_at_least "$3" "${ver}" || die_compiler "$1" "$2" "$3" "$4" "${ver}"
 }
 
 pkg_setup() {
diff --git a/sci-physics/root/root-5.34.28-r1.ebuild b/sci-physics/root/root-5.34.28-r1.ebuild
index e02ecf406e7c..aaf695ae2e31 100644
--- a/sci-physics/root/root-5.34.28-r1.ebuild
+++ b/sci-physics/root/root-5.34.28-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.28-r1.ebuild,v 1.1 2015/04/12 22:24:42 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.28-r1.ebuild,v 1.2 2015/07/16 21:22:10 bircoph Exp $
 
 EAPI=5
 
@@ -114,7 +114,7 @@ S="${WORKDIR}/${PN}"
 DOC_DIR="/usr/share/doc/${P}"
 
 die_compiler() {
-	eerror "You are using a $(tc-getCXX) without C++$1 capabilities"
+	eerror "You are using a $(tc-getCXX)-$5 without C++$1 capabilities"
 	die "Need one of the following C++$1 capable compilers:\n"\
 		"    >=sys-devel/gcc[cxx]-$2\n"\
 		"    >=sys-devel/clang-$3\n"\
@@ -127,21 +127,24 @@ die_compiler() {
 # $3 - clang++
 # $4 - icc/icpc
 check_compiler() {
+	local ver
 	case "$(tc-getCXX)" in
 		*clang++*)
-			version_is_at_least "$3" "$(has_version sys-devel/clang)" || die_compiler "$1" "$2" "$3" "$4"
+			ver="$(best_version sys-devel/clang | sed 's:sys-devel/clang-::')"
 		;;
 		*g++*)
-			version_is_at_least "$2" "$(gcc-version)" || die_compiler "$1" "$2" "$3" "$4"
+			ver="$(gcc-version)"
 		;;
 		*icc*|*icpc*)
-			version_is_at_least "$4" "$(has_version dev-lang/icc)" || die_compiler "$1" "$2" "$3" "$4"
+			ver="$(best_version dev-lang/icc | sed 's:dev-lang/icc-::')"
 		;;
 		*)
 			ewarn "You are using an unsupported compiler."
 			ewarn "Please report any issues upstream."
+			return 0
 		;;
 	esac
+	version_is_at_least "$3" "${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 102d06481c93..e8cc8155ddae 100644
--- a/sci-physics/root/root-6.02.05-r2.ebuild
+++ b/sci-physics/root/root-6.02.05-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-6.02.05-r2.ebuild,v 1.4 2015/05/15 20:23:37 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-6.02.05-r2.ebuild,v 1.5 2015/07/16 21:22:10 bircoph Exp $
 
 EAPI=5
 
@@ -118,7 +118,7 @@ DOC_DIR="/usr/share/doc/${P}"
 OC_UNSUPPORTED="6.8.0"
 
 die_compiler() {
-	eerror "You are using a $(tc-getCXX) without C++$1 capabilities"
+	eerror "You are using a $(tc-getCXX)-$5 without C++$1 capabilities"
 	die "Need one of the following C++$1 capable compilers:\n"\
 		"    >=sys-devel/gcc[cxx]-$2\n"\
 		"    >=sys-devel/clang-$3\n"\
@@ -131,23 +131,26 @@ die_compiler() {
 # $3 - clang++
 # $4 - icc/icpc
 check_compiler() {
+	local ver
 	case "$(tc-getCXX)" in
 		*clang++*)
-			version_is_at_least "$3" "$(has_version sys-devel/clang)" || die_compiler "$1" "$2" "$3" "$4"
+			ver="$(best_version sys-devel/clang | sed 's:sys-devel/clang-::')"
 		;;
 		*g++*)
-			version_is_at_least "$2" "$(gcc-version)" || die_compiler "$1" "$2" "$3" "$4"
+			ver="$(gcc-version)"
 		;;
 		*icc*|*icpc*)
-			version_is_at_least "$4" "$(has_version dev-lang/icc)" || die_compiler "$1" "$2" "$3" "$4"
+			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."
 		;;
 		*)
 			ewarn "You are using an unsupported compiler."
 			ewarn "Please report any issues upstream."
+			return 0
 		;;
 	esac
+	version_is_at_least "$3" "${ver}" || die_compiler "$1" "$2" "$3" "$4" "${ver}"
 }
 
 pkg_setup() {