fixed shared libs. cleaning

4 files changed, 30 insertions, 26 deletions

diff --git a/sci-libs/scotch/ChangeLog b/sci-libs/scotch/ChangeLog
index 5b92419..95573ce 100644
--- a/sci-libs/scotch/ChangeLog
+++ b/sci-libs/scotch/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-libs/scotch/ChangeLog,v 1.5 2011/05/17 10:08:20 xarthisius Exp $
 
+  01 Jun 2011; Sébastien Fabbro <bicatali@gentoo.org> scotch-5.1.11-r1.ebuild,
+  files/metis-header.patch:
+  Fixed shared libs and cleaning.
+
 *scotch-5.1.11-r1 (23 May 2011)
 
   23 May 2011; Sébastien Fabbro <bicatali@gentoo.org>
diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest
index 18fdc22..9c9a396 100644
--- a/sci-libs/scotch/Manifest
+++ b/sci-libs/scotch/Manifest
@@ -1,7 +1,7 @@
 AUX Makefile.inc.in 369 RMD160 3261d40521cff31e0f6a4c20799578145eb7a570 SHA1 4e616420e499c7993f673f3df3519c3883f7c94f SHA256 d31c8abd49e662b0bb6af56602277e3d70c2274c9ce19110967c93539032178d
-AUX metis-header.patch 381 RMD160 f364262003c72bd6f6614f0d2dae8f3be4495f2f SHA1 52ade3b7948c933f713602d39ddca88e6bb9eebe SHA256 271fe884e6a8eb423f89dbbb1fc9a73f742526d76233b1f81ab9b8d0b7d27091
+AUX metis-header.patch 345 RMD160 d7201cb05518a9c4cedcc34d327dd08dd6d17cd7 SHA1 ad01b424169b68dfabbaeefd4baa47ffef725a1a SHA256 a1928acae74c5f8bfd3201d8b9f4be445f670fdd48fe1a69bb700a9f3b98e851
 AUX respect-ldflags.patch 3867 RMD160 87a069731aa5a6a15ba892d1333419c0cc6fbcc5 SHA1 add77e8e11604adb2461112117c858b429d0d1e3 SHA256 b277e980cc6e671604dae0e5a4cba28255a786b4294f800ec20ca88d10d8aa49
 DIST scotch_5.1.11_esmumps.tgz 3952439 RMD160 f8db2bb02cbdadb7e02782daccddcdc4cdec4cac SHA1 b62501e0bf7fd24af3712647578b3e764f166287 SHA256 595ccc664ba070264b851a27b7860042a6bc716d6aade93e0909619decfabc92
-EBUILD scotch-5.1.11-r1.ebuild 3848 RMD160 b119c6c794de32b247faaff044072fed5ba46034 SHA1 b11afe91693694eaccc39b93df9033a6388c4f39 SHA256 b8fd090acaed19932c0ecb6c971a372f5ea477f808e0f5f4e776cb3e7715514d
-MISC ChangeLog 1652 RMD160 5963ad94730256f2f101297b64cb84515c7a5eaa SHA1 a36592fd16555697ee2598b78b56a5c4baf144f6 SHA256 cfdf9f9005e6ce68df603c126dbf55897ee1bf1226ff89165a2f454d15f0cbb1
+EBUILD scotch-5.1.11-r1.ebuild 3763 RMD160 1b4d147e9d375f266878c07a84e8715c192687d7 SHA1 386de77aa59c4edc1e3f026f36cdc486b3e6be71 SHA256 4f7dc5546011bb0f1a604c8f5b7389ce1daac5d807ed00a7f02f2499b38f93f2
+MISC ChangeLog 1795 RMD160 2dcf18a7eb653a84ad4f4a5f78b6b6de98c5ba72 SHA1 4eed85e096a9d31d8db63aee1ac1b016b4659bd9 SHA256 2848dac6f6a64d028477be7c97b30c866e8c8647fef3065435b02ced165f8a7c
 MISC metadata.xml 1007 RMD160 1ef66d65ea2ff3022b287a12a26e1b08360390ff SHA1 5e624702b7ead9d165c0c698c77d76306439020c SHA256 fd9d3ef83d702452fa572e5ff3217f42819579e3510dbad5fac4081b07cb5d16
diff --git a/sci-libs/scotch/files/metis-header.patch b/sci-libs/scotch/files/metis-header.patch
index 6768583..8d1e233 100644
--- a/sci-libs/scotch/files/metis-header.patch
+++ b/sci-libs/scotch/files/metis-header.patch
@@ -1,5 +1,5 @@
---- scotch-5.1.6.dfsg/src/libscotchmetis/metis.h~	2007-09-03 11:14:42.000000000 -0400
-+++ scotch-5.1.6.dfsg/src/libscotchmetis/metis.h	2008-08-26 15:09:30.000000000 -0400
+--- src/libscotchmetis/metis.h~	2007-09-03 11:14:42.000000000 -0400
++++ src/libscotchmetis/metis.h	2008-08-26 15:09:30.000000000 -0400
 @@ -55,6 +55,8 @@
  /**                                                        **/
  /************************************************************/
diff --git a/sci-libs/scotch/scotch-5.1.11-r1.ebuild b/sci-libs/scotch/scotch-5.1.11-r1.ebuild
index 210e339..f637117 100644
--- a/sci-libs/scotch/scotch-5.1.11-r1.ebuild
+++ b/sci-libs/scotch/scotch-5.1.11-r1.ebuild
@@ -25,7 +25,7 @@ DEPEND="sys-devel/bison
 	mpi? ( virtual/mpi )"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MYP}/src"
+S="${WORKDIR}/${MYP}"
 
 make_shared_lib() {
 	local libstatic=${1}
@@ -45,41 +45,40 @@ src_prepare() {
 		-e "s/@CC@/$(tc-getCC)/" \
 		-e "s/@AR@/$(tc-getAR)/" \
 		-e "s/@RANLIB@/$(tc-getRANLIB)/" \
-		"${FILESDIR}"/Makefile.inc.in > Makefile.inc || die
+		"${FILESDIR}"/Makefile.inc.in > src/Makefile.inc || die
 }
 
 src_compile() {
-	emake PICFLAGS=-fPIC
-	make_shared_lib libscotch/libscotcherr.a
-	make_shared_lib libscotch/libscotcherrexit.a
-	make_shared_lib libscotch/libscotch.a -L. -lscotcherr -lz -lm -lrt
-	make_shared_lib esmumps/libesmumps.a -Llibscotch -lscotch
-	make_shared_lib libscotchmetis/libscotchmetis.a -Llibscotch -lscotch
+	emake -C src PICFLAGS=-fPIC
+	make_shared_lib lib/libscotcherr.a
+	make_shared_lib lib/libscotcherrexit.a
+	make_shared_lib lib/libscotch.a -Llib -lscotcherr -lz -lm -lrt
+	make_shared_lib lib/libesmumps.a -Llib -lscotch
+	make_shared_lib lib/libscotchmetis.a -Llib -lscotch
 
 	if use mpi; then
-		emake PICFLAGS=-fPIC ptscotch
+		emake -C src PICFLAGS=-fPIC ptscotch
 		export LINK=mpicc
-		make_shared_lib libscotch/libptscotcherr.a
-		make_shared_lib libscotch/libptscotcherrexit.a
-		make_shared_lib libscotch/libptscotch.a -Llibscotch -lptscotcherr -lz -lm -lrt
-		make_shared_lib esmumps/libptesmumps.a -Llibscotch -lptscotch
-		make_shared_lib libscotchmetis/libptscotchparmetis.a -Llibscotch -lptscotch
+		make_shared_lib lib/libptscotcherr.a
+		make_shared_lib lib/libptscotcherrexit.a
+		make_shared_lib lib/libptscotch.a -Llib -lptscotcherr -lz -lm -lrt
+		make_shared_lib lib/libptesmumps.a -Llib -lptscotch
+		make_shared_lib lib/libptscotchparmetis.a -Llib -lptscotch
 	fi
 	if use static-libs; then
-		emake clean
-		emake
-		use mpi && emake ptscotch
+		emake -C src clean
+		emake -C src
+		use mpi && emake -C src ptscotch
 	fi
 }
 
 src_install() {
-	cd ..
-	local l b m
-	for l in $(find . -name \*.so.\*); do
+	local l
+	for l in lib/*.so.*; do
 		dolib.so ${l}
 		dosym $(basename ${l}) /usr/$(get_libdir)/$(basename ${l%.*})
 	done
-	use static-libs && dolib.a $(find . -name \*.a)
+	use static-libs && dolib.a lib/*.a
 
 	insinto /usr/include/scotch
 	doins include/*
@@ -120,6 +119,7 @@ src_install() {
 	dodoc README.txt
 
 	if use tools; then
+		local b m
 		pushd bin > /dev/null
 		for b in *; do
 			newbin ${b} scotch_${b}