Fix for prefix linking, #343113

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

4 files changed, 112 insertions, 2 deletions

diff --git a/sci-libs/blas-reference/ChangeLog b/sci-libs/blas-reference/ChangeLog
index ddb8ac2bf30c..de0fdc490935 100644
--- a/sci-libs/blas-reference/ChangeLog
+++ b/sci-libs/blas-reference/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/blas-reference
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-reference/ChangeLog,v 1.46 2010/10/02 20:42:02 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-reference/ChangeLog,v 1.47 2010/11/14 12:35:39 jlec Exp $
+
+*blas-reference-20070226-r2 (14 Nov 2010)
+
+  14 Nov 2010; Justin Lecher <jlec@gentoo.org>
+  +blas-reference-20070226-r2.ebuild,
+  +files/blas-reference-20070226-pkg-config.patch:
+  Fix for prefix linking, #343113
 
   02 Oct 2010; Fabian Groffen <grobian@gentoo.org>
   blas-reference-20070226-r1.ebuild:
diff --git a/sci-libs/blas-reference/Manifest b/sci-libs/blas-reference/Manifest
index e29f589738e2..647b675b7be1 100644
--- a/sci-libs/blas-reference/Manifest
+++ b/sci-libs/blas-reference/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX blas-reference-20070226-autotool.patch 4245 RMD160 53a820092f3f695c8999c18c90f9e0c1bca4c543 SHA1 e544e44da8fc56f95cc61981eb1309758dff6795 SHA256 637c9a5af75ff4eb4cf8c7ae2ddbefda087d9b861d2fc2214cb865648d7ae093
+AUX blas-reference-20070226-pkg-config.patch 354 RMD160 9f04b957b0ee7e75699b656c611e7ec6b4c4aa7b SHA1 04c4de7d68036acaad1518732ab76e777ae0068f SHA256 b68ab0b4533d11fed3b7f5f3cd6634599cc13d8d72886d06568093649177dc26
 AUX eselect.blas.reference 213 RMD160 24e11e3d44459864070eced2f660d170ca3daca0 SHA1 d3b664ab4177a7f7d95ef90e9603694889be45f1 SHA256 c11b1a8dcd34951d9b1126149f8a51ca0eb0aa5e081abc63f65c392f4839b0aa
 DIST lapack-lite-3.1.1.tgz 5332509 RMD160 d81baafd1f0f9859d9f75ac9b658f743544b5f5b SHA1 1ec4ef90b544cf82bc7b4f770cee6fb46da457c5 SHA256 505a13272d0d71c45ea52be2de74b0562b234ea3ccf5160665c7a2ee74a58437
 EBUILD blas-reference-20070226-r1.ebuild 2254 RMD160 aae1d8399b860a9d14db74d936c5dd846a920983 SHA1 9babba0a1f574ecf46a36d3aa3daf5e843ff7769 SHA256 01bd022012a339a65c00bf8876ddcc64a1d0033afb441b38ced8c5ad54e9594a
+EBUILD blas-reference-20070226-r2.ebuild 2295 RMD160 0b133bd284db7d762c1d224f8937cd0fd566c1f5 SHA1 bb673c619286a28812fe775f7d541a6eae8b96bb SHA256 73804d4fddd508f0273847bfd6e7fb1ba68a513d7457ce3483abc846ba58e570
 EBUILD blas-reference-20070226.ebuild 1938 RMD160 5556a2e4fb597af4dae696f2fe4200a4f9882fc6 SHA1 680934cb60712012cec26d3e4fa3a6186d5b7c99 SHA256 871252b072270f8a0f8812a5662dc585d680fc82e241a1bd3c31c5eb0b30cc4d
-MISC ChangeLog 9340 RMD160 2cbabe8892a57114655d8e769af0ae2fa0a8d4fe SHA1 14b79ef2b7c9a93952b4ff9a7e0f02f46b647f81 SHA256 04ad3cdd3f33161e4ba089e73e797e828320abeecf0455313e84ae3d8b740580
+MISC ChangeLog 9551 RMD160 1dffe85fe998c48cbeea1574686ec1bb7d7e8587 SHA1 0f1fdd1456de140b3de342e9bb89390f7a345272 SHA256 f37ef6faa98a48a4bd578641c0877f1f16784947badd2a93ac47fbc8e055e7f5
 MISC metadata.xml 696 RMD160 89c66792b23057b940a8eb8ea4c05ac8c7d561f0 SHA1 c18e9985fe07bbff5f56ef239ca2a16caa8a6240 SHA256 750713f970e77bfd513933fd3ec27162d41a56d20c4122878618fc78d72f76ab
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzf16EACgkQgAnW8HDreRZLUgCfRbksn/mnhWY3Q2KiLuaAHu6g
+VcAAoJ+y4EENS/wMoBzeSNo7RPJLr7bU
+=mUnr
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/blas-reference/blas-reference-20070226-r2.ebuild b/sci-libs/blas-reference/blas-reference-20070226-r2.ebuild
new file mode 100644
index 000000000000..0132ceac464e
--- /dev/null
+++ b/sci-libs/blas-reference/blas-reference-20070226-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-reference/blas-reference-20070226-r2.ebuild,v 1.1 2010/11/14 12:35:39 jlec Exp $
+
+EAPI="3"
+
+inherit eutils autotools fortran multilib flag-o-matic
+
+LAPACKPV="3.1.1"
+LAPACKPN="lapack-lite"
+
+DESCRIPTION="Basic Linear Algebra Subprograms F77 reference implementations"
+HOMEPAGE="http://www.netlib.org/blas/"
+SRC_URI="http://www.netlib.org/lapack/${LAPACKPN}-${LAPACKPV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc"
+
+DEPEND="app-admin/eselect-blas"
+RDEPEND="${DEPEND}
+	doc? ( app-doc/blas-docs )"
+
+S="${WORKDIR}/${LAPACKPN}-${LAPACKPV}"
+
+pkg_setup() {
+	FORTRAN="g77 gfortran ifc"
+	fortran_pkg_setup
+	if  [[ ${FORTRANC} == if* ]]; then
+		ewarn "Using Intel Fortran at your own risk"
+		LDFLAGS="$(raw-ldflags)"
+	fi
+	ESELECT_PROF=reference
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-autotool.patch \
+		"${FILESDIR}"/${P}-pkg-config.patch
+	eautoreconf
+
+	cp "${FILESDIR}"/eselect.blas.reference "${T}"/
+	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.blas.reference || die
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
+			"${T}"/eselect.blas.reference || die
+	fi
+}
+
+src_configure() {
+	econf \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/blas/reference \
+		|| die "econf failed"
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	eselect blas add $(get_libdir) "${T}"/eselect.blas.reference ${ESELECT_PROF}
+}
+
+pkg_postinst() {
+	local p=blas
+	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="${EROOT}"/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
+}
diff --git a/sci-libs/blas-reference/files/blas-reference-20070226-pkg-config.patch b/sci-libs/blas-reference/files/blas-reference-20070226-pkg-config.patch
new file mode 100644
index 000000000000..14190f41e7d5
--- /dev/null
+++ b/sci-libs/blas-reference/files/blas-reference-20070226-pkg-config.patch
@@ -0,0 +1,11 @@
+diff --git a/BLAS/blas.pc.in b/BLAS/blas.pc.in
+index 367c87b..44b86db 100644
+--- a/BLAS/blas.pc.in
++++ b/BLAS/blas.pc.in
+@@ -7,5 +7,5 @@ Name: @PACKAGE_NAME@
+ Description: Basic Linear Algebra Subprograms F77 reference implementations
+ Version: @PACKAGE_VERSION@
+ URL: http://www.netlib.org/blas
+-Libs: -lblas
++Libs: -L@libdir@ -lblas
+ Libs.private: -lm