sci-libs/lapack-reference: Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

5 files changed, 22 insertions, 110 deletions

diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog
index a7c752d5d047..e67d862a83ff 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/lapack-reference
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.66 2013/02/02 17:02:38 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/ChangeLog,v 1.67 2013/02/21 21:27:56 jlec Exp $
+
+  21 Feb 2013; Justin Lecher <jlec@gentoo.org>
+  lapack-reference-3.1.1-r1.ebuild, -lapack-reference-3.2.1.ebuild,
+  lapack-reference-3.2.1-r1.ebuild:
+  Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config
 
   02 Feb 2013; Justin Lecher <jlec@gentoo.org>
   +files/lapack-reference-3.1.1-test-fix.patch:
diff --git a/sci-libs/lapack-reference/Manifest b/sci-libs/lapack-reference/Manifest
index 19649ad28d20..6104d99ad085 100644
--- a/sci-libs/lapack-reference/Manifest
+++ b/sci-libs/lapack-reference/Manifest
@@ -8,15 +8,14 @@ DIST lapack-3.2.1.tgz 4792502 SHA256 5825f83971157001fd4235514afe8ff5fc16e1c06b2
 DIST lapack-lite-3.1.1.tgz 5332509 SHA256 505a13272d0d71c45ea52be2de74b0562b234ea3ccf5160665c7a2ee74a58437 SHA512 492b932ef313339ce6b4e63ac8f778489e6870b0eb85f7b086f3c844e75f98e7f85382c7556dfa368ab8320b6f02d1df8ccfcb40b5c0b7c2d74518b7c309e75c WHIRLPOOL 11145043d16b8c2972229e17a24e92e62987c08e84d91b81a7f4767b80f13844faffb2a2798b321a78c7127d849a0fd60cbb1605f03e150b4eaa6c230f0e7fdd
 DIST lapack-reference-3.1.1-autotools.patch.bz2 7233 SHA256 63e2c0b64118ca20aed3ca52dbc553ba924c242d3a0b07e6236dee99ede16802 SHA512 3ae61a9d569bdbe3d416652feedf1ae26fe85b23d919fb9d493e1474e616eeb23e87738ecb4970dde5f320812d3bb71c0f3c432548ab8e978941d90afe4cb418 WHIRLPOOL 449d9bf9c7f58c019804708b10f902919e55a722af6fe31904cd7b941074c66c68ef809e56fcce99e6f946da8e69be383b838a6a866ede6ee925268d6b24d423
 DIST lapack-reference-3.2.1-autotools.patch.bz2 13338 SHA256 de2ab4ea9723f549c77b38d932e5ddb55b7b5583b0050e527505210460dcdf76 SHA512 957e8c7646a0d6ade9c0dfdaf2aa665a01f932dfda376ba1db164106fb174793e6504cdbed7daf158f23bb69502937963cb2e2d45ac720980d3832f6fc0fedbd WHIRLPOOL 8872222a124cd8593c8441034b6fd47463193e03bdebafc8b2790ebc73f49eb811762dc9cd98949bda0af7869f9d12b9ebbfc23457b5393d88c00a013c4f419d
-EBUILD lapack-reference-3.1.1-r1.ebuild 2662 SHA256 e2f6b6c6d021f365dd53b504199b4bd1893f5176bdd76913c85c9f9f82ca8c3b SHA512 8557f09316d304a3d95db7a054c03ac894a36bac1d27ea3bc5c8573a784dd89fc2f14d8bfc63bd277a7f0e9700c2d3f771af5e898922ae64d9aeb0d31db624cb WHIRLPOOL 25eb700b9bc9f71bb18cf36725419195f2549a2ee7a4ff2e7b67f76aca61a9ecaf56e9eb9e02a796aa730a6646b0d6ed73430717227412612917e58e9afde78f
-EBUILD lapack-reference-3.2.1-r1.ebuild 3004 SHA256 3925a562c0b64e6043b9fa422a80e7df68ae9600475f728a598d80ee76779fe7 SHA512 41bfe6028d242e2cf517749f6d95f496086c2bd932edd304a771f2bdeec470df3ed1d014e39c8e9b1ee0df5a20e88160c41f41a53d8c5b7bf974cda800113084 WHIRLPOOL 229ffc47ed91fa6b5c3d01341c7b484578576ed470220d0cebdaeba2ab15a437b9c303ee25e9e919971eaad59410a43243a6eba331035d8e59c3630eb5d87773
-EBUILD lapack-reference-3.2.1.ebuild 2690 SHA256 62531b3393d6c0f71f29623a7544a71ff074df44a1ec1b029376d462134acd28 SHA512 ffe1df52086405342c643ade9ea782280eda9dd752f0dc416fd883a9ca23691ea71de0a7da18b0dd2cfc726878799251289ad5a79a29bdb2173e45ec3c762d15 WHIRLPOOL 83e22dfaceee52b68d03584e551067ef51cf38bb2ec4706dbc5f8998aa68d60b8704014271c8d0098a9adf585e23e9ce650bc12537e75172dc0290fba3f62e01
-MISC ChangeLog 11473 SHA256 13f6c7a45e480f2eebba2fa8352da32094f86f805eb1142111ee99a721aee190 SHA512 6d582430db7f9dbe7eacd717bc26d43e4cd71cd4492eecdbc20206aad6afca27b7e7215343eba9aa3be520541d3bf61888d9c2fa610833be548afac9bccc4e86 WHIRLPOOL 70e94f542acbc557a3b244a41ef4b301488c2bd0e8518cb0435a6e14fe7560d998364b69c511f9f4825a3bc0dd65803a46709f6622a8b180bcfbbcfa710e7c25
+EBUILD lapack-reference-3.1.1-r1.ebuild 2698 SHA256 d4b8c2e35d0e859e1724fefbe28aebcad4b736b71ef8316d09f8b848f7bc884e SHA512 b77125e963d1e028a75b94565996c3c6d3c37cd698184f93cac0ec9f07f9c10d11acba93ed91eb494cce2119dd847fc8c21811cc1f03075f313aa4c7d7a2e4d2 WHIRLPOOL d7b843a200bc61efeb92c7429bc0a2ff3e8f7b59b4bbfd983e16c868d2635c419f327533162ef6ccf5ebf4a85d6dbcc77ded19aa94ed1e2463823ec48ff0e8cd
+EBUILD lapack-reference-3.2.1-r1.ebuild 3040 SHA256 cc78321aeb6adfbe2b9d29d4c85671b3ec6b01e566a50080af0fdd8fc9586ce0 SHA512 636cccf29e0c1efde02de4e1d5bafc7a67146845c115ff37ecc906dee5d4b32ceda22a1f24c41a4d337bc419328b1f3d314dcad8b9985b51a4d5b2397494a4ca WHIRLPOOL 70bc6e28904579ce012f0ce6f78f378e72eb16473abd07b78fcde3265dddcc95e7c0f5a622a485e2a16c757263c96a3856388f20f5a02f5c3c7655c2e4834f87
+MISC ChangeLog 11704 SHA256 bbc4c33f258b77db1807625bb40e0bda845b82346770ac7795eb530c083fb9bb SHA512 a210229fdfa3e577f44552bd55a59969f80a0168a3cdb7242d600404ed3eaefdf30985a0d1280992764124e9fcac6e41b0c8e5bce9a2a14f252902c880d9e7bf WHIRLPOOL 500a4aa22d7d3870b8ed826df0348f69a1406a3471408fb730db52a3c507235ba64dba480101449ece93d36baf9bc06b80bde529004c1e64ccd689610a2bb0e0
 MISC metadata.xml 598 SHA256 e291e54118fa577845be28694c5668ad3264ee2b619f190d5646b04dc55707f4 SHA512 323804442122e0f2c60e51875ff8381f3938016567878dd7b2462ecfbe8ea25e3424c786ad11719cb561c6fe64bd400491bc65f2bd8907ad6f6e1774c862ef5f WHIRLPOOL ce8ca53a5f9a46536ca1da4d009ccbe58239efd3f29d5dd005ba5389e7451cdfdf344fe88b11bacd3b38def421bef154258466abddfc1ff72ae7b4b6d7e2ffab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAlENRsEACgkQgAnW8HDreRa5KgCeLtIPZh5s0NTNTpDRfk6He1O6
-teUAoL1a9qxfBldYElRTSMDuxWJ74kGY
-=BJxE
+iEYEAREKAAYFAlEmkYoACgkQgAnW8HDreRbgiACfZA3JM41U+UEwa0qL3MHFdipf
+JMoAoKMXJI2TgCPijC7dOfW6lRSTG70z
+=oTZh
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/lapack-reference/lapack-reference-3.1.1-r1.ebuild b/sci-libs/lapack-reference/lapack-reference-3.1.1-r1.ebuild
index 0c430eb62c1f..455aeee5e84b 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.1.1-r1.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/lapack-reference-3.1.1-r1.ebuild,v 1.32 2013/02/01 07:08:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/lapack-reference-3.1.1-r1.ebuild,v 1.33 2013/02/21 21:27:56 jlec Exp $
 
 inherit autotools eutils fortran-2 flag-o-matic multilib toolchain-funcs
 
@@ -46,9 +46,9 @@ src_unpack() {
 
 	# set up the testing routines
 	sed -e "s:g77:$(tc-getFC):" \
-		-e "s:-funroll-all-loops -O3:${FFLAGS} $(pkg-config --cflags blas):" \
-		-e "s:LOADOPTS =:LOADOPTS = ${LDFLAGS} $(pkg-config --cflags blas):" \
-		-e "s:../../blas\$(PLAT).a:$(pkg-config --libs blas):" \
+		-e "s:-funroll-all-loops -O3:${FFLAGS} $($(tc-getPKG_CONFIG) --cflags blas):" \
+		-e "s:LOADOPTS =:LOADOPTS = ${LDFLAGS} $($(tc-getPKG_CONFIG) --cflags blas):" \
+		-e "s:../../blas\$(PLAT).a:$($(tc-getPKG_CONFIG) --libs blas):" \
 		-e "s:lapack\$(PLAT).a:SRC/.libs/liblapack.a:" \
 		make.inc.example > make.inc \
 		|| die "Failed to set up make.inc"
@@ -57,7 +57,7 @@ src_unpack() {
 src_compile() {
 	econf \
 		--libdir="/usr/$(get_libdir)/lapack/reference" \
-		--with-blas="$(pkg-config --libs blas)"
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
 	emake || die "emake failed"
 }
 
diff --git a/sci-libs/lapack-reference/lapack-reference-3.2.1-r1.ebuild b/sci-libs/lapack-reference/lapack-reference-3.2.1-r1.ebuild
index 6ff697702342..afc1b425d3c6 100644
--- a/sci-libs/lapack-reference/lapack-reference-3.2.1-r1.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-3.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/lapack-reference-3.2.1-r1.ebuild,v 1.16 2013/02/01 07:08:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/lapack-reference-3.2.1-r1.ebuild,v 1.17 2013/02/21 21:27:56 jlec Exp $
 
 EAPI=3
 
@@ -47,9 +47,9 @@ src_prepare() {
 
 	# set up the testing routines
 	sed -e "s:g77:$(tc-getFC):" \
-		-e "s:-funroll-all-loops -O3:${FFLAGS} $(pkg-config --cflags blas):" \
-		-e "s:LOADOPTS =:LOADOPTS = ${LDFLAGS} $(pkg-config --cflags blas):" \
-		-e "s:../../blas\$(PLAT).a:$(pkg-config --libs blas):" \
+		-e "s:-funroll-all-loops -O3:${FFLAGS} $($(tc-getPKG_CONFIG) --cflags blas):" \
+		-e "s:LOADOPTS =:LOADOPTS = ${LDFLAGS} $($(tc-getPKG_CONFIG) --cflags blas):" \
+		-e "s:../../blas\$(PLAT).a:$($(tc-getPKG_CONFIG) --libs blas):" \
 		-e "s:lapack\$(PLAT).a:SRC/.libs/liblapack.a:" \
 		make.inc.example > make.inc \
 		|| die "Failed to set up make.inc"
@@ -65,7 +65,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		--libdir="${EPREFIX}/usr/$(get_libdir)/lapack/reference" \
-		--with-blas="$(pkg-config --libs blas)"
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
 }
 
 src_install() {
diff --git a/sci-libs/lapack-reference/lapack-reference-3.2.1.ebuild b/sci-libs/lapack-reference/lapack-reference-3.2.1.ebuild
deleted file mode 100644
index 4d5fe8b48e8a..000000000000
--- a/sci-libs/lapack-reference/lapack-reference-3.2.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-reference/lapack-reference-3.2.1.ebuild,v 1.14 2013/02/01 07:08:09 jlec Exp $
-
-inherit autotools eutils fortran-2 flag-o-matic multilib toolchain-funcs
-
-MyPN="${PN/-reference/}"
-PATCH_V="3.2.1"
-
-DESCRIPTION="FORTRAN reference implementation of LAPACK Linear Algebra PACKage"
-HOMEPAGE="http://www.netlib.org/lapack/index.html"
-SRC_URI="
-	mirror://gentoo/${MyPN}-${PV}.tgz
-	mirror://gentoo/${PN}-${PATCH_V}-autotools.patch.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="
-	app-admin/eselect-lapack
-	virtual/blas"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/lapack-docs )"
-
-S="${WORKDIR}/${MyPN}-${PV}"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	if  [[ $(tc-getFC) =~ if ]]; then
-		ewarn "Using Intel Fortran at your own risk"
-		export LDFLAGS="$(raw-ldflags)"
-		export NOOPT_FFLAGS=-O
-	fi
-	ESELECT_PROF=reference
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/${PN}-${PATCH_V}-autotools.patch
-	epatch "${FILESDIR}"/${P}-parallel-make.patch
-	eautoreconf
-
-	# set up the testing routines
-	sed -e "s:g77:$(tc-getFC):" \
-		-e "s:-funroll-all-loops -O3:${FFLAGS} $(pkg-config --cflags blas):" \
-		-e "s:LOADOPTS =:LOADOPTS = ${LDFLAGS} $(pkg-config --cflags blas):" \
-		-e "s:../../blas\$(PLAT).a:$(pkg-config --libs blas):" \
-		-e "s:lapack\$(PLAT).a:SRC/.libs/liblapack.a:" \
-		make.inc.example > make.inc \
-		|| die "Failed to set up make.inc"
-}
-
-src_compile() {
-	econf \
-		--libdir="/usr/$(get_libdir)/lapack/reference" \
-		--with-blas="$(pkg-config --libs blas)"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README || die "dodoc failed"
-	eselect lapack add $(get_libdir) "${FILESDIR}"/eselect.lapack.reference ${ESELECT_PROF}
-}
-
-src_test() {
-	cd "${S}"/TESTING/MATGEN
-	emake || die "Failed to create tmglib.a"
-	cd "${S}"/TESTING
-	emake || die "lapack-reference tests failed."
-}
-
-pkg_postinst() {
-	local p=lapack
-	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
-}