From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.77)
	(envelope-from <gentoo-commits+bounces-485244-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1SpQF9-0002jv-O1
	for garchives@archives.gentoo.org; Thu, 12 Jul 2012 20:44:12 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id CB261E068E;
	Thu, 12 Jul 2012 20:43:24 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 8BFDCE068E
	for <gentoo-commits@lists.gentoo.org>; Thu, 12 Jul 2012 20:43:24 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id CA21B1B4060
	for <gentoo-commits@lists.gentoo.org>; Thu, 12 Jul 2012 20:43:23 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by hornbill.gentoo.org (Postfix) with ESMTP id 60C93E5444
	for <gentoo-commits@lists.gentoo.org>; Thu, 12 Jul 2012 20:43:21 +0000 (UTC)
From: "Sebastien Fabbro" <bicatali@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sebastien Fabbro" <bicatali@gentoo.org>
Message-ID: <1342118880.745521660eb5de3161897e71afd923123440e7c4.bicatali@gentoo>
Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/mumps/
X-VCS-Repository: proj/sci
X-VCS-Files: sci-libs/mumps/ChangeLog sci-libs/mumps/mumps-4.10.0.ebuild
X-VCS-Directories: sci-libs/mumps/
X-VCS-Committer: bicatali
X-VCS-Committer-Name: Sebastien Fabbro
X-VCS-Revision: 745521660eb5de3161897e71afd923123440e7c4
X-VCS-Branch: master
Date: Thu, 12 Jul 2012 20:43:21 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 722e9b8f-da11-4e8f-a958-78be7609e7a6
X-Archives-Hash: 939bf64f9f7ab680f218201ab6795384

commit:     745521660eb5de3161897e71afd923123440e7c4
Author:     Sebastien Fabbro <sfabbro <AT> uvic <DOT> ca>
AuthorDate: Thu Jul 12 18:48:00 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Jul 12 18:48:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc=
ommit;h=3D74552166

sci-libs/mumps: Shared library fixes and prefix love

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

---
 sci-libs/mumps/ChangeLog           |    3 ++
 sci-libs/mumps/mumps-4.10.0.ebuild |   39 ++++++++++++++++++------------=
-----
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/sci-libs/mumps/ChangeLog b/sci-libs/mumps/ChangeLog
index 4f22cd1..7c1bd5b 100644
--- a/sci-libs/mumps/ChangeLog
+++ b/sci-libs/mumps/ChangeLog
@@ -3,6 +3,9 @@
 # $Header: $
=20
   12 Jul 2012; S=C3=A9bastien Fabbro <bicatali@gentoo.org> mumps-4.10.0.=
ebuild:
+  sci-libs/mumps: Shared library fixes and prefix love
+
+  12 Jul 2012; S=C3=A9bastien Fabbro <bicatali@gentoo.org> mumps-4.10.0.=
ebuild:
   sci-libs/mumps: prefix love
=20
   13 Mar 2012; S=C3=A9bastien Fabbro <bicatali@gentoo.org> mumps-4.10.0.=
ebuild,

diff --git a/sci-libs/mumps/mumps-4.10.0.ebuild b/sci-libs/mumps/mumps-4.=
10.0.ebuild
index a148f55..c5ba564 100644
--- a/sci-libs/mumps/mumps-4.10.0.ebuild
+++ b/sci-libs/mumps/mumps-4.10.0.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
=20
 EAPI=3D4
-inherit eutils toolchain-funcs flag-o-matic versionator fortran-2
+inherit eutils toolchain-funcs flag-o-matic versionator fortran-2 multil=
ib
=20
 MYP=3DMUMPS_${PV}
=20
@@ -17,36 +17,37 @@ KEYWORDS=3D"~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=3D"doc examples metis mpi +scotch static-libs"
=20
 RDEPEND=3D"virtual/blas
+	virtual/fortran
 	metis? ( || ( sci-libs/metis <sci-libs/parmetis-4 )
 		mpi? ( <sci-libs/parmetis-4 ) )
 	scotch? ( sci-libs/scotch[mpi=3D] )
 	mpi? ( virtual/scalapack )"
=20
 DEPEND=3D"${RDEPEND}
-	virtual/fortran
 	virtual/pkgconfig"
=20
 S=3D"${WORKDIR}/${MYP}"
=20
-make_shared_lib() {
-	local libstatic=3D${1}
+static_to_shared() {
+	local libstatic=3D${1}; shift
+	local libname=3D$(basename ${libstatic%.a})
+	local soname=3D${libname}$(get_libname $(get_version_component_range 1-=
2))
+	local libdir=3D$(dirname ${libstatic})
+
+	einfo "Making ${soname} from ${libstatic}"
 	if [[ ${CHOST} =3D=3D *-darwin* ]] ; then
-		local dylibname=3D$(basename "${1%.a}").dylib
-		shift
-		einfo "Making ${dylibname}"
 		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
-			-dynamiclib -install_name "${EPREFIX}"/usr/lib/"${dylibname}" \
-			-Wl,-all_load -Wl,"${libstatic}" \
-			"$@" -o $(dirname "${libstatic}")/"${dylibname}" || die
+			-dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \
+			-Wl,-all_load -Wl,${libstatic} \
+			"$@" -o ${libdir}/${soname} || die "${soname} failed"
 	else
-		local soname=3D$(basename "${1%.a}").so.${LIBVER}
-		shift
-		einfo "Making ${soname}"
 		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
-			-shared -Wl,-soname=3D"${soname}" \
-			-Wl,--whole-archive "${libstatic}" -Wl,--no-whole-archive \
-			"$@" -o $(dirname "${libstatic}")/"${soname}" || die "${soname} faile=
d"
-		ln -s "${soname}" $(dirname "${libstatic}")/"${soname%.*}"
+			-shared -Wl,-soname=3D${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
 }
=20
@@ -121,10 +122,10 @@ src_configure() {
=20
 src_compile() {
 	emake alllib PIC=3D"-fPIC"
-	make_shared_lib lib/libmumps_common.a ${LIBADD}
+	static_to_shared lib/libmumps_common.a ${LIBADD}
 	local i
 	for i in c d s z; do
-		make_shared_lib lib/lib${i}mumps.a -Llib -lmumps_common
+		static_to_shared lib/lib${i}mumps.a -Llib -lmumps_common
 	done
 	if use static-libs; then
 		emake clean