Fix Sandbox Violations on non prefixed arches

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-lang/icc/ChangeLog b/dev-lang/icc/ChangeLog
index 5901929a7b7caaf8be27b0c76e0379169da94304..48fef5f1efbb0448fbe23edcf9c4a6c3b554161d 100644 (file)
--- a/dev-lang/icc/ChangeLog
+++ b/dev-lang/icc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/icc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.77 2010/04/22 09:22:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.78 2010/04/23 06:17:28 jlec Exp $
+
+  23 Apr 2010; Justin Lecher <jlec@gentoo.org> icc-11.1.056-r1.ebuild:
+  Fix Sandbox Violations on non prefixed arches
 
 *icc-11.1.056-r1 (22 Apr 2010)
 

diff --git a/dev-lang/icc/Manifest b/dev-lang/icc/Manifest
index 172d8c2109a326dee5b15e1781f7c7be15036a1c..c0b6cb50d94089572014a46683918c6ec0019435 100644 (file)
--- a/dev-lang/icc/Manifest
+++ b/dev-lang/icc/Manifest
@@ -18,14 +18,14 @@ EBUILD icc-10.0.026.ebuild 3129 RMD160 b19ec2bf284991eca67a38d7e3aa811a663d7476
 EBUILD icc-10.1.017-r1.ebuild 3096 RMD160 45b7ad8bc5cb872ae880288696add1998ab6931a SHA1 6729ad0936124b28c05d7f32f2b664e7a0e0bf85 SHA256 4f5fd1f6d0947ec0bc3eee8ab675ab1fa80bc4041422fedf70f8c8c180c5f16c
 EBUILD icc-10.1.018.ebuild 3157 RMD160 89cd12e401300cf22761c4b6c4086749250455f3 SHA1 9030bfb7948c29e59923347a8251a335a5d3cbd8 SHA256 509d27f3231e56506b174fbb194aefdfa77d72fbc49ce77dfd7a1ebae0facbae
 EBUILD icc-11.1.046-r2.ebuild 4343 RMD160 bbab94992740250fecc6812e3e7b10410af48adf SHA1 e08252d980637364d4770afcd95ef5783d1e85b5 SHA256 ed5e96282de9c97d9a77e3e63fe016a966c225d9d1e1e60e0a50d362659ed2b5
-EBUILD icc-11.1.056-r1.ebuild 4463 RMD160 cab151f98f9a0d5de6a70d014d407937f98b4cc8 SHA1 b87e6ffde8f32fdadb9d772c145d26e455de238a SHA256 cb2475c4921e692802f93a30598d6306a2d3275ef95acf06a94ab5d1d43db00d
+EBUILD icc-11.1.056-r1.ebuild 4497 RMD160 2baea28a65e02d4f37a3b59fc435802422af3f5b SHA1 8401cb250f7c8f8f20ecc1a5a989bbf83f2b999a SHA256 d154e583dc0cc683d7f1875acffce36ac6ca52315cb3abee04b3a74d9e9842e3
 EBUILD icc-11.1.056.ebuild 4415 RMD160 d0a70c98483640b6af710b9ce7fae7388019c8d8 SHA1 bf1f8d81673480cf288c033a2c90067e6a03ae3a SHA256 5b16670077f9e7e69d8a4f5d643917875256e59bbde2c80dc41840f7d01ad4e2
-MISC ChangeLog 15823 RMD160 b5b785b7e2af7879616c096eb86d22c22cfd6268 SHA1 2195b8bc5f576734289d30e8e0116f918301bbad SHA256 0d67519e0d39f800a6f67af047bc0b4fffdbbc20733d53802bc817be902d9c79
+MISC ChangeLog 15943 RMD160 ed27f718c227de7d7dac0729b5ef1e94cda59e36 SHA1 51db1dbfa5880af2faf0967437b431d3117d7d02 SHA256 74ec24508a538631564c4a4ff5b92c6bc5d89c411564a36cc127ee4888f5525f
 MISC metadata.xml 1060 RMD160 578731577b92dc9de52fdcb2f8089c266df2d264 SHA1 ae50d96f73cc03149ab1751693e866661d3489b4 SHA256 1da0dab6ddde0006b767eea33de864a7d141e4b43f0dc8ea9c5e6b96d79d0f20
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvQFXYACgkQgAnW8HDreRbIOgCg0zAaHrfJ0AmcCYWRhV6KgYKq
-JuwAoLMAi3mZhltzeXaHEkAEv+bvfyXa
-=goiB
+iEYEARECAAYFAkvRO34ACgkQgAnW8HDreRbGbQCaAtZeEd6IVjTIo0gArh+Ndbwo
+eI0An0gprfckQpQvVBdNEQLYqDP2JMoW
+=NXRi
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/icc/icc-11.1.056-r1.ebuild b/dev-lang/icc/icc-11.1.056-r1.ebuild
index 6d5b77b2ad938aed83d8263c30ffcc8099d1c20a..231803498fdd89d4de84f6dd0b898c6fc3cb7020 100644 (file)
--- a/dev-lang/icc/icc-11.1.056-r1.ebuild
+++ b/dev-lang/icc/icc-11.1.056-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-11.1.056-r1.ebuild,v 1.1 2010/04/22 09:22:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-11.1.056-r1.ebuild,v 1.2 2010/04/23 06:17:28 jlec Exp $
 
 EAPI="3"
 
@@ -32,6 +32,7 @@ RDEPEND="~virtual/libstdc++-3.3
        eclipse? ( >=dev-util/eclipse-sdk-3.4 )"
 
 DESTINATION="${EPREFIX#/}/opt/intel/Compiler/${RELEASE}/${BUILD}"
+DESTINATION="${DESTINATION#/}"
 
 pkg_setup() {
        CHECKREQS_MEMORY=1024
@@ -72,11 +73,11 @@ link_eclipse_plugins() {
        dodir /usr/$(get_libdir)/eclipse-${ECLIPSE_V}/features
 
        for f in "${DESTINATION}/eclipse_support/cdt${CDT_V}/eclipse/plugins"/*; do
-               dosym "${ROOT}${f}" /usr/$(get_libdir)/eclipse-${ECLIPSE_V}/plugins
+               dosym "${EROOT}${f}" /usr/$(get_libdir)/eclipse-${ECLIPSE_V}/plugins
        done
 
        for f in "${DESTINATION}/eclipse_support/cdt${CDT_V}/eclipse/features"/*; do
-               dosym "${ROOT}${f}" /usr/$(get_libdir)/eclipse-${ECLIPSE_V}/features
+               dosym "${EROOT}${f}" /usr/$(get_libdir)/eclipse-${ECLIPSE_V}/features
        done
        eend $?
 }
@@ -88,7 +89,7 @@ src_prepare() {
        # extract the tag function from the original install
        sed -n \
                -e "s|find \$DESTINATION|find ${DESTINATION}|g" \
-               -e "s|@\$DESTINATION|@${ROOT}${DESTINATION}|g" \
+               -e "s|@\$DESTINATION|@${EROOT}${DESTINATION}|g" \
                -e '/^UNTAG_CFG_FILES[[:space:]]*(/,/^}/p' \
                pset/install_cc.sh > tag.sh || die
        # fix world writeable files