Adding missing LIBRARY/LDPATH for idb, QA check fixes #330211

Package-Manager: portage-2.2.0_alpha5/cvs/Linux x86_64

3 files changed, 170 insertions, 5 deletions

diff --git a/dev-lang/icc/ChangeLog b/dev-lang/icc/ChangeLog
index 19067ac0189a..5292d8916bff 100644
--- a/dev-lang/icc/ChangeLog
+++ b/dev-lang/icc/ChangeLog
@@ -1,6 +1,11 @@
 # 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.81 2010/07/28 13:05:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.82 2010/11/26 13:20:12 jlec Exp $
+
+*icc-11.1.072-r1 (26 Nov 2010)
+
+  26 Nov 2010; Justin Lecher <jlec@gentoo.org> +icc-11.1.072-r1.ebuild:
+  Adding missing LIBRARY/LDPATH for idb, QA check fixes #330211
 
   28 Jul 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   icc-11.1.046-r2.ebuild, icc-11.1.056.ebuild, icc-11.1.056-r1.ebuild,
diff --git a/dev-lang/icc/Manifest b/dev-lang/icc/Manifest
index 94c331ba6e4b..0c8cde8adb67 100644
--- a/dev-lang/icc/Manifest
+++ b/dev-lang/icc/Manifest
@@ -23,13 +23,14 @@ EBUILD icc-10.1.018.ebuild 3157 RMD160 89cd12e401300cf22761c4b6c4086749250455f3
 EBUILD icc-11.1.046-r2.ebuild 4342 RMD160 677316d85d8a56543dbcec670b700c64b04f425e SHA1 2ed84406319cdc92f6e2a19d3879473996c763d0 SHA256 55ff2909679e1a6e52115168419be3a7f22c6ccb8eb7b37e51ce82dbf0afd819
 EBUILD icc-11.1.056-r1.ebuild 4455 RMD160 0f51737322fe1fa13e4f4442fd69b85f35b8c8a5 SHA1 dca55a1cc089a38f0992fa7d6e9f64abe5682ad5 SHA256 74070975ce76512fe893be16009c61e9a589476651f4d7d28945f14fd6e29087
 EBUILD icc-11.1.056.ebuild 4412 RMD160 387681e898c89a8afba5638c7658a0cc4599e76f SHA1 c2c45ffb9fe600e7a9b489ff032626bcb5274f02 SHA256 14496f66a0458576272a869f100727d2368341417171b1a55d10788775dc808f
+EBUILD icc-11.1.072-r1.ebuild 4915 RMD160 ba718e6e1d748e094931edda56e311feaecc7500 SHA1 eda1fe7b99fc155c2a91c363cec6c97dfd81614c SHA256 a615243cd8fd96e62971d69d49cdca783d41e481e677671dec1cc90d8dc58d92
 EBUILD icc-11.1.072.ebuild 4452 RMD160 fd36f54b06bd978e231cbe7125146b410cabb1e1 SHA1 7710266a0e75bd0c9c6d75fb31ec4cfff71e3e44 SHA256 5221e40446a2e8e0d1e9b90c54c7ca7614e577a6add4a795682bdae3d6f2abed
-MISC ChangeLog 16451 RMD160 23b24808bb1b4ee0fbe45deb66ea9fa77a1ae999 SHA1 d5c3dc50269c2aaf2e8313711aac3d4c1201cd4f SHA256 797f6c314002e6a58c6f254881fe73129dc325b0a35ba70fd95ced93ef7974a3
+MISC ChangeLog 16615 RMD160 37b32ca7c6f644bc0df90f3d099c90af4b52aeea SHA1 b40b4a0fc6feb7dd9ddceefb51e6abcbe0948120 SHA256 6187d85882ba933a178c77fa86c67e75a4c8121c98b33ad55114f3a667d8e4b8
 MISC metadata.xml 1060 RMD160 578731577b92dc9de52fdcb2f8089c266df2d264 SHA1 ae50d96f73cc03149ab1751693e866661d3489b4 SHA256 1da0dab6ddde0006b767eea33de864a7d141e4b43f0dc8ea9c5e6b96d79d0f20
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxQKzIACgkQAiZjviIA2Xh5oACeN639Vf7dzFc1etwzMr3MSbNz
-SFAAoKcZk3t51RqyZ/+7NDEGsUIXCMzc
-=VAux
+iEYEARECAAYFAkzvtBIACgkQgAnW8HDreRbpEQCeNi+++5aDROJNKO00mpr53auq
+XasAn1cnE12FLo4nV1bH0vwagde1Lhb4
+=U6yI
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/icc/icc-11.1.072-r1.ebuild b/dev-lang/icc/icc-11.1.072-r1.ebuild
new file mode 100644
index 000000000000..c81fddf2c5ae
--- /dev/null
+++ b/dev-lang/icc/icc-11.1.072-r1.ebuild
@@ -0,0 +1,159 @@
+# 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.072-r1.ebuild,v 1.1 2010/11/26 13:20:12 jlec Exp $
+
+EAPI="3"
+
+inherit rpm versionator check-reqs
+
+PB=cproc
+PACKAGEID="l_${PB}_p_${PV}"
+RELEASE="$(get_version_component_range 1-2)"
+BUILD="$(get_version_component_range 3)"
+PID=1768
+
+DESCRIPTION="Intel compiler suite for Linux"
+HOMEPAGE="http://www.intel.com/software/products/compilers/clin/"
+SRC_COM="http://registrationcenter-download.intel.com/irc_nas/${PID}/${PACKAGEID}"
+SRC_URI="amd64? ( ${SRC_COM}_intel64.tgz )
+	ia64? ( ${SRC_COM}_ia64.tgz )
+	x86?  ( ${SRC_COM}_ia32.tgz )"
+
+LICENSE="Intel-SDP"
+SLOT="0"
+IUSE="eclipse +idb ipp mkl"
+KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-linux ~x86-linux"
+
+RESTRICT="mirror"
+
+DEPEND=""
+RDEPEND="~virtual/libstdc++-3.3
+	amd64? ( app-emulation/emul-linux-x86-compat )
+	eclipse? ( >=dev-util/eclipse-sdk-3.4 )"
+
+DESTINATION="opt/intel/Compiler/${RELEASE}/${BUILD}"
+EDESTINATION="${EROOT#/}${DESTINATION}"
+
+QA_TEXTRELS="${EDESTINATION}/*"
+QA_EXECSTACK="${EDESTINATION}/*"
+QA_PRESTRIPPED="${EDESTINATION}/lib/*/.*libFNP.so ${EDESTINATION}/bin/*/.* ${EDESTINATION}/idb/*/*/.*"
+QA_DT_HASH="
+	${EDESTINATION}/bin/*/.*
+	${EDESTINATION}/lib/*/.*
+	${EDESTINATION}/mkl/lib/*/.*
+	${EDESTINATION}/mkl/benchmarks/mp_linpack/bin_intel/*/.*
+	${EDESTINATION}/idb/*/*/.*"
+
+pkg_setup() {
+	CHECKREQS_MEMORY=1024
+	CHECKREQS_DISK_BUILD=2048
+	use idb && use ipp && use mkl && CHECKREQS_DISK_BUILD=3072
+	check_reqs
+	IARCH=ia32
+	use amd64 && IARCH=intel64
+	use ia64 && IARCH=ia64
+}
+
+src_unpack() {
+	unpack ${A}
+	mv "${WORKDIR}"/l_* "${S}"
+	cd "${S}"
+	# tbb is open source, thus built from sources in dev-cpp/tbb
+	rm -f rpm/*tbb*.rpm
+	use idb || rm -f rpm/*idb*.rpm
+	use ipp || rm -f rpm/*ipp*.rpm
+	use mkl || rm -f rpm/*mkl*.rpm
+	use eclipse || rm -f rpm/*cdt*.rpm
+	if has_version "~dev-lang/ifc-${PV}"; then
+		rm -f rpm/*cprolib*.rpm
+		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
+	for x in rpm/intel*.rpm; do
+		einfo "Extracting $(basename ${x})..."
+		rpm_unpack ./${x} || die "rpm_unpack ${x} failed"
+	done
+}
+
+link_eclipse_plugins() {
+	ECLIPSE_V="$1"
+	CDT_V="$2"
+	einfo "Linking eclipse (v${ECLIPSE_V}) plugin cdt (v${CDT_V})"
+	dodir /usr/$(get_libdir)/eclipse-${ECLIPSE_V}/plugins
+	dodir /usr/$(get_libdir)/eclipse-${ECLIPSE_V}/features
+
+	for f in "${DESTINATION}/eclipse_support/cdt${CDT_V}/eclipse/plugins"/*; do
+		dosym "${EROOT}${f}" /usr/$(get_libdir)/eclipse-${ECLIPSE_V}/plugins
+	done
+
+	for f in "${DESTINATION}/eclipse_support/cdt${CDT_V}/eclipse/features"/*; do
+		dosym "${EROOT}${f}" /usr/$(get_libdir)/eclipse-${ECLIPSE_V}/features
+	done
+	eend $?
+}
+
+src_prepare() {
+	# from the PURGE_UB804_FNP in pset/install_cc.sh
+	# rm -f "${DESTINATION}"/lib/*/*libFNP.so || die
+
+	# extract the tag function from the original install
+	sed -n \
+		-e "s|find \$DESTINATION|find ${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
+	[[ -d ${DESTINATION}/mkl ]] && chmod 644 \
+		${DESTINATION}/mkl/tools/{environment,builder}/* \
+		${DESTINATION}/mkl/tools/plugins/*/*
+	# remove for collision (bug #288038)
+	has_version "~dev-lang/ifc-${PV}" && \
+		rm -f ${DESTINATION}/lib/*/locale/*/flexnet.cat
+}
+
+src_install() {
+	einfo "Tagging"
+	. ./tag.sh
+	UNTAG_CFG_FILES
+
+	keepdir /opt/intel/licenses
+	einfo "Copying files"
+	dodir "/${DESTINATION}"
+	cp -pPR \
+		${DESTINATION}/* \
+		"${ED}"/${DESTINATION}/ \
+		|| die "Copying ${PN} failed"
+
+	local envf=05icfc
+	cat > ${envf} <<-EOF
+		PATH="${EROOT}${DESTINATION}/bin/${IARCH}"
+		ROOTPATH="${EROOT}${DESTINATION}/bin/${IARCH}"
+		LDPATH="${EROOT}${DESTINATION}/lib/${IARCH}:${EROOT}${DESTINATION}/idb/lib/${IARCH}"
+		LIBRARY_PATH="${EROOT}${DESTINATION}/lib/${IARCH}:${EROOT}${DESTINATION}/idb/lib/${IARCH}"
+		NLSPATH="${EROOT}${DESTINATION}/lib/locale/en_US/%N"
+		MANPATH="${EROOT}${DESTINATION}/man/en_US"
+	EOF
+	if [[ ! -e "${EROOT}"etc/env.d/${envf} ]] ||
+		[[ -n $(diff "${EROOT}"etc/env.d/${envf} ./${envf}) ]]; then
+		doenvd ${envf} || die "doenvd ${envf} failed"
+	fi
+	[[ -d ${DESTINATION}/idb ]] && \
+		dosym ../../common/com.intel.debugger.help_1.0.0 \
+		${DESTINATION}/idb/gui/${IARCH}/plugins
+
+	if use eclipse; then
+		if has_version 'dev-util/eclipse-sdk:3.4'; then
+			link_eclipse_plugins "3.4" "5.0" || die
+		fi
+		if has_version 'dev-util/eclipse-sdk:3.5'; then
+			link_eclipse_plugins "3.5" "6.0" || die
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog "Make sure you have recieved the an Intel license."
+	elog "To receive a non-commercial license, you need to register at:"
+	elog "http://software.intel.com/en-us/articles/non-commercial-software-development/"
+	elog "Install the license file into ${EROOT}opt/intel/licenses."
+}