1 files changed, 15 insertions, 45 deletions

diff --git a/dev-lang/icc/icc-11.1.046-r3.ebuild b/dev-lang/icc/icc-11.1.046-r3.ebuild
index 5e2bae668..230df6643 100644
--- a/dev-lang/icc/icc-11.1.046-r3.ebuild
+++ b/dev-lang/icc/icc-11.1.046-r3.ebuild
@@ -28,10 +28,9 @@ RESTRICT="mirror strip binchecks"
 
 DEPEND=""
 RDEPEND="~virtual/libstdc++-3.3
-	amd64? ( app-emulation/emul-linux-x86-compat )
-	idb? ( >=virtual/jre-1.5 )"
+	amd64? ( app-emulation/emul-linux-x86-compat )"
 
-DESTINATION="${ROOT}opt/intel/Compiler/${RELEASE}/${BUILD}"
+DESTINATION="opt/intel/Compiler/${RELEASE}/${BUILD}"
 
 pkg_setup() {
 	CHECKREQS_MEMORY=1024
@@ -57,7 +56,6 @@ src_unpack() {
 		use idb && built_with_use dev-lang/ifc idb && rm -f rpm/*idb*.rpm
 		use mkl && built_with_use dev-lang/ifc mkl && rm -f rpm/*mkl*.rpm
 	fi
-	cd "${S}"
 	for x in rpm/intel*.rpm; do
 		einfo "Extracting $(basename ${x})..."
 		rpm_unpack ${x} || die "rpm_unpack ${x} failed"
@@ -70,13 +68,14 @@ src_prepare() {
 
 	# extract the tag function from the original install
 	sed -n \
-		-e "s|find \$DESTINATION|find ${S}${DESTINATION}|g" \
+		-e "s|find \$DESTINATION|find ${DESTINATION}|g" \
+		-e "s|@\$DESTINATION|@${ROOT}${DESTINATION}|g" \
 		-e '/^UNTAG_CFG_FILES[[:space:]]*(/,/^}/p' \
 		pset/install_cc.sh > tag.sh || die
 	# fix world writeable files
-	use mkl && chmod 644 \
-		"${S}${DESTINATION}"/mkl/tools/{environment,builder}/* \
-		"${S}${DESTINATION}"/mkl/tools/plugins/*/*
+	[ -d ${DESTINATION}/mkl ]  && chmod 644 \
+		${DESTINATION}/mkl/tools/{environment,builder}/* \
+		${DESTINATION}/mkl/tools/plugins/*/*
 }
 
 src_install() {
@@ -88,49 +87,20 @@ src_install() {
 	einfo "Copying files"
 	dodir "${DESTINATION}"
 	cp -pPR \
-		"${S}/${DESTINATION}"/* \
-		"${D}/${DESTINATION}"/ \
+		${DESTINATION}/* \
+		"${D}"/${DESTINATION}/ \
 		|| die "Copying ${PN} failed"
 
 	cat > 05icc <<-EOF
-		PATH=${DESTINATION}/bin/${IARCH}
-		LDPATH=${DESTINATION}/lib/${IARCH}
-		NLSPATH="${DESTINATION}/lib/locale/en_US/%N"
-		MANPATH=${DESTINATION}/man/en_US
+		PATH="${ROOT}${DESTINATION}/bin/${IARCH}
+		LDPATH=${ROOT}{DESTINATION}/lib/${IARCH}
+		NLSPATH="${ROOT}${DESTINATION}/lib/locale/en_US/%N"
+		MANPATH=${ROOT}${DESTINATION}/man/en_US
 	EOF
 	doenvd 05icc || die "doenvd 05icc failed"
-	if use idb; then
-		cat > 06idb <<-EOF
-			NLSPATH=${DESTINATION}/idb/${IARCH}/locale/%l_%t/%N
-		EOF
-		doenvd 06idb || die "doenvd 06idb failed"
+	[ -d ${DESTINATION}/idb ] && \
 		dosym ../../common/com.intel.debugger.help_1.0.0 \
-			${DESTINATION}/idb/gui/${IARCH}/plugins
-	fi
-	if use ipp; then
-		cat > 36ipp <<-EOF
-			IPPROOT=${DESTINATION}/ipp/${IARCH/intel64/em64t}
-			LDPATH=\${IPPROOT}/sharedlib
-			LIB=\${IPPROOT}/lib
-			LIBRARY_PATH=\${IPPROOT}/lib
-			CPATH=\${IPPROOT}/include
-			NLSPATH=\${IPPROOT}/lib/locale/%l_%t/%N
-		EOF
-		doenvd 36ipp || die "doenvd 36ipp failed"
-	fi
-	if use mkl; then
-		cat > 35mkl <<-EOF
-			MKLROOT=${DESTINATION}/mkl
-			LDPATH=\${MKLROOT}/lib/${IARCH}
-			LIB=\${MKLROOT}/lib
-			LIBRARY_PATH=\${MKLROOT}/lib/${IARCH}
-			MANPATH=\${MKLROOT}/man/en_US
-			CPATH=\${MKLROOT}/include
-			FPATH=\${MKLROOT}/include
-			NLSPATH=\${MKLROOT}/lib/${IARCH}/locale/%l_%t/%N
-		EOF
-		doenvd 35mkl || die "doenvd 35mkl failed"
-	fi
+		${DESTINATION}/idb/gui/${IARCH}/plugins
 }
 
 pkg_postinst() {