Version bump

Package-Manager: portage-2.1.5.2

3 files changed, 48 insertions, 38 deletions

diff --git a/sci-libs/ipp/ChangeLog b/sci-libs/ipp/ChangeLog
index 125ffd7e3258..a442b416498a 100644
--- a/sci-libs/ipp/ChangeLog
+++ b/sci-libs/ipp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/ipp
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ipp/ChangeLog,v 1.2 2008/03/13 21:20:58 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ipp/ChangeLog,v 1.3 2008/05/29 08:10:57 bicatali Exp $
+
+  28 May 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +ipp-5.3.3.075.ebuild:
+  Version bump
 
 *ipp-5.3.2.068 (13 Mar 2008)
 
diff --git a/sci-libs/ipp/Manifest b/sci-libs/ipp/Manifest
index 2f52be263d0c..a9c6220e5ca1 100644
--- a/sci-libs/ipp/Manifest
+++ b/sci-libs/ipp/Manifest
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST l_ipp_em64t_p_5.3.1.062.tgz 283581997 RMD160 4679b0945d895e049470dc6c72e370037ff1b0cf SHA1 374cf301cfbfb935cd3451d24cbf2d32a1c570fe SHA256 a262ea4ee4ed035fed98ebc24eed33fa863d571287ca0dafe867477d7483a747
 DIST l_ipp_em64t_p_5.3.2.068.tgz 283743322 RMD160 91fb89fc4b3005ef51c026bed6212e719f6de49f SHA1 0cd8b5e15636b0d17e9a8e122458d06cf4f22c71 SHA256 5554d8a4dce4c6dc92098fd047f47dc114e5be1f6a2ef2bc301c41687f263ffc
-DIST l_ipp_ia32_p_5.3.1.062.tgz 338214466 RMD160 2410830b22aee0d99ed377d9afda10034b87c57a SHA1 ab923f3807ac2aa21776868968ecf52a57497137 SHA256 fff09cf5f2c8f05fcdc72c60a73032435cd47dbf51d7a2c0d493642b8ab1d423
+DIST l_ipp_em64t_p_5.3.3.075.tgz 283651900 RMD160 36053229147f786d41cad6451d338bd5ee0643bf SHA1 09728d89fc818f6b7af059757d3038ed1ef4d539 SHA256 d68057cbb2f773e5a435d25a9b67f7dcee208d2b6a5b1f13eb51d397713120bc
 DIST l_ipp_ia32_p_5.3.2.068.tgz 338295570 RMD160 626dd57a360c1506d97bf499084258023ca94b42 SHA1 b3f6354fad78a13282c5c0d59480566bffa32311 SHA256 4f5ecd776d5356fa38205d3016fdc2f0e6f1337500cee60b47cc23c1ce61e1f1
-DIST l_ipp_itanium_p_5.3.1.062.tgz 230318851 RMD160 3a9492369cdea867d0cd10a38653385d17698757 SHA1 44223efdc883301bd49f17d74aaf0fb6dc5d5986 SHA256 9b443488dc983e5568f516555ffda3d032f002ff9b2c051a554cc6bff9ba5e53
+DIST l_ipp_ia32_p_5.3.3.075.tgz 338189355 RMD160 f78c61bfc92a0a7726d57dc77fbbaa886d584f8c SHA1 af8e26a942375a5c70cf073b2140db94c5da0927 SHA256 51f500b5571d78d80ad131f71e57c3bb768e0d5182d5840c5718608b7a60b0fa
 DIST l_ipp_itanium_p_5.3.2.068.tgz 230356498 RMD160 10f9c2553e7b403097859573cb0f1c104163bce8 SHA1 82a56fc7ff959f4fce06208a65b895f3b137d103 SHA256 61236ab25e0b1a6caf1675d278d10418cb9ea814af346b88797170d93044a15f
-EBUILD ipp-5.3.1.062.ebuild 3746 RMD160 3083e383198fc4aca0959c615cf588920f060292 SHA1 3940589b30e7686fdb449575c426d5b4e81c8135 SHA256 14a99eea4338bd4c13aac229f8470c30797fe6b562f18865fdeb6c02b705dbfd
+DIST l_ipp_itanium_p_5.3.3.075.tgz 230223226 RMD160 879e0abd28ce99f0de9f8e8af9e478cb4a6c560c SHA1 cb06e3a060cb0de5c3e65b65c2548bc818305d37 SHA256 85a4d9c63e5f88c42154e9101406b4838e0a920d73a8660b8022c593019e4996
 EBUILD ipp-5.3.2.068.ebuild 3700 RMD160 3e1d339ac9a1c6abc3bce50ce1a4d4ff497bd6e2 SHA1 faee3aef82b1148783a351dd9885e77b2b24cdb2 SHA256 5aefb23465ec20b378540396f368dc8867f75c59ecf7bd451f5ec51605632427
-MISC ChangeLog 526 RMD160 6a1bbb65045e0d2aef5e55d55a83c6b6c4a9e4a6 SHA1 5d0f723469a87e4857d8f7fd03c976dca4fce51b SHA256 088278d34a4d9c9d829bc0f329a79f12ada2be92d5f3915f72de3a5920e1ba15
+EBUILD ipp-5.3.3.075.ebuild 3472 RMD160 275927e91cb060fcab5ad77608da67e6e8476cc9 SHA1 001165148c10047dd7053a780900d802e82db2b9 SHA256 972e6961f6e16cec47db9289220709d60430f9b35a7daf89ce4869c48e553fa8
+MISC ChangeLog 622 RMD160 a2d3918351d565b569db61c7998efb06101d6be1 SHA1 1f8189d06e1519ff498f06cee21feff46d6d1eac SHA256 c4398b190b5d60577045cb2b869b9b25bc5890e14274833ebd925527b513bf63
 MISC metadata.xml 389 RMD160 3f726abf16a69255e6208c41604b41f9acde1434 SHA1 f827b185d58d751c682466996366b680c40c653a SHA256 110a71e5b60235c978d09d262b487ce359784964c37d1faa9cab616276ece3c5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH2Zrh1ycZbhPLE2ARAn2hAJ9yq9Sgk1LkPjf1Q35HWJHXoekc+wCcDUyZ
-RSj8vYsIWwUg2a4Oq6tGdkk=
-=nl9b
+iEYEARECAAYFAkg+ZTwACgkQ1ycZbhPLE2AEegCfRcQLIkAqhXWpqHOP1lgvJYoR
+jtUAn3czKFgZPvPVnCA5Gc5Ec+QPUgLJ
+=w2z8
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/ipp/ipp-5.3.1.062.ebuild b/sci-libs/ipp/ipp-5.3.3.075.ebuild
index b711c747d042..aac001a3cf45 100644
--- a/sci-libs/ipp/ipp-5.3.1.062.ebuild
+++ b/sci-libs/ipp/ipp-5.3.3.075.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ipp/ipp-5.3.1.062.ebuild,v 1.1 2007/12/28 11:24:56 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ipp/ipp-5.3.3.075.ebuild,v 1.1 2008/05/29 08:10:57 bicatali Exp $
 
-inherit versionator multilib
+inherit versionator multilib check-reqs
 
-PID=921
+PID=1097
 PB=${PN}
 DESCRIPTION="Intel(R) Integrated Performance Primitive library for multimedia and data processing"
 HOMEPAGE="http://developer.intel.com/software/products/ipp/"
 
 KEYWORDS="~amd64 ~x86 ~ia64"
-SRC_URI="amd64? ( http://registrationcenter-download.intel.com/irc_nas/${PID}/l_${PB}_em64t_p_${PV}.tgz )
-	x86? ( http://registrationcenter-download.intel.com/irc_nas/${PID}/l_${PB}_ia32_p_${PV}.tgz )
-	ia64? ( http://registrationcenter-download.intel.com/irc_nas/${PID}/l_${PB}_itanium_p_${PV}.tgz )"
+COM_URI="http://registrationcenter-download.intel.com/irc_nas/${PID}"
+SRC_URI="amd64? ( ${COM_URI}/l_${PB}_em64t_p_${PV}.tgz )
+	x86? ( ${COM_URI}/l_${PB}_ia32_p_${PV}.tgz )
+	ia64? ( ${COM_URI}/l_${PB}_itanium_p_${PV}.tgz )"
 
 SLOT=0
 LICENSE="Intel-SDP"
@@ -20,32 +21,41 @@ LICENSE="Intel-SDP"
 IUSE=""
 RESTRICT="strip mirror"
 
-pkg_setup() {
-	# setting up license
-	[[ -z ${IPP_LICENSE} ]] && [[ -d ${ROOT}/opt/intel/licenses ]] && \
-		IPP_LICENSE="$(find ${ROOT}/opt/intel/licenses -name *IPP*.lic)"
-	# Alternative license file, the file might be included in a `package deal`
-	[[ -z ${IPP_LICENSE} ]] && \
-		IPP_LICENSE="$(grep 'COMPONENTS="PerfPrimL PerfPrim"' ${ROOT}/opt/intel/licenses/*|cut -d: -f1)"
+INTEL_LIC_DIR=/opt/intel/licenses
 
+pkg_setup() {
+	# Check the license
+	if [[ -z ${IPP_LICENSE} ]]; then
+		IPP_LICENSE="$(grep -ls PerfPrim ${ROOT}${INTEL_LIC_DIR}/* | tail -n 1)"
+		IPP_LICENSE=${IPP_LICENSE/${ROOT}/}
+	fi
 	if  [[ -z ${IPP_LICENSE} ]]; then
 		eerror "Did not find any valid ipp license."
-		eerror "Please locate your license file and run:"
-		eerror "\t IPP_LICENSE=/my/license/dir emerge ${PN}"
-		eerror "or place your license in /opt/intel/licenses"
-		eerror "Hint: the license file is in the email Intel sent you"
-		die "setup ipp license failed"
+		eerror "Register at ${HOMEPAGE} to receive a license"
+		eerror "and place it in ${INTEL_LIC_DIR} or run:"
+		eerror "export IPP_LICENSE=/my/license/file emerge ipp"
+		die "license setup failed"
 	fi
+
+	local disq_req
 	IPP_ARCH=
 	if use amd64; then
-		IPP_ARCH=em64t
+		IPP_ARCH="em64t"
+		disk_req="800"
 	elif use x86; then
-		IPP_ARCH=ia32
+		IPP_ARCH="ia32"
+		disk_req="600"
 	elif use ia64; then
-		IPP_ARCH=ia64
+		IPP_ARCH="ia64"
+		disk_req="700"
 	fi
 	einfo "IPP_LICENSE=${IPP_LICENSE}"
 	einfo "IPP_ARCH=${IPP_ARCH}"
+
+	# Check if we have enough RAM and free diskspace
+	CHECKREQS_MEMORY="512"
+	CHECKREQS_DISK_BUILD=${disk_req}
+	check_reqs
 }
 
 src_unpack() {
@@ -61,10 +71,6 @@ src_unpack() {
 	# to produce such a file, first do it interactively
 	# tar xf l_*; ./install.sh --duplicate ipp.ini;
 	# the file will be instman/ipp.ini
-	# NOTE: Command line arguments tend to be more portable
-	# across Intel installations, so put as much of the settings
-	# in the command line as you can (for reuse purposes)
-
 	# binary blob extractor installs crap in /opt/intel
 	addwrite /opt/intel
 	cp ${IPP_LICENSE} "${WORKDIR}"/
@@ -104,8 +110,8 @@ src_install() {
 	dodir ${instdir}
 
 	# install license file
-	if  [[ ! -f /opt/intel/licenses/${IPP_TMP_LICENSE} ]]; then
-		insinto /opt/intel/licenses
+	if  [[ ! -f ${INTEL_LIC_DIR}/${IPP_TMP_LICENSE} ]]; then
+		insinto ${INTEL_LIC_DIR}
 		doins "${WORKDIR}"/${IPP_TMP_LICENSE}
 	fi