Fixed a bad link in the eselect profiles

Package-Manager: portage-2.1.5.2

4 files changed, 14 insertions, 194 deletions

diff --git a/sci-libs/acml/ChangeLog b/sci-libs/acml/ChangeLog
index 33d7075e5b10..872398554bcb 100644
--- a/sci-libs/acml/ChangeLog
+++ b/sci-libs/acml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/acml
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v 1.35 2008/05/06 17:57:49 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/ChangeLog,v 1.36 2008/05/27 10:16:17 bicatali Exp $
+
+  27 May 2008; Sébastien Fabbro <bicatali@gentoo.org> -acml-4.1.0.ebuild,
+  acml-4.1.0-r1.ebuild:
+  Fixed a bad link in the eselect profiles
 
 *acml-4.1.0-r1 (06 May 2008)
 
diff --git a/sci-libs/acml/Manifest b/sci-libs/acml/Manifest
index 8e07fbd912b1..42ba2a06be15 100644
--- a/sci-libs/acml/Manifest
+++ b/sci-libs/acml/Manifest
@@ -21,14 +21,13 @@ DIST acml-4-1-0-ifort-64bit.tgz 36577689 RMD160 35ef227d2bf24ae3ff2141a802570d6d
 EBUILD acml-3.6.0-r1.ebuild 4486 RMD160 d740d9f002c2a4d1a8bb0c094108983d23400c00 SHA1 648a4efa47b57f2827fcd37235f59f6256ce6997 SHA256 8c1b0d1e02ba64ffdd60cc020e10d9f6e167fb6cdfabe6408c2279bc791a62ca
 EBUILD acml-3.6.1-r1.ebuild 5223 RMD160 b1799bd496f14aa19043a3bf210cc59ba58107d2 SHA1 5934984c91f4bd27b28d98a6c5fb6184d453bf8f SHA256 4f6ec15274818e6e2df0dc68c5e033fb72443f6289e610c05733f2c5ef810ec1
 EBUILD acml-4.0.1.ebuild 4926 RMD160 03ea891a51366243be1a318cbfbd65b407c10800 SHA1 0762345d1dd1198060dcfe8244d083bb10ba9946 SHA256 bdea166ec84cd5e7eff4d7490cfab2f7c83d343f2a7d61f5e6470560f13f30d2
-EBUILD acml-4.1.0-r1.ebuild 5896 RMD160 0704cf4a9a07d9dc2a9d64c0b1a5b6a574dc3eff SHA1 82d64b62f75b0f31c4fba99c30cb85b99b0720d0 SHA256 e612884a32bcce6cb7ece154877d7bb061a9d40eae9bb3708a0d7cd88f4d2565
-EBUILD acml-4.1.0.ebuild 5189 RMD160 642672441448df6bb6a150f7b627bbe183a4cd16 SHA1 01d8a39eb44ff1d800dc6245590877555004e7f5 SHA256 bfe76a5bdf0a1aa5db5fcf7061e6cea0c9f1125347387f5e720bbe0b21f30b49
-MISC ChangeLog 7185 RMD160 8fbbadbac79ea5fac42c37231d5b59cbbb29d793 SHA1 e199cd2d0f7d78aaa04845288dea858c3a993c30 SHA256 4b833ba7a0265bd7479b4aa948432f78238a48157d4bddaacb2dd3eae5d7a865
+EBUILD acml-4.1.0-r1.ebuild 5896 RMD160 ebdec59d71257f51515c60396795eef564885f64 SHA1 bbdab6a8dcef39593f4ccc13be64378986bab7f9 SHA256 3b3e03d791ce93b9af9981b15c4dbf5ab6fe9145d9162bda29ad105ede3ff452
+MISC ChangeLog 7328 RMD160 f8b12655820dff0a5d37e77a52866edd5afd5da2 SHA1 011e23afacd2db85a76bec2c15352c49bc558a5b SHA256 38060f2b4bd9e6b8228181857410fc7f46ac807c3cd5c9ce47dc9e9228dd2ecc
 MISC metadata.xml 812 RMD160 878a52e199a177a1dade27a1ebfdf623a42b7e5d SHA1 24e5f44c01dfc65ac8c699015bb649abf29efcaf SHA256 3597c6694fc8b1f7b57103ffd799dfa077c29444c31d6a5be43ebc0198636cae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkggnC4ACgkQ1ycZbhPLE2BpiACdEbcf1Jwd5TkR0RmAwea0hLP0
-b4MAnR9QWiytI9LTMgGq9dMPH0Q6TtEZ
-=cYnS
+iEYEARECAAYFAkg734cACgkQ1ycZbhPLE2BiFQCeLPHXkw45uhFLthP/+1YZyK9t
+eaYAn11n0OC0g5L4W+DOt63x6QiJLUrA
+=gZsP
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/acml/acml-4.1.0-r1.ebuild b/sci-libs/acml/acml-4.1.0-r1.ebuild
index 2b1dc7cc8643..e3b00bec037d 100644
--- a/sci-libs/acml/acml-4.1.0-r1.ebuild
+++ b/sci-libs/acml/acml-4.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.0-r1.ebuild,v 1.1 2008/05/06 17:57:49 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/acml/acml-4.1.0-r1.ebuild,v 1.2 2008/05/27 10:16:17 bicatali Exp $
 
 EAPI="1"
 
@@ -170,9 +170,9 @@ src_install() {
 
 			# eselect files
 			cat > eselect.${prof}.${x} <<-EOF
-				${libname}.so /usr/@LIBDIR@/lib${l}.so.0
-				${libname}.so /usr/@LIBDIR@/lib${l}.so
-				${libname}.a /usr/@LIBDIR@/lib${l}.a
+				${libname}.so /usr/@LIBDIR@/lib${x}.so.0
+				${libname}.so /usr/@LIBDIR@/lib${x}.so
+				${libname}.a /usr/@LIBDIR@/lib${x}.a
 				${acmldir}/lib/${x}.pc /usr/@LIBDIR@/pkgconfig/${x}.pc
 			EOF
 			eselect ${x} add $(get_libdir) eselect.${prof}.${x} ${prof}
diff --git a/sci-libs/acml/acml-4.1.0.ebuild b/sci-libs/acml/acml-4.1.0.ebuild
deleted file mode 100644
index 439f0b55862c..000000000000
--- a/sci-libs/acml/acml-4.1.0.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# 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.1.0.ebuild,v 1.1 2008/04/30 12:03:34 bicatali Exp $
-
-EAPI="1"
-
-inherit eutils toolchain-funcs fortran versionator
-
-MY_P=${PN}-$(replace_all_version_separators -)
-
-DESCRIPTION="AMD Core Math Library for x86 and amd64 CPUs"
-HOMEPAGE="http://developer.amd.com/acml.jsp"
-SRC_URI="
-	amd64? (
-		ifc? ( ${MY_P}-ifort-64bit.tgz )
-		gfortran? (	 ${MY_P}-gfortran-64bit.tgz
-			int64? ( ${MY_P}-gfortran-64bit-int64.tgz ) )
-		!ifc? (
-			!gfortran? ( ${MY_P}-gfortran-64bit.tgz
-				int64? ( ${MY_P}-gfortran-64bit-int64.tgz ) ) ) )
-	x86? (
-		ifc? ( ${MY_P}-ifort-32bit.tgz ) )"
-
-# add to amd64? when proper tar balls
-#			int64? ( ${MY_P}-ifort-64bit-int64.tgz ) )
-# add to x86? if one day they exist
-#		gfortran? ( ${MY_P}-gfortran-32bit.tgz )
-#		!ifc? ( !gfortran (	${MY_P}-gfortran-32bit.tgz ) ) )"
-
-IUSE="doc examples gfortran ifc int64 openmp test"
-KEYWORDS="~amd64 ~x86"
-
-RESTRICT="strip fetch"
-LICENSE="ACML"
-SLOT="0"
-
-CDEPEND="ifc? ( dev-lang/ifc )
-	gfortran? ( sys-devel/gcc:4.2 )
-	!gfortran? ( !ifc? ( sys-devel/gcc:4.2 ) )"
-
-DEPEND="test? (	${CDEPEND} )
-	app-admin/eselect-blas
-	app-admin/eselect-lapack"
-
-RDEPEND="${CDEPEND}
-	app-admin/eselect-blas
-	app-admin/eselect-lapack
-	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=""
-	if use test; then
-		use gfortran &&	FORTRAN="${FORTRAN} gfortran"
-		use ifc && FORTRAN="${FORTRAN} ifc"
-		use gfortran || use ifc || FORTRAN="gfortran"
-		fortran_pkg_setup
-		# work around incomplete fortran eclass
-		if  [[ ${FORTRANC} == gfortran ]] &&
-			[[ $(gcc-version) != 4.2 ]]
-		then
-			eerror "You need gfortran-4.2 to test acml"
-			eerror "Please use gcc-config to switch gcc version 4.2"
-			die "gfortran check failed"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	unpack ./contents-acml-*.tgz
-	use openmp || rm -rf *_mp*
-}
-
-src_test() {
-	# only testing with current chosen compiler
-	for fdir in ${FORTRANC}*; do
-		einfo "Testing acml in ${fdir}"
-		for d in . acml_mv; do
-			cd "${S}"/${fdir}/examples/${d}
-			emake \
-				ACMLDIR="${S}"/${fdir} \
-				F77=${FORTRANC} \
-				CC="$(tc-getCC)" \
-				CPLUSPLUS="$(tc-getCXX)" \
-				|| die "emake test in ${fdir}/examples/${d} failed"
-			emake clean
-		done
-	done
-}
-
-make_acml_profile_name() {
-	local fort=${1%%[[:digit:]]*}
-	local opt=${1#*[0-9][0-9]}
-	echo ${PN}-${fort}${opt} | tr '_' '-'
-}
-
-src_install() {
-	# respect acml default install dir (and FHS)
-	local instdir=/opt/${PN}${PV}
-	dodir ${instdir}
-
-	for lib in */lib; do
-		local fdir=${lib%/*}
-		# install acml
-		use examples || rm -rf "${S}"/${fdir}/examples
-		cp -pPR "${S}"/${fdir} "${D}"${instdir} || die "copy ${fdir} failed"
-
-		# install profiles
-		local prof=$(make_acml_profile_name ${fdir})
-		local acmldir=${instdir}/${fdir}
-		local acmllibs="-lacml -lacml_mv"
-		local libname=${acmldir}/lib/libacml
-		local extlibs
-		local extflags
-		[[ ${fdir} =~ int64 ]] && extflags="${extflags} -fdefault-integer-8"
-		[[ ${fdir} =~ gfortran ]] && extlibs="${extlibs} -lgfortran"
-		if [[ ${fdir} =~ _mp ]]; then
-			extlibs="${extlibs} -lpthread"
-			extflags="${extflags} -fopenmp"
-			acmllibs="-lacml_mp -lacml_mv"
-			libname=${libname}_mp
-		fi
-		for x in blas lapack; do
-			# pkgconfig files
-			sed -e "s:@LIBDIR@:$(get_libdir):" \
-				-e "s:@PV@:${PV}:" \
-				-e "s:@ACMLDIR@:${acmldir}:g" \
-				-e "s:@ACMLLIBS@:${acmllibs}:g" \
-				-e "s:@EXTLIBS@:${extlibs}:g" \
-				-e "s:@EXTFLAGS@:${extflags}:g" \
-				"${FILESDIR}"/${x}.pc.in > ${x}.pc \
-				|| die "sed ${x}.pc failed"
-			insinto ${acmldir}/lib
-			doins ${x}.pc || die "doins ${x}.pc failed"
-
-			# eselect files
-			cat > eselect.${prof}.${x} <<-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/${x}.pc /usr/@LIBDIR@/pkgconfig/${x}.pc
-			EOF
-			eselect ${x} add $(get_libdir) eselect.${prof}.${x} ${prof}
-		done
-	done
-	use doc || rm -rf "${S}"/Doc/acml.pdf "${S}"/Doc/html
-	cp -pPR "${S}"/Doc "${D}"${instdir} || die "copy doc failed"
-}
-
-pkg_postinst() {
-	# construct default profile dprof from default ddir
-	local ddir=gfortran
-	use ifc && ddir=ifort
-	use x86 && ddir="${ddir}32" || ddir="${ddir}64"
-	use openmp && ddir="${ddir}_mp"
-	use int64 && ddir="${ddir}_int64"
-	local dprof="$(make_acml_profile_name ${ddir})"
-	for x in blas lapack; do
-		local cprof=$(eselect ${x} show | cut -d' ' -f2)
-		if [[ ${cprof} == ${dprof} || -z ${cprof} ]]; then
-		# work around eselect bug #189942
-			local configfile="${ROOT}"/etc/env.d/${x}/$(get_libdir)/config
-			[[ -e ${configfile} ]] && rm -f ${configfile}
-			eselect ${x} set ${dprof}
-			elog "${x} has been eselected to ${dprof}"
-		else
-			elog "Current eselected ${x} implementation is ${cprof}"
-			elog "To use you have one of ${PN}, issue (as root):"
-			elog "\t eselect ${x} set <profile>"
-		fi
-	done
-}