sci-libs/xblas: Shared library fixes, prefix love and ebuild cleanup

(Portage version: 2.2.01.20757-prefix/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)

3 files changed, 39 insertions, 22 deletions

diff --git a/sci-libs/xblas/ChangeLog b/sci-libs/xblas/ChangeLog
index 24b42cbb4..270c52d23 100644
--- a/sci-libs/xblas/ChangeLog
+++ b/sci-libs/xblas/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-libs/xblas
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> xblas-1.0.248.ebuild:
+  sci-libs/xblas: Shared library fixes, prefix love and ebuild cleanup
+
 *xblas-1.0.248 (22 Aug 2011)
 
   22 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org> +xblas-1.0.248.ebuild,
@@ -17,4 +20,3 @@
 
   03 Nov 2010; Sébastien Fabbro <bicatali@gentoo.org> ChangeLog:
   Initial import
-
diff --git a/sci-libs/xblas/Manifest b/sci-libs/xblas/Manifest
index 4f9463782..deadae4ad 100644
--- a/sci-libs/xblas/Manifest
+++ b/sci-libs/xblas/Manifest
@@ -1 +1 @@
-DIST xblas-1.0.248.tar.gz 2087424 RMD160 32e1b394efd9293000b669330c538718f5cef47b SHA1 dbe70a98c500db759f13031a4a951715ca3ba967 SHA256 b5fe7c71c2da1ed9bcdc5784a12c5fa9fb417577513fe8a38de5de0007f7aaa1
+DIST xblas-1.0.248.tar.gz 2087424 SHA256 b5fe7c71c2da1ed9bcdc5784a12c5fa9fb417577513fe8a38de5de0007f7aaa1 SHA512 4a3c3a6aea0e12a5620ba1c4d328ca9f20764da4871b2bac48c21366c25afed31daa3a3ef291973159b890b2bbf033bdc14503634637b50ff4514f425b4356ad WHIRLPOOL 9caf530132c9fb7ed76ceb0fffa33577ff146c72e43eadd68a43f80eaeb3e299db9e860926016f64ae19e8ec0b1af11861d192bb11120e20b473e8a6665c82a8
diff --git a/sci-libs/xblas/xblas-1.0.248.ebuild b/sci-libs/xblas/xblas-1.0.248.ebuild
index f9663c467..d65799af8 100644
--- a/sci-libs/xblas/xblas-1.0.248.ebuild
+++ b/sci-libs/xblas/xblas-1.0.248.ebuild
@@ -1,33 +1,48 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=4
 
-inherit eutils flag-o-matic toolchain-funcs versionator
+inherit eutils flag-o-matic toolchain-funcs versionator multilib fortran-2
 
 DESCRIPTION="Extra Precise Basic Linear Algebra Subroutines"
-HOMEPAGE="http://www.netlib.org/xblas/"
+HOMEPAGE="http://www.netlib.org/xblas"
 SRC_URI="${HOMEPAGE}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc fortran static-libs"
 
-DEPEND=""
-RDEPEND=""
+RDEPEND="fortran? ( virtual/fortran )"
+DEPEND="${RDEPEND}"
 
-make_shared_lib() {
-	local libstatic=${1}
-	local soname=$(basename "${1%.a}").so.$(get_major_version)
-	shift
-	einfo "Making ${soname}"
-	${LINK:-$(tc-getCC)} ${LDFLAGS}  \
-		-shared -Wl,-soname="${soname}" \
-		-Wl,--whole-archive "${libstatic}" -Wl,--no-whole-archive \
-		"$@" -o $(dirname "${libstatic}")/"${soname}" || die "${soname} failed"
-	ln -s "${soname}" $(dirname "${libstatic}")/"${soname%.*}"
+static_to_shared() {
+	local libstatic=${1}; shift
+	local libname=$(basename ${libstatic%.a})
+	local soname=${libname}$(get_libname $(get_version_component_range 1-2))
+	local libdir=$(dirname ${libstatic})
+
+	einfo "Making ${soname} from ${libstatic}"
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+			-dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \
+			-Wl,-all_load -Wl,${libstatic} \
+			"$@" -o ${libdir}/${soname} || die "${soname} failed"
+	else
+		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+			-shared -Wl,-soname=${soname} \
+			-Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \
+			"$@" -o ${libdir}/${soname} || die "${soname} failed"
+		[[ $(get_version_component_count) -gt 1 ]] && \
+			ln -s ${soname} ${libdir}/${libname}$(get_libname $(get_major_version))
+		ln -s ${soname} ${libdir}/${libname}$(get_libname)
+	fi
+}
+
+pkg_setup() {
+	use fortran && fortran-2_pkg_setup
 }
 
 src_configure() {
@@ -48,7 +63,7 @@ src_compile() {
 		make.inc || die
 	emake makefiles
 	emake lib
-	make_shared_lib lib${PN}.a
+	static_to_shared lib${PN}.a
 }
 
 src_test() {
@@ -56,7 +71,7 @@ src_test() {
 }
 
 src_install() {
-	dolib.so lib${PN}.so*
+	dolib.so lib${PN}$(get_libname)*
 	use static-libs && newlib.a lib${PN}_nonpic.a lib${PN}.a
 	dodoc README README.devel
 	use doc && dodoc doc/report.ps
@@ -74,5 +89,5 @@ src_install() {
 		Cflags: -I\${includedir}
 	EOF
 	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc || die
+	doins ${PN}.pc
 }