keyword amd64-linux, x86-linux, and adapted changes from the science overlay for macos prefix, thanks Francois Bissey

Package-Manager: portage-2.2.01.20757-prefix/cvs/Linux x86_64

4 files changed, 43 insertions, 13 deletions

diff --git a/sci-libs/dsdp/ChangeLog b/sci-libs/dsdp/ChangeLog
index 3363fa513396..82b767c052ec 100644
--- a/sci-libs/dsdp/ChangeLog
+++ b/sci-libs/dsdp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/dsdp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/dsdp/ChangeLog,v 1.7 2012/05/04 08:22:53 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/dsdp/ChangeLog,v 1.8 2012/07/09 17:51:33 bicatali Exp $
+
+  09 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/dsdp-5.8-malloc.patch, dsdp-5.8-r2.ebuild:
+  keyword amd64-linux, x86-linux, and adapted changes from the science overlay
+  for macos prefix, thanks Francois Bissey
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> dsdp-5.8-r2.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
@@ -33,4 +38,3 @@
   07 Mar 2011; Sébastien Fabbro <bicatali@gentoo.org> +dsdp-5.8.ebuild,
   +metadata.xml:
   Initial import
-
diff --git a/sci-libs/dsdp/Manifest b/sci-libs/dsdp/Manifest
index f9f417ec6cc4..995c93bc8e1f 100644
--- a/sci-libs/dsdp/Manifest
+++ b/sci-libs/dsdp/Manifest
@@ -1,6 +1,17 @@
-AUX dsdp-5.8-gold.patch 342 RMD160 c3ece090723b542f8bf48406b1992cf4ad6a257d SHA1 c0b8c1cd520d12212270a2068d5c4f53756c5139 SHA256 5547f8feba4b6ceccdd4a3ff596c7a7a08e75d18859e8efdef83e08546e62285
-AUX dsdp-5.8-readsdpa.patch 568 RMD160 a3af05a29548ac712478ab27b82826304f3608fa SHA1 a17112567017687d3a83eb2338c0d5b3ce4d6c20 SHA256 9a7382fe5644305365c4a938435c239bc7e29ea24337079fc210898fb164c01c
-DIST DSDP5.8.tar.gz 2608518 RMD160 fb5fa1d701800f34774e75715c1e115bc6539238 SHA1 b2be496b0cda2d35c3af69a7a82cee88a8742e64 SHA256 26aa624525a636de272c0b329e2dfd01a0d5b7827f1c1c76f393d71e37dead70
-EBUILD dsdp-5.8-r2.ebuild 2052 RMD160 c8deaed6dc998610e141caabb0306a9811577df7 SHA1 2c86ad545f5f7e925b59889056c1074f2ce6207b SHA256 42ba9bba03106d1646d49742a268681ec74a6397dde63610dff9881d5789a316
-MISC ChangeLog 1149 RMD160 8deb7074feb317921548f581f2aa742c6d3a3da1 SHA1 488e294003637b0d495d22066c60e68713f9c386 SHA256 86faeeab61a30625cd6c59fa96670c0af37a3883e7a15db784e35196a4cc7563
-MISC metadata.xml 1141 RMD160 549ae1da3aadabf299a9fa3db22345245d57761a SHA1 682234f25bf437a79545a9dfd8bee4a00d7917d8 SHA256 e7b4a4d6dbcf38d35b9e08a8dec739410cb30f68230675a1b9adebd882b5d0bc
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX dsdp-5.8-gold.patch 342 SHA256 5547f8feba4b6ceccdd4a3ff596c7a7a08e75d18859e8efdef83e08546e62285 SHA512 e0910628a1676f7a22eff29487a5f732c28a8d7a9f44f55d5b42e9abd8e65e798e577592c933133265a61c1be2df05ef1c019b86ee93aaa34199a7d0d32c7b03 WHIRLPOOL 09abb51a2445e94d168b4581c143368139d11dff55f658fa7bec8b47e8ec471679eebd6a56da5de1ea88fd282150c4b6088f939c9261f8ff5817b58a7dc9eabb
+AUX dsdp-5.8-malloc.patch 285 SHA256 47c5739dc4a3c4c8acb697c3b55bad3fda8ebe662137d7393b18e171baf437fd SHA512 5236b9bab13103202a85db8c5a8cd7d3713102a780679532147f1b17d59c25c0f6aefa5cb2f09b5897a6d0c4eeeee6710e4fd894b10fb7cefb25b38376c638ee WHIRLPOOL 0330239b979ab8a6f81b1d276c804ff676103b168294117a1e8c8405c27a596217401db89399c026cb8558d85340024cce003dbc590718b85e196a9ff7b29859
+AUX dsdp-5.8-readsdpa.patch 568 SHA256 9a7382fe5644305365c4a938435c239bc7e29ea24337079fc210898fb164c01c SHA512 0f0370a781165b61698006acc4f940f8a205f4fd7ef463b6bc23222c3b5a6301eed9ba6e4f424c93aaf08dbb17a2a34f7120a69cceb8673c21de5576779eb4f6 WHIRLPOOL c97037ed76722305e09dae9bf7a05c06ae5129411ec871961be02c3d2d6a15f2ddf236dc4493d5e96a0b720d2a22e6048352b228a959baeb6c9a14057e7edb69
+DIST DSDP5.8.tar.gz 2608518 SHA256 26aa624525a636de272c0b329e2dfd01a0d5b7827f1c1c76f393d71e37dead70 SHA512 0a32a34e33dcac151e95ed0f8cee62603bbe2b4ba1e448bba35324fe576376cb33c15908cde61ae5a7c0dcdea945f1ec544f19b3dd36524158573260182e080e WHIRLPOOL 63f5ce91d1c624b3c8f4d6ba61f8f386e739c0a5ad97515b4d36bb6026751ff4ca83b6a466deb5983e15eab3c84879bc3d87d7f2613e8070ab989e2607da9ddf
+EBUILD dsdp-5.8-r2.ebuild 2303 SHA256 e8cb4bf611d5449bef175595e1cac72be58857e05baf6b7356dd4bc8b6f44bcc SHA512 a3f14e4182c4d7b52d5deb4e75c2b22e6bd10b833128d63c5a8f1e2d9ccbf4c3870d626b982915a9fa8edb39a83faf29958607946cdbe82338fc885ca406673a WHIRLPOOL 8667cec88463ce0c62fd447ef1b536095cd2a72ad56e5848c5a51c8170a25b9223c057b48ccdc1589df2671b0a63909baaa5e19444c14ea2f48a239b985e27a8
+MISC ChangeLog 1380 SHA256 980d2f3db6239372b4046f12c90014ccf20cd14d09a8255681c2e0a311066744 SHA512 a15c3aea66b087e05e587b2900ba79a2cbdc8cf3fe60987fcba1aa61eb91b158271cb49f79555ce808149f08d7a54ff8388fac8d48361ea5b6b27ee93196c00d WHIRLPOOL 4eda329f9f0d117f9341c56bce2e0883355191fb4f503204f89ca5622efaf862f5bbb1f92c74701bb4cd7f19e86872279d22955d2272bd8b8de1afd87f46bcef
+MISC metadata.xml 1141 SHA256 e7b4a4d6dbcf38d35b9e08a8dec739410cb30f68230675a1b9adebd882b5d0bc SHA512 78b7c9c000139e5da0b82a2c68e819c0486b32f337a1acfaa4ebcdbcc26c15793004d85cfb186858b9c251f85d7f7f0103d604ee799786e8755fc2f3e07074c1 WHIRLPOOL 62876bc6daa8bf7e6a2525ff8eebb211600a36608a81f3d2cedd43fb8c00357113bbf4ab7fdd44fb5b1a21907ab11ce246633b727f6c2ff68658706a6f60b754
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREKAAYFAk/7Gi4ACgkQ1ycZbhPLE2DrOwCfZ9UX9g0NhglQahxZikSpIyNL
+yC0AnjEiPjgwj6vtYbt8bU3c7SGSBkwE
+=nvyN
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/dsdp/dsdp-5.8-r2.ebuild b/sci-libs/dsdp/dsdp-5.8-r2.ebuild
index 5c8a550e5091..50d1177f5323 100644
--- a/sci-libs/dsdp/dsdp-5.8-r2.ebuild
+++ b/sci-libs/dsdp/dsdp-5.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/dsdp/dsdp-5.8-r2.ebuild,v 1.2 2012/05/04 08:22:53 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/dsdp/dsdp-5.8-r2.ebuild,v 1.3 2012/07/09 17:51:33 bicatali Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.mcs.anl.gov/hs/software/DSDP//${MYP}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x86-linux ~x86-macos ~x64-macos"
 IUSE="doc examples"
 
 RDEPEND="virtual/lapack"
@@ -24,18 +24,21 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MYP}"
 
 make_shared_lib() {
-	local soname=$(basename "${1%.a}").so.$(get_major_version)
+	local soname=$(basename "${1%.a}")$(get_libname $(get_major_version))
 	einfo "Making ${soname}"
 	${2:-$(tc-getCC)} ${LDFLAGS}  \
 		-shared -Wl,-soname="${soname}" \
+		$([[ ${CHOST} == *-darwin* ]] && echo "-Wl,-install_name -Wl,${EPREFIX}/usr/$(get_libdir)/${soname}") \
 		-Wl,--whole-archive "${1}" -Wl,--no-whole-archive \
 		-o $(dirname "${1}")/"${soname}" \
 		-lm $(pkg-config --libs blas lapack) || return 1
+
 }
 
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-readsdpa.patch \
+		"${FILESDIR}"/${P}-malloc.patch \
 		"${FILESDIR}"/${P}-gold.patch
 	# to do proper parallel compilation
 	find . -name Makefile -exec \
@@ -61,8 +64,10 @@ src_test() {
 }
 
 src_install() {
-	dolib.so lib/lib${PN}.so.$(get_major_version)
-	dosym lib${PN}.so.$(get_major_version) /usr/$(get_libdir)/lib${PN}.so
+	dolib.so lib/lib${PN}$(get_libname $(get_major_version))
+	dosym lib${PN}$(get_libname $(get_major_version)) \
+		/usr/$(get_libdir)/lib${PN}$(get_libname)
+
 
 	insinto /usr/include
 	doins include/*.h src/sdp/*.h
diff --git a/sci-libs/dsdp/files/dsdp-5.8-malloc.patch b/sci-libs/dsdp/files/dsdp-5.8-malloc.patch
new file mode 100644
index 000000000000..48e067d1d898
--- /dev/null
+++ b/sci-libs/dsdp/files/dsdp-5.8-malloc.patch
@@ -0,0 +1,10 @@
+--- src/sys/dsdploginfo.c.orig	2012-04-04 09:59:25.212518434 +1200
++++ src/sys/dsdploginfo.c	2012-04-04 10:00:05.676522161 +1200
+@@ -6,7 +6,6 @@
+ #include <stdarg.h>
+ #include <sys/types.h>
+ #include <stdlib.h>
+-#include <malloc.h>
+ #include "dsdpsys.h"
+ #include "dsdpbasictypes.h"
+