bicatali    09/01/27 16:11:37

  Modified:             ChangeLog ipp-6.0.0.063.ebuild
  Added:                ipp-6.0.1.071.ebuild
  Log:
  Version bump and re-define the extracting tool with upstream change of license management (for 6.0.0.063 too).
  (Portage version: 2.2_rc23/cvs/Linux x86_64)

Revision  Changes    Path
1.6                  sci-libs/ipp/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/ipp/ChangeLog?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/ipp/ChangeLog?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/ipp/ChangeLog?r1=1.5&r2=1.6

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/ipp/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChangeLog	19 Jan 2009 22:58:10 -0000	1.5
+++ ChangeLog	27 Jan 2009 16:11:37 -0000	1.6
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/ipp
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ipp/ChangeLog,v 1.5 2009/01/19 22:58:10 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ipp/ChangeLog,v 1.6 2009/01/27 16:11:37 bicatali Exp $
+
+*ipp-6.0.1.071 (27 Jan 2009)
+
+  27 Jan 2009; Sébastien Fabbro <bicatali@g.o> ipp-6.0.0.063.ebuild,
+  +ipp-6.0.1.071.ebuild:
+  Version bump and re-define the extracting tool with upstream change of
+  license management (for 6.0.0.063 too).
 
 *ipp-6.0.0.063 (19 Jan 2009)
 



1.2                  sci-libs/ipp/ipp-6.0.0.063.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/ipp/ipp-6.0.0.063.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/ipp/ipp-6.0.0.063.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/ipp/ipp-6.0.0.063.ebuild?r1=1.1&r2=1.2

Index: ipp-6.0.0.063.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/ipp/ipp-6.0.0.063.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ipp-6.0.0.063.ebuild	19 Jan 2009 22:58:10 -0000	1.1
+++ ipp-6.0.0.063.ebuild	27 Jan 2009 16:11:37 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ipp/ipp-6.0.0.063.ebuild,v 1.1 2009/01/19 22:58:10 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ipp/ipp-6.0.0.063.ebuild,v 1.2 2009/01/27 16:11:37 bicatali Exp $
 
 inherit check-reqs
 
@@ -15,7 +15,7 @@
 	x86? ( ${COM_URI}/l_${PB}_ia32_p_${PV}.tar.gz )
 	ia64? ( ${COM_URI}/l_${PB}_itanium_p_${PV}.tar.gz )"
 
-SLOT=0
+SLOT="0"
 LICENSE="Intel-SDP"
 
 IUSE=""
@@ -59,33 +59,28 @@
 }
 
 src_unpack() {
-
-	ewarn
-	ewarn "Intel ${PN} requires at least 300Mb of disk space"
-	ewarn "Make sure you have enough in ${PORTAGE_TMPDIR}, /tmp and in /opt"
-	ewarn
 	unpack ${A}
+	cd l_${PB}_*_${PV}
 
-	cd l_${PB}_*_${PV}/install
 	# need to make a file to install non-interactively.
 	# to produce such a file, first do it interactively
 	# tar xf l_*; ./install.sh --duplicate ipp.ini;
-	# the file will be instman/ipp.ini
-	# binary blob extractor installs crap in /opt/intel
-	addwrite /opt/intel
+
+	# binary blob extractor uses stupid directory
+	addwrite /usr/local/share/macrovision
+
 	cp ${IPP_LICENSE} "${WORKDIR}"/
-	IPP_TMP_LICENSE="$(basename ${IPP_LICENSE})"
 	cat > ipp.ini <<- EOF
-		[IPP_${IPP_ARCH}]
-		EULA_ACCEPT_REJECT=ACCEPT
+		ACTIVATION=license_file
+		CONTINUE_WITH_OPTIONAL_ERROR=yes
+		PSET_INSTALL_DIR=${S}
+		PSET_LICENSE_FILE=${IPP_LICENSE}
+		INSTALL_MODE=NONRPM
+		ACCEPT_EULA=accept
 	EOF
+
 	einfo "Extracting ..."
-	./install \
-		--silent ${PWD}/ipp.ini \
-		--nonrpm \
-		--licensepath "${WORKDIR}"/${IPP_TMP_LICENSE} \
-		--installpath "${S}" \
-		--log log.txt &> /dev/null
+	./install.sh --silent ${PWD}/ipp.ini &> log.txt
 
 	# This check is arbitrary to say the least...
 	# We used to look for a specific library (ie: libippmmx.so) but that
@@ -98,11 +93,12 @@
 		die "extracting failed"
 	fi
 
+	# clean up
+	cd "${S}"
+	find . -type d -print0 | xargs --null chmod 755
+	rm -rf tmp* uninstall.sh
 	rm -rf "${WORKDIR}"/l_*
-}
-
-src_compile() {
-	einfo "Binary package, nothing to compile"
+	rm -rf /usr/local/share/macrovision
 }
 
 src_install() {
@@ -110,9 +106,9 @@
 	dodir ${instdir}
 
 	# install license file
-	if  [[ ! -f ${INTEL_LIC_DIR}/${IPP_TMP_LICENSE} ]]; then
+	if  [[ ! -f ${INTEL_LIC_DIR}/$(basename ${IPP_LICENSE}) ]]; then
 		insinto ${INTEL_LIC_DIR}
-		doins "${WORKDIR}"/${IPP_TMP_LICENSE}
+		doins ${IPP_LICENSE}
 	fi
 
 	# cp quicker than doins



1.1                  sci-libs/ipp/ipp-6.0.1.071.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/ipp/ipp-6.0.1.071.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/ipp/ipp-6.0.1.071.ebuild?rev=1.1&content-type=text/plain

Index: ipp-6.0.1.071.ebuild
===================================================================
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/ipp/ipp-6.0.1.071.ebuild,v 1.1 2009/01/27 16:11:37 bicatali Exp $

inherit check-reqs

PID=1326
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"
COM_URI="http://registrationcenter-download.intel.com/irc_nas/${PID}"
SRC_URI="amd64? ( ${COM_URI}/l_${PB}_em64t_p_${PV}.tar.gz )
	x86? ( ${COM_URI}/l_${PB}_ia32_p_${PV}.tar.gz )
	ia64? ( ${COM_URI}/l_${PB}_itanium_p_${PV}.tar.gz )"

SLOT="0"
LICENSE="Intel-SDP"

IUSE=""
RESTRICT="strip mirror binchecks"

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 "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"
		disk_req="800"
	elif use x86; then
		IPP_ARCH="ia32"
		disk_req="600"
	elif use ia64; then
		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() {
	unpack ${A}
	cd l_${PB}_*_${PV}

	# need to make a file to install non-interactively.
	# to produce such a file, first do it interactively
	# tar xf l_*; ./install.sh --duplicate ipp.ini;

	# binary blob extractor uses stupid directory
	addwrite /usr/local/share/macrovision

	cp ${IPP_LICENSE} "${WORKDIR}"/
	cat > ipp.ini <<- EOF
		ACTIVATION=license_file
		CONTINUE_WITH_OPTIONAL_ERROR=yes
		PSET_INSTALL_DIR=${S}
		PSET_LICENSE_FILE=${IPP_LICENSE}
		INSTALL_MODE=NONRPM
		ACCEPT_EULA=accept
	EOF

	einfo "Extracting ..."
	./install.sh --silent ${PWD}/ipp.ini &> log.txt

	# This check is arbitrary to say the least...
	# We used to look for a specific library (ie: libippmmx.so) but that
	# is unreliable as they are moving targets and may not be there on
	# the next release. ippEULA.txt is more likely to remain there at
	# the next release.
	if [[ -z $(find "${S}" -name ippEULA.txt) ]]; then
		eerror "could not find extracted files"
		eerror "see ${PWD}/log.txt to see why"
		die "extracting failed"
	fi

	# clean up
	cd "${S}"
	find . -type d -print0 | xargs --null chmod 755
	rm -rf tmp* uninstall.sh
	rm -rf "${WORKDIR}"/l_*
	rm -rf /usr/local/share/macrovision
}

src_install() {
	local instdir=/opt/intel/${PN}/${PV}/${IPP_ARCH}
	dodir ${instdir}

	# install license file
	if  [[ ! -f ${INTEL_LIC_DIR}/$(basename ${IPP_LICENSE}) ]]; then
		insinto ${INTEL_LIC_DIR}
		doins ${IPP_LICENSE}
	fi

	# cp quicker than doins
	einfo "Copying all files"
	cp -pPR "${S}"/* "${D}"${instdir} || \
		die "copying files failed"

	local env_file=36ipp
	echo "LDPATH=${instdir}/sharedlib" > ${env_file}
	doenvd ${env_file} || die "doenvd ${env_file} failed"
}