Re-arrange pkgconfig files, removed old version.

(Portage version: 2.1.4_rc14)

8 files changed, 26 insertions, 199 deletions

diff --git a/sci-libs/acml/ChangeLog b/sci-libs/acml/ChangeLog
index a4f0009c409d..c99c0266e418 100644
--- a/sci-libs/acml/ChangeLog
+++ b/sci-libs/acml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/acml
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v 1.30 2007/12/25 14:17:07 phreak Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v 1.31 2008/01/08 09:46:17 bicatali Exp $
+
+  08 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org> files/blas.pc.in,
+  files/lapack.pc.in, acml-3.6.0-r1.ebuild, acml-3.6.1-r1.ebuild,
+  -acml-4.0.0.ebuild, acml-4.0.1.ebuild:
+  Re-arrange pkgconfig files, removed old version.
 
   25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing kugelfang from metadata.xml as per #46972.
diff --git a/sci-libs/acml/acml-3.6.0-r1.ebuild b/sci-libs/acml/acml-3.6.0-r1.ebuild
index 4f34d42d9da8..7d0349efe685 100644
--- a/sci-libs/acml/acml-3.6.0-r1.ebuild
+++ b/sci-libs/acml/acml-3.6.0-r1.ebuild
@@ -1,6 +1,6 @@
-# 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/acml/acml-3.6.0-r1.ebuild,v 1.6 2007/12/19 19:30:47 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-3.6.0-r1.ebuild,v 1.7 2008/01/08 09:46:17 bicatali Exp $
 
 inherit eutils toolchain-funcs fortran
 
@@ -109,7 +109,7 @@ src_install() {
 			# pkgconfig files
 			sed -e "s:@LIBDIR@:$(get_libdir):" \
 				-e "s:@PV@:${PV}:" \
-				-e "s:@ACMLDIR@:${acmldir}/lib:g" \
+				-e "s:@ACMLDIR@:${acmldir}:g" \
 				-e "s:@EXTLIBS@:${extlibs}:g" \
 				-e "s:@EXTFLAGS@:${extflags}:g" \
 				"${FILESDIR}"/${l}.pc.in > ${l}.pc \
@@ -127,7 +127,6 @@ src_install() {
 			eselect ${l} add $(get_libdir) eselect.${l} ${ESELECT_PROF}
 		done
 		echo "LDPATH=${instdir}/${fort}/lib" > 35acml
-		echo "INCLUDE=${instdir}/${fort}/include" >> 35acml
 	done
 
 	doenvd 35acml || die "doenvd failed"
diff --git a/sci-libs/acml/acml-3.6.1-r1.ebuild b/sci-libs/acml/acml-3.6.1-r1.ebuild
index c5b422fcc994..2b2bc7f5ed76 100644
--- a/sci-libs/acml/acml-3.6.1-r1.ebuild
+++ b/sci-libs/acml/acml-3.6.1-r1.ebuild
@@ -1,6 +1,6 @@
-# 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/acml/acml-3.6.1-r1.ebuild,v 1.6 2007/12/19 19:30:47 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-3.6.1-r1.ebuild,v 1.7 2008/01/08 09:46:17 bicatali Exp $
 
 inherit eutils toolchain-funcs fortran
 
@@ -125,7 +125,7 @@ src_install() {
 			# pkgconfig files
 			sed -e "s:@LIBDIR@:$(get_libdir):" \
 				-e "s:@PV@:${PV}:" \
-				-e "s:@ACMLDIR@:${acmldir}/lib:g" \
+				-e "s:@ACMLDIR@:${acmldir}:g" \
 				-e "s:@EXTLIBS@:${extlibs}:g" \
 				-e "s:@EXTFLAGS@:${extflags}:g" \
 				"${FILESDIR}"/${l}.pc.in > ${l}.pc \
@@ -143,7 +143,6 @@ src_install() {
 			eselect ${l} add $(get_libdir) eselect.${l} ${ESELECT_PROF}
 		done
 		echo "LDPATH=${acmldir}/lib" > "${S}"/35acml
-		echo "INCLUDE=${acmldir}/include" >> "${S}"/35acml
 	done
 
 	doenvd "${S}"/35acml || die "doenvd failed"
diff --git a/sci-libs/acml/acml-4.0.0.ebuild b/sci-libs/acml/acml-4.0.0.ebuild
deleted file mode 100644
index 289fa8e89497..000000000000
--- a/sci-libs/acml/acml-4.0.0.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-4.0.0.ebuild,v 1.5 2007/11/21 00:25:36 bicatali Exp $
-
-inherit eutils toolchain-funcs fortran
-
-MY_PV=${PV//\./\-}
-
-DESCRIPTION="AMD Core Math Library (ACML) for x86_64 CPUs"
-HOMEPAGE="http://developer.amd.com/acml.jsp"
-SRC_URI="ifc? ( acml-${MY_PV}-ifort-64bit.tgz )
-	!ifc? ( int64? ( acml-${MY_PV}-gfortran-64bit-int64.tgz )
-		   !int64? ( acml-${MY_PV}-gfortran-64bit.tgz ) )"
-
-IUSE="openmp ifc int64 doc examples"
-KEYWORDS="~amd64"
-
-RESTRICT="strip fetch"
-LICENSE="ACML"
-SLOT="0"
-
-DEPEND="app-admin/eselect-blas
-	app-admin/eselect-lapack
-	ifc? ( dev-lang/ifc )
-	openmp? ( !ifc? ( >=sys-devel/gcc-4.2 ) )
-	!openmp? ( !ifc? ( =sys-devel/gcc-4.1* ) )"
-
-RDEPEND="${DEPEND}
-	doc? ( app-doc/blas-docs app-doc/lapack-docs )"
-
-S="${WORKDIR}"
-
-pkg_nofetch() {
-	einfo "Please download the ACML from:"
-	einfo "${HOMEPAGE}"
-	einfo "and place it in ${DISTDIR}."
-	einfo "The previous versions could be found at"
-	einfo "http://developer.amd.com/acmlarchive.jsp"
-	einfo "SRC=${A} $SRC_URI"
-}
-
-pkg_setup() {
-	FORTRAN="gfortran"
-	use ifc && FORTRAN="ifc"
-	fortran_pkg_setup
-	if [[ ${FORTRANC} == gfortran ]]; then
-		local gcc_version=$(gcc-major-version)$(gcc-minor-version)
-		if ! use openmp && (( ${gcc_version} != 41 )); then
-			eerror "You need gcc-4.1.x to test acml."
-			eerror "Please use gcc-config to swicth gcc version 4.1.x"
-			die "setup gcc failed"
-		elif use openmp && (( ${gcc_version} != 42 )); then
-			eerror "You need gfortran >= 4.2 to use openmp features."
-			eerror "Please use gcc-config to switch gcc version >= 4.2"
-			die "setup gcc failed"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	(DISTDIR="${S}" unpack contents-acml-*.tgz)
-	case ${FORTRANC} in
-		gfortran) FORT=gfortran ;;
-		ifc|ifort) FORT=ifort ;;
-		*) eerror "Unsupported fortran compiler: ${FORTRANC}"
-		   die "failed configuring fortran";;
-	esac
-	use openmp || rm -rf ${FORT}*_mp*
-	FORTDIRS="$(ls -d ${FORT}*)"
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_test() {
-	local forts=${FORTDIRS}
-	# only testing with current compiler
-	use openmp && forts="$(ls -d ${FORT}*_mp*)"
-	for fort in ${forts}; do
-		einfo "Testing acml for ${fort}"
-		cd "${S}"/${fort}/examples
-		for d in . acml_mv; do
-			cd "${S}"/${fort}/examples/${d}
-			emake \
-				ACMLDIR="${S}"/${fort} \
-				F77=${FORTRANC} \
-				CC="$(tc-getCC)" \
-				CPLUSPLUS="$(tc-getCXX)" \
-				|| die "emake test in ${fort}/examples/${d} failed"
-			emake clean
-		done
-	done
-}
-
-src_install() {
-	# respect acml default install dir (and FHS)
-	local instdir=/opt/${PN}${PV}
-	dodir ${instdir}
-
-	for fort in ${FORTDIRS}; do
-		# install acml
-		use examples || rm -rf "${S}"/${fort}/examples
-		cp -pPR "${S}"/${fort} "${D}"${instdir} || die "copy ${fort} failed"
-
-		# install profiles
-		ESELECT_PROF=acml-${FORTRANC}
-		local acmldir=${instdir}/${fort}
-		local libname=${acmldir}/lib/libacml
-		local extlibs
-		local extflags
-		if [[ ${fort} =~ int64 ]]; then
-			ESELECT_PROF=${ESELECT_PROF}-int64
-			extflags="${extflags} -fdefault-integer-8"
-		fi
-		if [[ ${fort} =~ _mp ]]; then
-			ESELECT_PROF=${ESELECT_PROF}-openmp
-			extlibs=-lpthread
-			libname=${libname}_mp
-			extflags="${extflags} -fopenmp"
-		fi
-		for l in blas lapack; do
-			# pkgconfig files
-			sed -e "s:@LIBDIR@:$(get_libdir):" \
-				-e "s:@PV@:${PV}:" \
-				-e "s:@ACMLDIR@:${acmldir}:g" \
-				-e "s:@EXTLIBS@:${extlibs}:g" \
-				-e "s:@EXTFLAGS@:${extflags}:g" \
-				"${FILESDIR}"/${l}.pc.in > ${l}.pc \
-				|| die "sed ${l}.pc failed"
-			insinto ${acmldir}/lib
-			doins ${l}.pc || die "doins ${l}.pc failed"
-
-			# eselect files
-			cat > eselect.${l} << EOF
-${libname}.so /usr/@LIBDIR@/lib${l}.so.0
-${libname}.so /usr/@LIBDIR@/lib${l}.so
-${libname}.a /usr/@LIBDIR@/lib${l}.a
-${acmldir}/lib/${l}.pc  /usr/@LIBDIR@/pkgconfig/${l}.pc
-EOF
-			eselect ${l} add $(get_libdir) eselect.${l} ${ESELECT_PROF}
-		done
-		echo "LDPATH=${instdir}/${fort}/lib" > 35acml
-		echo "INCLUDE=${instdir}/${fort}/include" >> 35acml
-	done
-
-	doenvd 35acml || die "doenvd failed"
-
-	use doc || rm -rf "${S}"/Doc/acml.pdf "${S}"/Doc/html
-	cp -pPR "${S}"/Doc "${D}"${instdir} || die "copy doc failed"
-}
-
-pkg_postinst() {
-	for p in blas lapack; do
-		local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-		if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-			local configfile="${ROOT}"/etc/env.d/${p}/$(get_libdir)/config
-			[[ -e ${configfile} ]] && rm -f ${configfile}
-			eselect ${p} set ${ESELECT_PROF}
-			elog "${p} has been eselected to ${ESELECT_PROF}"
-		else
-			elog "Current eselected ${p} is ${current_lib}"
-			elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-			elog "\t eselect ${p} set ${ESELECT_PROF}"
-		fi
-	done
-}
diff --git a/sci-libs/acml/acml-4.0.1.ebuild b/sci-libs/acml/acml-4.0.1.ebuild
index a1a80bc1e531..e7fc3726243e 100644
--- a/sci-libs/acml/acml-4.0.1.ebuild
+++ b/sci-libs/acml/acml-4.0.1.ebuild
@@ -1,6 +1,6 @@
-# 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/acml/acml-4.0.1.ebuild,v 1.2 2007/12/19 13:03:51 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-4.0.1.ebuild,v 1.3 2008/01/08 09:46:17 bicatali Exp $
 
 inherit eutils toolchain-funcs fortran
 
@@ -108,8 +108,8 @@ src_install() {
 		ESELECT_PROF=acml-${FORTRANC}
 		local acmldir=${instdir}/${fort}
 		local libname=${acmldir}/lib/libacml
-		local extlibs
-		local extflags
+		local extlibs=
+		local extflags=
 		if [[ ${fort} =~ int64 ]]; then
 			ESELECT_PROF=${ESELECT_PROF}-int64
 			extflags="${extflags} -fdefault-integer-8"
@@ -125,7 +125,7 @@ src_install() {
 			# pkgconfig files
 			sed -e "s:@LIBDIR@:$(get_libdir):" \
 				-e "s:@PV@:${PV}:" \
-				-e "s:@ACMLDIR@:${acmldir}/lib:g" \
+				-e "s:@ACMLDIR@:${acmldir}:g" \
 				-e "s:@EXTLIBS@:${extlibs}:g" \
 				-e "s:@EXTFLAGS@:${extflags}:g" \
 				"${FILESDIR}"/${l}.pc.in > ${l}.pc \
diff --git a/sci-libs/acml/files/blas.pc.in b/sci-libs/acml/files/blas.pc.in
index 12836e6a5998..d9f7f4087943 100644
--- a/sci-libs/acml/files/blas.pc.in
+++ b/sci-libs/acml/files/blas.pc.in
@@ -1,10 +1,11 @@
-prefix=/usr
+prefix=@ACMLDIR@
 exec_prefix=${prefix}
-libdir=/usr/@LIBDIR@
+libdir=${prefix}/lib
+includedir=${prefix}/include
 
 Name: blas
 Description: ACML implementations of the Basic Linear Algebra Subroutines
 Version: @PV@
 URL: http://developer.amd.com/acml.jsp
-Libs: -L@ACMLDIR@ -lblas -lacml_mv @EXTLIBS@
+Libs: -L${libdir} -lblas -lacml_mv @EXTLIBS@
 Cflags: @EXTFLAGS@
diff --git a/sci-libs/acml/files/digest-acml-4.0.0 b/sci-libs/acml/files/digest-acml-4.0.0
deleted file mode 100644
index 3d884d84518b..000000000000
--- a/sci-libs/acml/files/digest-acml-4.0.0
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 50879e5fa9cafc7a9badde44037f55ab acml-4-0-0-gfortran-64bit-int64.tgz 21881646
-RMD160 65d3d4ca146ade1781efb43ca35c80cc85387c90 acml-4-0-0-gfortran-64bit-int64.tgz 21881646
-SHA256 eda0b3c1350716509b1d244641200edca30faaae42c7b7b3873f573b4036f1f6 acml-4-0-0-gfortran-64bit-int64.tgz 21881646
-MD5 47f15966a5ed81243350d31afdd4e7f6 acml-4-0-0-gfortran-64bit.tgz 22559682
-RMD160 cd9042e882fb4e8c1f5951e8eb2880d035ab14ea acml-4-0-0-gfortran-64bit.tgz 22559682
-SHA256 3a7300dd9f7a494177baddd8bc34375daf80e550f5b6edb9539ed966adb80f11 acml-4-0-0-gfortran-64bit.tgz 22559682
-MD5 175b1968c5a3279cb7ebfab7018c0b82 acml-4-0-0-ifort-64bit.tgz 26676345
-RMD160 2f4a1f14a55ac3334fd3fc045355a4fdebf2e87f acml-4-0-0-ifort-64bit.tgz 26676345
-SHA256 090f64a5fe309c6ed2ee9bcf7ae73687e0577a02da9f8ceabd4e5315fecb4769 acml-4-0-0-ifort-64bit.tgz 26676345
diff --git a/sci-libs/acml/files/lapack.pc.in b/sci-libs/acml/files/lapack.pc.in
index 65763893ac8f..d2453f180759 100644
--- a/sci-libs/acml/files/lapack.pc.in
+++ b/sci-libs/acml/files/lapack.pc.in
@@ -1,10 +1,11 @@
-prefix=/usr
+prefix=@ACMLDIR@
 exec_prefix=${prefix}
-libdir=/usr/@LIBDIR@
+libdir=${prefix}/lib
+includedir=${prefix}/include
 
 Name: lapack
 Description: ACML implementation of the F77 Linear Algebra PACKage
 Version: @PV@
 URL: http://developer.amd.com/acml.jsp
-Libs: -L@ACMLDIR@ -llapack -lacml_mv @EXTLIBS@
+Libs: -L${libdir} -llapack -lacml_mv @EXTLIBS@
 Cflags: @EXTFLAGS@