Bumped to EAPI=3, keyworded ~amd64-linux ~x86-linux

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

diff --git a/dev-lang/icc/ChangeLog b/dev-lang/icc/ChangeLog
index f8acc7321815bb6216c8ae632ad6e35b3dcb70ef..5901929a7b7caaf8be27b0c76e0379169da94304 100644 (file)
--- a/dev-lang/icc/ChangeLog
+++ b/dev-lang/icc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/icc
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/icc/ChangeLog,v 1.76 2009/10/08 03:48:20 bicatali Exp $
+# 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 $
+
+*icc-11.1.056-r1 (22 Apr 2010)
+
+  22 Apr 2010; Justin Lecher <jlec@gentoo.org> +icc-11.1.056-r1.ebuild:
+  Bumped to EAPI=3, keyworded ~amd64-linux ~x86-linux
 
   08 Oct 2009; Sébastien Fabbro <bicatali@gentoo.org> icc-11.1.056.ebuild:
   Changed to bash brackets

diff --git a/dev-lang/icc/Manifest b/dev-lang/icc/Manifest
index 77649f242d6b657fdf10070ac71332e87b2107cb..172d8c2109a326dee5b15e1781f7c7be15036a1c 100644 (file)
--- a/dev-lang/icc/Manifest
+++ b/dev-lang/icc/Manifest
@@ -18,13 +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.ebuild 4415 RMD160 d0a70c98483640b6af710b9ce7fae7388019c8d8 SHA1 bf1f8d81673480cf288c033a2c90067e6a03ae3a SHA256 5b16670077f9e7e69d8a4f5d643917875256e59bbde2c80dc41840f7d01ad4e2
-MISC ChangeLog 15668 RMD160 6d27f8cd5b660b4d2ced9ff7542f51da97f0b563 SHA1 f46beaeb205a0c8e1ed014c21e2d337dede6026a SHA256 f7a05a9131a10a0036fdbe90e4c49c475dfbce3b1e02641c837c30fa356a29ce
+MISC ChangeLog 15823 RMD160 b5b785b7e2af7879616c096eb86d22c22cfd6268 SHA1 2195b8bc5f576734289d30e8e0116f918301bbad SHA256 0d67519e0d39f800a6f67af047bc0b4fffdbbc20733d53802bc817be902d9c79
 MISC metadata.xml 1060 RMD160 578731577b92dc9de52fdcb2f8089c266df2d264 SHA1 ae50d96f73cc03149ab1751693e866661d3489b4 SHA256 1da0dab6ddde0006b767eea33de864a7d141e4b43f0dc8ea9c5e6b96d79d0f20
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkrNYQ4ACgkQ1ycZbhPLE2B5RACggmbpmJkTE49ZWVfxtdQgB65L
-2LwAn3AgNdbJ1x5rCdc7O7dbiPBKej6M
-=iRiL
+iEYEARECAAYFAkvQFXYACgkQgAnW8HDreRbIOgCg0zAaHrfJ0AmcCYWRhV6KgYKq
+JuwAoLMAi3mZhltzeXaHEkAEv+bvfyXa
+=goiB
 -----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
new file mode 100644 (file)
index 0000000..6d5b77b
--- /dev/null
+++ b/dev-lang/icc/icc-11.1.056-r1.ebuild
@@ -0,0 +1,148 @@
+# 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 $
+
+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=1583
+
+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 ~x86 ~amd64-linux ~x86-linux"
+
+RESTRICT="mirror strip binchecks"
+
+DEPEND=""
+RDEPEND="~virtual/libstdc++-3.3
+       amd64? ( app-emulation/emul-linux-x86-compat )
+       eclipse? ( >=dev-util/eclipse-sdk-3.4 )"
+
+DESTINATION="${EPREFIX#/}/opt/intel/Compiler/${RELEASE}/${BUILD}"
+
+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 "${ROOT}${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
+       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|@${ROOT}${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}"
+               LIBRARY_PATH="${EROOT}${DESTINATION}/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."
+}