Fix icc compiler detection per bug #152385 and add checking into the 4.2 series that is in the 4.1 series

Package-Manager: portage-2.1.2_pre3-r7

4 files changed, 46 insertions, 22 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 767d5ed0e82f..33568db4acfe 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.378 2006/10/30 18:08:14 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.379 2006/10/30 18:18:37 caleb Exp $
+
+  30 Oct 2006; Caleb Tennis <caleb@gentoo.org> qt-4.1.4-r2.ebuild,
+  qt-4.2.1.ebuild:
+  Fix icc compiler detection per bug #152385 and add checking into the 4.2
+  series that is in the 4.1 series
 
   30 Oct 2006; Caleb Tennis <caleb@gentoo.org> -qt-4.0.1.ebuild:
   Remove 4.0 series that was put back for sparc reasons.  Now have a 4.1 stable
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 06eebd005674..bd3ab37d66d9 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -132,22 +132,22 @@ EBUILD qt-4.1.4-r1.ebuild 6851 RMD160 b2703d62a9dffde0af614c68b7b115734bf5e2b6 S
 MD5 8cb5564e06564035e498cdfe89bead28 qt-4.1.4-r1.ebuild 6851
 RMD160 b2703d62a9dffde0af614c68b7b115734bf5e2b6 qt-4.1.4-r1.ebuild 6851
 SHA256 54f0a7f304cf1c242080fa715007547343f816af22f1adfbd526331078a452b2 qt-4.1.4-r1.ebuild 6851
-EBUILD qt-4.1.4-r2.ebuild 6847 RMD160 87425bba0dc3be77db28b552d70f2bb13ee84b68 SHA1 ff90842e4dcc8d2776356433cc923e9d18bf2595 SHA256 1f41ef953c8bee67cec4e3ee66e93a045681461a3ed521fc1e1af24ba86e41bc
-MD5 08b95ee6af40cee10c7e099d29a949c1 qt-4.1.4-r2.ebuild 6847
-RMD160 87425bba0dc3be77db28b552d70f2bb13ee84b68 qt-4.1.4-r2.ebuild 6847
-SHA256 1f41ef953c8bee67cec4e3ee66e93a045681461a3ed521fc1e1af24ba86e41bc qt-4.1.4-r2.ebuild 6847
+EBUILD qt-4.1.4-r2.ebuild 6847 RMD160 8525b11f90d6f4faa20d712fc7d977e84a9c7999 SHA1 f6d212d9bdf0324fac92ad7169cde3cfe7e2440c SHA256 8f442105c43eb4d7902497b762461d6712611d0be0df6336bb1837010366762e
+MD5 9aa16bc9eba1a97600f040fa47afc568 qt-4.1.4-r2.ebuild 6847
+RMD160 8525b11f90d6f4faa20d712fc7d977e84a9c7999 qt-4.1.4-r2.ebuild 6847
+SHA256 8f442105c43eb4d7902497b762461d6712611d0be0df6336bb1837010366762e qt-4.1.4-r2.ebuild 6847
 EBUILD qt-4.1.4.ebuild 6795 RMD160 df101b82f9f8d227fb43595fb29dcb40f858f9ff SHA1 26460f03a5f36b12e33ba1fcdd1ddc9e620411bb SHA256 dc6fcdf28a4379dc4deecc771dd8fdec35dca9d2f2819bf665adde4036dc9605
 MD5 fb7513785604d0ca267e9007d84a81c3 qt-4.1.4.ebuild 6795
 RMD160 df101b82f9f8d227fb43595fb29dcb40f858f9ff qt-4.1.4.ebuild 6795
 SHA256 dc6fcdf28a4379dc4deecc771dd8fdec35dca9d2f2819bf665adde4036dc9605 qt-4.1.4.ebuild 6795
-EBUILD qt-4.2.1.ebuild 6949 RMD160 cef3ad5ea8cac06306ba27a87ca6512943bca93a SHA1 c4b6896b25dbf065c4b2650019ad9582df4abf87 SHA256 68aeb8ade5b222fea8bed1721b7a59b3b324b2d7bd70bc2925c0ba0a3b35c7a2
-MD5 11619f398a5906b70241db6da7532115 qt-4.2.1.ebuild 6949
-RMD160 cef3ad5ea8cac06306ba27a87ca6512943bca93a qt-4.2.1.ebuild 6949
-SHA256 68aeb8ade5b222fea8bed1721b7a59b3b324b2d7bd70bc2925c0ba0a3b35c7a2 qt-4.2.1.ebuild 6949
-MISC ChangeLog 19514 RMD160 1cd164acb916596bfb19328acb938a47e68e0bbd SHA1 ba5214db24735114dcacda008a1bbb8c69f4b7ff SHA256 ea0cbac4604ddf89f422a3a03908cb22f39cff5dddc47ca85799c9d81d0262ba
-MD5 f80fc3e5992928d9fd54a6f8eb7bbc88 ChangeLog 19514
-RMD160 1cd164acb916596bfb19328acb938a47e68e0bbd ChangeLog 19514
-SHA256 ea0cbac4604ddf89f422a3a03908cb22f39cff5dddc47ca85799c9d81d0262ba ChangeLog 19514
+EBUILD qt-4.2.1.ebuild 7218 RMD160 a476ce164723b14f72dee4a15cc6c66cbe8a5cdb SHA1 945a2a38395dc25022062e7c8cf6e5bd6f69921a SHA256 01aa001513a10c0a335c129cd13743b23975721c0dc895275d2883d2edb650dc
+MD5 e58301d864c5efba8aa5da6b0c02c09f qt-4.2.1.ebuild 7218
+RMD160 a476ce164723b14f72dee4a15cc6c66cbe8a5cdb qt-4.2.1.ebuild 7218
+SHA256 01aa001513a10c0a335c129cd13743b23975721c0dc895275d2883d2edb650dc qt-4.2.1.ebuild 7218
+MISC ChangeLog 19711 RMD160 3b980ab66c5b6a3a570b07d8bfdc8bc5e2422808 SHA1 b39a36a6ad3f759574ad0fdc88af9c2e15d72081 SHA256 f046679338540a01546b4d27947757053d91f6395d525ab66baf27568d1e6b6f
+MD5 7197d338380320f5cbb96cd4a82dc27a ChangeLog 19711
+RMD160 3b980ab66c5b6a3a570b07d8bfdc8bc5e2422808 ChangeLog 19711
+SHA256 f046679338540a01546b4d27947757053d91f6395d525ab66baf27568d1e6b6f ChangeLog 19711
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156
diff --git a/x11-libs/qt/qt-4.1.4-r2.ebuild b/x11-libs/qt/qt-4.1.4-r2.ebuild
index ed10ceaeea60..eeb4b0416472 100644
--- a/x11-libs/qt/qt-4.1.4-r2.ebuild
+++ b/x11-libs/qt/qt-4.1.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.1.4-r2.ebuild,v 1.8 2006/10/29 19:59:54 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.1.4-r2.ebuild,v 1.9 2006/10/30 18:18:37 caleb Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -83,7 +83,7 @@ qt_mkspecs_dir() {
 	CXX=$(tc-getCXX)
 	if [[ ${CXX/g++/} != ${CXX} ]]; then
 		spec="${spec}-g++"
-	elif [[ ${CXX/icc/} != ${CXX} ]]; then
+	elif [[ ${CXX/icpc/} != ${CXX} ]]; then
 		spec="${spec}-icc"
 	else
 		die "Unknown compiler ${CXX}."
diff --git a/x11-libs/qt/qt-4.2.1.ebuild b/x11-libs/qt/qt-4.2.1.ebuild
index 1bc87219cbc6..8f11dbe67a0d 100644
--- a/x11-libs/qt/qt-4.2.1.ebuild
+++ b/x11-libs/qt/qt-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.1.ebuild,v 1.2 2006/10/30 17:49:15 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.1.ebuild,v 1.3 2006/10/30 18:18:37 caleb Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -71,14 +71,33 @@ qt_use() {
 }
 
 qt_mkspecs_dir() {
-	# Allows us to define which mkspecs dir we want to use.  Currently we only use
-	# linux-g++ or linux-g++-64, but others could be used for various platforms.
-
-	if [[ $(get_libdir) == "lib" ]]; then
-		echo "linux-g++"
+	 # Allows us to define which mkspecs dir we want to use.
+	local spec
+
+	case ${CHOST} in
+		*-freebsd*|*-dragonfly*)
+			spec="freebsd" ;;
+		*-openbsd*)
+			spec="openbsd" ;;
+		*-netbsd*)
+			spec="netbsd" ;;
+		*-darwin*)
+			spec="darwin" ;;
+		*-linux-*|*-linux)
+			spec="linux" ;;
+		*)
+			die "Unknown CHOST, no platform choosed."
+	esac
+
+	CXX=$(tc-getCXX)
+	if [[ ${CXX/g++/} != ${CXX} ]]; then
+		spec="${spec}-g++"
+	elif [[ ${CXX/icpc/} != ${CXX} ]]; then
+		spec="${spec}-icc"
 	else
-		echo "linux-g++-64"
+		die "Unknown compiler ${CXX}."
 	fi
+
 }
 
 src_unpack() {