Don't use EROOT with helper functions

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

diff --git a/dev-lang/icc/icc-11.1.056-r1.ebuild b/dev-lang/icc/icc-11.1.056-r1.ebuild
index 5bfe0bc88e72d587550e2e7453a14edeb0789ff8..cf903c82bfa72c04ec766bc05bde2bfa156670cd 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.4 2010/04/23 06:35:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/icc-11.1.056-r1.ebuild,v 1.5 2010/04/23 07:45:59 jlec Exp $
 
 EAPI="3"
 
@@ -107,7 +107,7 @@ src_install() {
 
        keepdir /opt/intel/licenses
        einfo "Copying files"
-       dodir "${EROOT}${DESTINATION}"
+       dodir "/${DESTINATION}"
        cp -pPR \
                ${DESTINATION}/* \
                "${ED}"/${DESTINATION}/ \

diff --git a/dev-lang/ifc/ifc-11.1.056-r1.ebuild b/dev-lang/ifc/ifc-11.1.056-r1.ebuild
index e767a33cfefe1c2a74354d75425d6aa8236c457e..ed7693b5212b242419e28a591a993cdf80b17cf0 100644 (file)
--- a/dev-lang/ifc/ifc-11.1.056-r1.ebuild
+++ b/dev-lang/ifc/ifc-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/ifc/ifc-11.1.056-r1.ebuild,v 1.1 2010/04/22 09:17:35 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ifc/ifc-11.1.056-r1.ebuild,v 1.2 2010/04/23 07:46:36 jlec Exp $
 
 EAPI="3"
 
@@ -30,7 +30,7 @@ DEPEND=""
 RDEPEND="~virtual/libstdc++-3.3
        amd64? ( app-emulation/emul-linux-x86-compat )"
 
-DESTINATION="${EPRFIX#/}/opt/intel/Compiler/${RELEASE}/${BUILD}"
+DESTINATION="opt/intel/Compiler/${RELEASE}/${BUILD}"
 
 QA_TEXTRELS="${DESTINATION}/*"
 QA_EXECSTACK="${DESTINATION}/*"
@@ -70,7 +70,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_fc.sh > tag.sh || die
        # fix world writeable files
@@ -89,7 +89,7 @@ src_install() {
 
        keepdir /opt/intel/licenses
        einfo "Copying files"
-       dodir "${DESTINATION}"
+       dodir "/${DESTINATION}"
        cp -pPR \
                ${DESTINATION}/* \
                "${ED}"/${DESTINATION}/ \