Fixed icpc INSTALL_DIR (bug #194513) and added emul-linux-x86-compat as run dependency.

Package-Manager: portage-2.1.3.9

3 files changed, 20 insertions, 15 deletions

diff --git a/dev-lang/icc/ChangeLog b/dev-lang/icc/ChangeLog
index 9fc7d5d3500b..da5938d360ae 100644
--- a/dev-lang/icc/ChangeLog
+++ b/dev-lang/icc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/icc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.43 2007/10/02 11:36:23 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.44 2007/10/02 17:05:26 bicatali Exp $
+
+  02 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org> icc-10.0.026.ebuild:
+  Fixed icpc INSTALL_DIR (bug #194513) and added emul-linux-x86-compat as run
+  dependency.
 
 *icc-10.0.026 (02 Oct 2007)
 
diff --git a/dev-lang/icc/Manifest b/dev-lang/icc/Manifest
index dc3aa8ad7ee4..12ee0fc9875d 100644
--- a/dev-lang/icc/Manifest
+++ b/dev-lang/icc/Manifest
@@ -101,18 +101,18 @@ DIST l_cc_c_10.0.026_ia32.tar.gz 56556358 RMD160 47e1ba1897edaccfb1200d8224bfccb
 DIST l_cc_c_10.0.026_ia64.tar.gz 64662221 RMD160 51601383678f759979a2c9d456102e28a9d017bf SHA1 2f71ffe6fcb9d8a2bb8fe46bf82dc29382e5cdc5 SHA256 1d55e6040fef6c3e42725049c19ab80c506efff99b7810e04cc55731d0e31b19
 DIST l_cc_c_10.0.026_intel64.tar.gz 36405579 RMD160 bcf8bec436ad4c9e91b35201e709491b197f6145 SHA1 9a39aee94d2cd67476a4aad198657c1333854676 SHA256 00ca4de9510e04c7d3f27590e21339d663d17b12b39ebc5153d9bd58e750128e
 DIST l_cc_c_9.1.045.tar.gz 293256705 RMD160 6a033db511062c970444b55c693f1833ddeb9d69 SHA1 27984541e9b70061b7cb2c6fcc040ca4fdf345cd SHA256 00cc7eb1083ee4b5066ad9348c1a44d7dafe6ec6f118109b846358448c22d392
-EBUILD icc-10.0.026.ebuild 2800 RMD160 398d272bdfcde908ff8780b127417df36ab8c131 SHA1 b09c4a84653f874b31986fa5eab12c2c40008ed4 SHA256 8dafbf1486e52bb17abd4043b8f84b29c2b045c909b6363607e9a990aed9026c
-MD5 12bf129943b38a1193655a74124a02c2 icc-10.0.026.ebuild 2800
-RMD160 398d272bdfcde908ff8780b127417df36ab8c131 icc-10.0.026.ebuild 2800
-SHA256 8dafbf1486e52bb17abd4043b8f84b29c2b045c909b6363607e9a990aed9026c icc-10.0.026.ebuild 2800
+EBUILD icc-10.0.026.ebuild 2856 RMD160 25555f6bc4aa635e95cd580a6cc3b0bfa973d3da SHA1 0fe6796bbb25eff7f152b92d4f8f7bdcb8b1b8a2 SHA256 d5f5146068400ac111e2dfc8cb098a2c2274bfba50755cd7fd651c1414e4cf7b
+MD5 dfd9fad905b55cae0757fdeadcac196c icc-10.0.026.ebuild 2856
+RMD160 25555f6bc4aa635e95cd580a6cc3b0bfa973d3da icc-10.0.026.ebuild 2856
+SHA256 d5f5146068400ac111e2dfc8cb098a2c2274bfba50755cd7fd651c1414e4cf7b icc-10.0.026.ebuild 2856
 EBUILD icc-9.1.045.ebuild 4080 RMD160 0d7c9c82735226a5639e03f685c06a7886a1270f SHA1 9244dd15042d3205ebb7a2dd3cc69dda7132b6e7 SHA256 2e0e8a83b41c47ec6453c08f3f013f041cb9c448392a265b22adcd3cb5292b5e
 MD5 67cf9e75f6c04190882ba80a38ddcaa0 icc-9.1.045.ebuild 4080
 RMD160 0d7c9c82735226a5639e03f685c06a7886a1270f icc-9.1.045.ebuild 4080
 SHA256 2e0e8a83b41c47ec6453c08f3f013f041cb9c448392a265b22adcd3cb5292b5e icc-9.1.045.ebuild 4080
-MISC ChangeLog 10053 RMD160 a54c7c2f2790d909ce3f67423160e268b16d2425 SHA1 05b19a9f3ef782a47795ac36a97cd2cd498c634b SHA256 d53f8715918faf2d53e27f91d929b489754da0a14da86a993f894448c5c2bd2f
-MD5 05a522c0dea4754b776934359e85ac19 ChangeLog 10053
-RMD160 a54c7c2f2790d909ce3f67423160e268b16d2425 ChangeLog 10053
-SHA256 d53f8715918faf2d53e27f91d929b489754da0a14da86a993f894448c5c2bd2f ChangeLog 10053
+MISC ChangeLog 10222 RMD160 448dd800624ccaf966374dff35cd4294e11cc46d SHA1 8726f206299f3c12c74a56c503ac8feba58e7eaf SHA256 53b5ec00d65bcb963c9db34e8b2d7b8bf320d3f3c89f304d9194d10116c7c878
+MD5 622932011bbe92ea1d7d18a6f3f17374 ChangeLog 10222
+RMD160 448dd800624ccaf966374dff35cd4294e11cc46d ChangeLog 10222
+SHA256 53b5ec00d65bcb963c9db34e8b2d7b8bf320d3f3c89f304d9194d10116c7c878 ChangeLog 10222
 MISC metadata.xml 821 RMD160 5f15983f283531c0630a78ea45337c04c5cb14fd SHA1 df1bdb5905eab2608420b24cc1bab72c63817832 SHA256 6984b425d058e90030fb82661d9eb2784d7f68e7a3285cfd3117ded7d61f6682
 MD5 afd0c88e14779bc617364218a034ab8a metadata.xml 821
 RMD160 5f15983f283531c0630a78ea45337c04c5cb14fd metadata.xml 821
@@ -126,7 +126,7 @@ SHA256 38de37fa5088645921bc4c53bb48b007de51ae48fb127942692572c812d3c2b7 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHAi1D1ycZbhPLE2ARAmYjAKClUmf/ms5o7GEC2x48dm+GvG8NDACgniQd
-PmEVprrCOsbnXJuFx2Wweec=
-=u8Fh
+iD8DBQFHAnph1ycZbhPLE2ARAhj8AJ9rCGOLnyEhnBUUpFNQ2tbrzgl45gCdEzB2
+TaNhUgOKfkJtTfRPS0lysps=
+=eO4E
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/icc/icc-10.0.026.ebuild b/dev-lang/icc/icc-10.0.026.ebuild
index 32e7ef32b7a3..e1e53589460a 100644
--- a/dev-lang/icc/icc-10.0.026.ebuild
+++ b/dev-lang/icc/icc-10.0.026.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-10.0.026.ebuild,v 1.1 2007/10/02 11:36:23 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-10.0.026.ebuild,v 1.2 2007/10/02 17:05:26 bicatali Exp $
 
 inherit rpm
 
 PID=786
 PB=cc
-PEXEC=icc
+PEXEC="icc icpc"
 DESCRIPTION="Intel C/C++ optimized compiler for Linux"
 HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
 
@@ -26,6 +26,7 @@ SLOT="0"
 RESTRICT="test strip mirror"
 IUSE=""
 DEPEND=""
+RDEPEND="amd64? ( app-emulation/emul-linux-x86-compat )"
 
 src_unpack() {
 	unpack ${A}
@@ -47,7 +48,7 @@ src_unpack() {
 	einfo "Fixing paths and tagging"
 	cd "${S}"/${INSTALL_DIR}/bin
 	sed -e "s|<INSTALLDIR>|${INSTALL_DIR}|g" \
-		-i ${PEXEC} ${PEXEC}*sh \
+		-i ${PEXEC} *sh \
 		|| die "sed fixing path failed"
 
 	cd "${S}"/${INSTALL_DIR}/doc