[gentoo-commits] proj/sci:master commit in: dev-libs/intel-common/

[Justin Lecher]

commit:     b307a81c9621e160eaeb4dc744b6e10f890c3bd2
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 15 11:54:27 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Nov 27 19:21:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b307a81c

dev-libs/intel-common: Version Bump; drop creation of license dir

Package-Manager: portage-2.2.0_alpha142

---
 dev-libs/intel-common/ChangeLog                    |    7 +++++++
 ...79-r1.ebuild => intel-common-13.0.1.117.ebuild} |    7 +++----
 dev-libs/intel-common/metadata.xml                 |   10 +++++-----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/dev-libs/intel-common/ChangeLog b/dev-libs/intel-common/ChangeLog
index 22f2399..e22ac9d 100644
--- a/dev-libs/intel-common/ChangeLog
+++ b/dev-libs/intel-common/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/intel-common/ChangeLog,v 1.4 2012/11/14 18:34:25 bicatali Exp $
 
+*intel-common-13.0.1.117 (15 Nov 2012)
+
+  15 Nov 2012; Justin Lecher <jlec@g.o>
+  -intel-common-13.0.0.079-r1.ebuild, +intel-common-13.0.1.117.ebuild,
+  metadata.xml:
+  Version Bump; drop creation of license dir
+
   14 Nov 2012; Sébastien Fabbro <bicatali@g.o> metadata.xml:
   Removing myself from maintainer
 

diff --git a/dev-libs/intel-common/intel-common-13.0.0.079-r1.ebuild b/dev-libs/intel-common/intel-common-13.0.1.117.ebuild
similarity index 92%
rename from dev-libs/intel-common/intel-common-13.0.0.079-r1.ebuild
rename to dev-libs/intel-common/intel-common-13.0.1.117.ebuild
index 4692811..1d363a4 100644
--- a/dev-libs/intel-common/intel-common-13.0.0.079-r1.ebuild
+++ b/dev-libs/intel-common/intel-common-13.0.1.117.ebuild
@@ -5,8 +5,8 @@
 EAPI=4
 
 INTEL_DPN=parallel_studio_xe
-INTEL_DID=2749
-INTEL_DPV=2013
+INTEL_DID=2872
+INTEL_DPV=2013_update1
 INTEL_SUBDIR=composerxe
 
 inherit intel-sdp
@@ -35,7 +35,7 @@ src_install() {
 	cat > ${fenv} <<-EOF
 		NLSPATH=${INTEL_SDP_EDIR}/lib/locale/en_US/%N
 		MANPATH=${INTEL_SDP_EDIR}/man/en_US
-		INTEL_LICENSE_FILE=${INTEL_SDP_EDIR}/licenses
+		INTEL_LICENSE_FILE="${INTEL_SDP_EDIR}"/licenses:"${EPREFIX}/opt/intel/license"
 	EOF
 	for arch in ${INTEL_ARCH}; do
 			path=${path}:${INTEL_SDP_EDIR}/bin/${arch}:${INTEL_SDP_EDIR}/mpirt/bin/${arch}
@@ -49,7 +49,6 @@ src_install() {
 	EOF
 
 	doenvd ${fenv}
-	dodir ${INTEL_SDP_DIR}/licenses
 
 	cat >> "${T}"/40-${PN} <<- EOF
 	SEARCH_DIRS_MASK="${INTEL_SDP_EDIR}"

diff --git a/dev-libs/intel-common/metadata.xml b/dev-libs/intel-common/metadata.xml
index 5a311a4..3d33728 100644
--- a/dev-libs/intel-common/metadata.xml
+++ b/dev-libs/intel-common/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+	<herd>sci</herd>
+	<longdescription lang="en">
   This package contains the core files to be installed for the Intel
   compilers and libraries. Probably useless if installed standalone.
 </longdescription>
-<use>
-  <flag name="compiler">Install the libraries needed for the icc and ifort compilers</flag>
-</use>
+	<use>
+		<flag name="compiler">Install the libraries needed for the icc and ifort compilers</flag>
+	</use>
 </pkgmetadata>