Import fixes from science overlay, removed old

(Portage version: 2.2.01.20796-prefix/cvs/Linux x86_64)

11 files changed, 53 insertions, 452 deletions

diff --git a/sci-libs/scotch/ChangeLog b/sci-libs/scotch/ChangeLog
index ca9e0b08be18..4e9c98ba837e 100644
--- a/sci-libs/scotch/ChangeLog
+++ b/sci-libs/scotch/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/scotch
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scotch/ChangeLog,v 1.8 2012/08/03 14:54:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scotch/ChangeLog,v 1.9 2012/08/03 15:22:53 bicatali Exp $
+
+  03 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> -files/Makefile.inc.in,
+  -files/Makefile.inc_5.1.7, -files/metis-header.patch,
+  -files/respect-ldflags.patch, -files/shared-libs.patch,
+  -files/shared-libs_5.1.7.patch, -scotch-5.1.11.ebuild, -scotch-5.1.7.ebuild,
+  metadata.xml, scotch-5.1.12b.ebuild:
+  Import fixes from science overlay, removed old
 
   03 Aug 2012; Justin Lecher <jlec@gentoo.org> scotch-5.1.7.ebuild,
   scotch-5.1.11.ebuild, scotch-5.1.12b.ebuild, metadata.xml:
@@ -44,4 +51,3 @@
   +files/shared-libs.patch, +metadata.xml:
   Initial import of scotch, dependency of OpenFoam. Ebuild by Richard
   Westwell and Oliver Borm. Fixes #220823
-
diff --git a/sci-libs/scotch/files/Makefile.inc.in b/sci-libs/scotch/files/Makefile.inc.in
deleted file mode 100644
index f4d9cdfc9e7e..000000000000
--- a/sci-libs/scotch/files/Makefile.inc.in
+++ /dev/null
@@ -1,19 +0,0 @@
-EXE	=
-LIB	= .a
-OBJ	= .o
-
-AR	= @AR@
-ARFLAGS	= -ruv
-CAT	= cat
-CCS	= @CC@
-CCP     = mpicc
-CCD     = @CC@
-CFLAGS	= @CFLAGS@ -pthread $(PICFLAGS) -Drestrict=__restrict -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_PTHREAD -DSCOTCH_RENAME
-LIBS	= -lz -lm -lrt
-CP	= cp
-LEX	= flex
-LN	= ln
-MKDIR	= mkdir
-MV	= mv
-RANLIB	= @RANLIB@
-YACC	= bison -y
diff --git a/sci-libs/scotch/files/Makefile.inc_5.1.7 b/sci-libs/scotch/files/Makefile.inc_5.1.7
deleted file mode 100644
index 9121528e7835..000000000000
--- a/sci-libs/scotch/files/Makefile.inc_5.1.7
+++ /dev/null
@@ -1,20 +0,0 @@
-EXE	=
-LIB	= .a
-OBJ	= .o
-
-MAKE	= make
-AR	= ar
-ARFLAGS	= -ruv
-CAT	= cat
-CCS	= gcc
-CCP     = mpicc
-CCD     = gcc
-CFLAGS	= -O3 -fPIC -Drestrict=__restrict -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_PTHREAD -DSCOTCH_RENAME
-LDFLAGS	= -lz -lm -lrt
-CP	= cp
-LEX	= flex
-LN	= ln
-MKDIR	= mkdir
-MV	= mv
-RANLIB	= ranlib
-YACC	= bison -y
diff --git a/sci-libs/scotch/files/metis-header.patch b/sci-libs/scotch/files/metis-header.patch
deleted file mode 100644
index 676858373287..000000000000
--- a/sci-libs/scotch/files/metis-header.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
-@@ -55,6 +55,8 @@
- /**                                                        **/
- /************************************************************/
- 
-+typedef int idxtype;
-+
- /*
- **  The function prototypes.
- */
diff --git a/sci-libs/scotch/files/respect-ldflags.patch b/sci-libs/scotch/files/respect-ldflags.patch
deleted file mode 100644
index 74860051c6ee..000000000000
--- a/sci-libs/scotch/files/respect-ldflags.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -Nur src.orig/esmumps/Makefile src/esmumps/Makefile
---- src.orig/esmumps/Makefile	2011-03-04 21:33:24.000000000 +0000
-+++ src/esmumps/Makefile	2011-03-04 23:38:01.000000000 +0000
-@@ -44,7 +44,7 @@
- 				$(CC) $(CFLAGS) $(CLIBFLAGS) -I$(includedir) -c $(<) -o $(@)
- 
- %$(EXE)	:	%.c
--		 		$(CC) $(CFLAGS) -I$(includedir) $(<) -o $(@) -L$(libdir) $(LDFLAGS) -L. -l$(ESMUMPSLIB) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit
-+		 		$(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) $(<) -L$(libdir) -L. -l$(ESMUMPSLIB) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LIBS) -o $(@)
- 
- ##
- ##  Project rules.
-@@ -57,9 +57,10 @@
- 					libesmumps$(LIB)							\
- 					main_esmumps$(EXE)
- 
--ptscotch			:	clean
-+ptscotch			:	clean common.h
-+					$(MAKE) CFLAGS="$(CFLAGS) -DSCOTCH_PTSCOTCH" CC=$(CCP) SCOTCHLIB=ptscotch ESMUMPSLIB=ptesmumps	\
-+					 libesmumps$(LIB);
- 					$(MAKE) CFLAGS="$(CFLAGS) -DSCOTCH_PTSCOTCH" CC=$(CCP) SCOTCHLIB=ptscotch ESMUMPSLIB=ptesmumps	\
--					libesmumps$(LIB)										\
- 					main_esmumps$(EXE)
- 
- install				:
-diff -Nur src.orig/libscotch/Makefile src/libscotch/Makefile
---- src.orig/libscotch/Makefile	2011-03-04 21:33:24.000000000 +0000
-+++ src/libscotch/Makefile	2011-03-04 21:55:27.000000000 +0000
-@@ -43,7 +43,7 @@
- 				$(CC) $(CFLAGS) $(CLIBFLAGS) -c $(<) -o $(@)
- 
- %$(EXE)	:	%.c
--		 		$(CC) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS)
-+		 		$(CC) $(CFLAGS) $(LDFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) $(LIBS) -o $(@)
- 
- ##
- ##  Project rules.
-@@ -2515,7 +2515,7 @@
- 					mapping.h				\
- 					order.h					\
- 					parser.h
--			 		$(CCD) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS)
-+			 		$(CCD) $(CFLAGS) $(LDLFAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LIBS)
- 
- scotch.h			:	dummysizes$(EXE)			\
- 					library.h
-diff -Nur src.orig/libscotchmetis/Makefile src/libscotchmetis/Makefile
---- src.orig/libscotchmetis/Makefile	2011-03-04 21:33:24.000000000 +0000
-+++ src/libscotchmetis/Makefile	2011-03-04 21:56:06.000000000 +0000
-@@ -44,7 +44,7 @@
- 				$(CC) $(CFLAGS) $(CLIBFLAGS) -I$(includedir) -I../libscotch -c $(<) -o $(@)
- 
- %$(EXE)	:	%.c
--		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) $(LDFLAGS)
-+		 		$(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) $(LIBS) -o $(@)
- 
- ##
- ##  Project rules.
-diff -Nur src.orig/scotch/Makefile src/scotch/Makefile
---- src.orig/scotch/Makefile	2011-03-04 21:33:24.000000000 +0000
-+++ src/scotch/Makefile	2011-03-04 21:58:59.000000000 +0000
-@@ -41,13 +41,13 @@
- include ../Makefile.inc
- 
- %$(EXE)	:	%$(OBJ)
--		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS)
-+		 		$(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LIBS) -o $(@)
- 
- %$(OBJ)	:	%.c
- 				$(CC) $(CFLAGS) -I$(includedir) -I../libscotch -c $(<) -o $(@)
- 
- %$(EXE)	:	%.c
--		 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS)
-+		 		$(CC) $(CFLAGS) $(LDFLAGS) -I$(includedir) -I../libscotch $(<) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LIBS) -o $(@)
- 
- ##
- ##  Project rules.
-@@ -314,7 +314,7 @@
- 					gout_o.c				\
- 					$(includedir)/scotch.h			\
- 					$(libdir)/libscotch$(LIB)
--					$(CC) $(CFLAGS) -I../libscotch -I$(includedir) gout_c.c gout_o.c -o $(@) -L$(libdir) -lscotch -lscotcherrexit $(LDFLAGS)
-+					$(CC) $(CFLAGS) $(LDFLAGS) -I../libscotch -I$(includedir) gout_c.c gout_o.c -L$(libdir) -lscotch -lscotcherrexit $(LIBS) -o $(@)
- 
- gpart$(EXE)			:	gmap$(EXE)
- 					-$(RM) gpart$(EXE)
diff --git a/sci-libs/scotch/files/shared-libs.patch b/sci-libs/scotch/files/shared-libs.patch
deleted file mode 100644
index fc5e9cda3e61..000000000000
--- a/sci-libs/scotch/files/shared-libs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- scotch-5.1.6.dfsg/src/libscotch/Makefile~	2008-05-29 09:01:12.000000000 +0000
-+++ scotch-5.1.6.dfsg/src/libscotch/Makefile	2008-07-21 14:34:37.000000000 +0000
-@@ -55,8 +55,8 @@
- 					$(MAKE) SCOTCHLIB=scotch		\
- 					scotch.h				\
- 					scotchf.h				\
--					libscotch$(LIB)				\
- 					libscotcherr$(LIB)			\
-+					libscotch$(LIB)				\
- 					libscotcherrexit$(LIB)
- 
- ptscotch			:	clean
-@@ -2127,6 +2127,8 @@
- 					vmesh_separate_zr$(OBJ)			\
- 					vmesh_separate_st$(OBJ)			\
- 					vmesh_store$(OBJ)
-+					$(CC) -shared -Wl,-soname,lib$(SCOTCHLIB)-5.1.so -L. -lscotcherr -lz -lpthread -lm -lrt -o lib$(SCOTCHLIB)-5.1.so $^
-+					ln -s lib$(SCOTCHLIB)-5.1.so lib$(SCOTCHLIB).so 
- 					$(AR) $(ARFLAGS) lib$(SCOTCHLIB)$(LIB) $(?)
- 					-$(RANLIB) lib$(SCOTCHLIB)$(LIB)
- 
-@@ -2139,9 +2141,13 @@
- 					-$(RANLIB) $(@)
- 
- libscotcherr$(LIB)		:	library_error$(OBJ)
-+					$(CC) -shared -Wl,-soname,libscotcherr-5.1.so -o libscotcherr-5.1.so $^
-+					ln -s libscotcherr-5.1.so libscotcherr.so 
- 					$(AR) $(ARFLAGS) $(@) $(?)
- 					-$(RANLIB) $(@)
- 
- libscotcherrexit$(LIB)		:	library_error_exit$(OBJ)
-+					$(CC) -shared -Wl,-soname,libscotcherrexit-5.1.so -o libscotcherrexit-5.1.so $^
-+					ln -s libscotcherrexit-5.1.so libscotcherrexit.so 
- 					$(AR) $(ARFLAGS) $(@) $(?)
- 					-$(RANLIB) $(@)
---- scotch-5.0.6.dfsg/src/libscotchmetis/Makefile~	2008-05-07 16:23:07.000000000 +0000
-+++ scotch-5.0.6.dfsg/src/libscotchmetis/Makefile	2008-07-18 19:45:15.000000000 +0000
-@@ -120,5 +120,7 @@
- 					metis_graph_order_f$(OBJ)		\
- 					metis_graph_part$(OBJ)			\
- 					metis_graph_part_f$(OBJ)
-+					$(CC) -shared -Wl,-soname,libscotchmetis-5.1.so -L../libscotch -lscotch -o libscotchmetis-5.1.so $^
-+					ln -s libscotchmetis-5.1.so libscotchmetis.so 
- 					$(AR) $(ARFLAGS) $(@) $(^)
- 					-$(RANLIB) $(@)
diff --git a/sci-libs/scotch/files/shared-libs_5.1.7.patch b/sci-libs/scotch/files/shared-libs_5.1.7.patch
deleted file mode 100644
index edc60a16efc1..000000000000
--- a/sci-libs/scotch/files/shared-libs_5.1.7.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- scotch-5.1.6.dfsg/src/libscotch/Makefile~	2008-05-29 09:01:12.000000000 +0000
-+++ scotch-5.1.6.dfsg/src/libscotch/Makefile	2008-07-21 14:34:37.000000000 +0000
-@@ -55,8 +55,8 @@
- 					$(MAKE) CC="$(CCS)" CCD="$(CCS)" SCOTCHLIB=scotch	\
- 					scotch.h						\
- 					scotchf.h						\
--					libscotch$(LIB)						\
- 					libscotcherr$(LIB)					\
-+					libscotch$(LIB)						\
- 					libscotcherrexit$(LIB)
- 
- ptscotch			:	clean
-@@ -2275,6 +2275,8 @@
- 					vmesh_separate_zr$(OBJ)			\
- 					vmesh_separate_st$(OBJ)			\
- 					vmesh_store$(OBJ)
-+					$(CC) -shared -Wl,-soname,lib$(SCOTCHLIB)-5.1.so -L. -lscotcherr -lz -lpthread -lm -lrt -o lib$(SCOTCHLIB)-5.1.so $^
-+					ln -s lib$(SCOTCHLIB)-5.1.so lib$(SCOTCHLIB).so 
- 					$(AR) $(ARFLAGS) lib$(SCOTCHLIB)$(LIB) $(?)
- 					-$(RANLIB) lib$(SCOTCHLIB)$(LIB)
- 
-@@ -2438,9 +2440,13 @@
- 					-$(RANLIB) $(@)
- 
- libscotcherr$(LIB)		:	library_error$(OBJ)
-+					$(CC) -shared -Wl,-soname,libscotcherr-5.1.so -o libscotcherr-5.1.so $^
-+					ln -s libscotcherr-5.1.so libscotcherr.so 
- 					$(AR) $(ARFLAGS) $(@) $(?)
- 					-$(RANLIB) $(@)
- 
- libscotcherrexit$(LIB)		:	library_error_exit$(OBJ)
-+					$(CC) -shared -Wl,-soname,libscotcherrexit-5.1.so -o libscotcherrexit-5.1.so $^
-+					ln -s libscotcherrexit-5.1.so libscotcherrexit.so 
- 					$(AR) $(ARFLAGS) $(@) $(?)
- 					-$(RANLIB) $(@)
---- scotch-5.0.6.dfsg/src/libscotchmetis/Makefile~	2008-05-07 16:23:07.000000000 +0000
-+++ scotch-5.0.6.dfsg/src/libscotchmetis/Makefile	2008-07-18 19:45:15.000000000 +0000
-@@ -136,5 +136,7 @@
- 					metis_graph_order_f$(OBJ)		\
- 					metis_graph_part$(OBJ)			\
- 					metis_graph_part_f$(OBJ)
-+					$(CC) -shared -Wl,-soname,libscotchmetis-5.1.so -L../libscotch -lscotch -o libscotchmetis-5.1.so $^
-+					ln -s libscotchmetis-5.1.so libscotchmetis.so 
- 					$(AR) $(ARFLAGS) $(@) $(^)
- 					-$(RANLIB) $(@)
diff --git a/sci-libs/scotch/metadata.xml b/sci-libs/scotch/metadata.xml
index 35c0f4ba3172..257167d85e3a 100644
--- a/sci-libs/scotch/metadata.xml
+++ b/sci-libs/scotch/metadata.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<maintainer>
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
-	<maintainer>
-		<email>oli.borm@web.de</email>
-		<name>Oliver Borm</name>
-	</maintainer>
-	<use>
-		<flag name="int64">Build the 64 bits integer library (needed for &gt; 2^31 vertices)</flag>
-		<flag name="tools">Build and install extra exec tools</flag>
-	</use>
-	<longdescription lang="en">
+<herd>sci</herd>
+<maintainer>
+  <email>patrick@gentoo.org</email>
+  <name>Patrick Lauer</name>
+</maintainer>
+<maintainer>
+  <email>oli.borm@web.de</email>
+  <name>Oliver Borm</name>
+</maintainer>
+<use>
+  <flag name="int64">Build the 64 bits integer library (needed for &gt; 2^31 vertices)</flag>
+  <flag name="tools">Build and install extra exec tools</flag>
+</use>
+<longdescription lang="en">
   SCOTCH is a software package and libraries for graph, mesh and
   hypergraph partitioning, static mapping, and sparse matrix block
   ordering.
diff --git a/sci-libs/scotch/scotch-5.1.11.ebuild b/sci-libs/scotch/scotch-5.1.11.ebuild
deleted file mode 100644
index 9d1be154f3bd..000000000000
--- a/sci-libs/scotch/scotch-5.1.11.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scotch/scotch-5.1.11.ebuild,v 1.4 2012/08/03 14:54:44 jlec Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs versionator multilib
-
-# use esmumps version to allow linking with mumps
-MYP="${PN}_${PV}_esmumps"
-# download id on gforge changes every goddamn release
-DID=28044
-
-DESCRIPTION="Software for graph, mesh and hypergraph partitioning"
-HOMEPAGE="http://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/"
-SRC_URI="http://gforge.inria.fr/frs/download.php/${DID}/${MYP}.tgz"
-
-LICENSE="CeCILL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples mpi static-libs"
-
-RDEPEND="
-	sys-libs/zlib
-	mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
-	sys-devel/bison"
-
-S="${WORKDIR}/${MYP}/src"
-
-make_shared_lib() {
-	local soname=$(basename "${1%.a}").so.$(get_major_version)
-	einfo "Making ${soname}"
-	${2:-$(tc-getCC)} ${LDFLAGS}  \
-		-shared -Wl,-soname="${soname}" \
-		-Wl,--whole-archive "${1}" -Wl,--no-whole-archive \
-		-lz -lm -lrt -o $(dirname "${1}")/"${soname}" || return 1
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/metis-header.patch \
-		"${FILESDIR}"/respect-ldflags.patch
-	sed \
-		-e "s/@CFLAGS@/${CFLAGS}/" \
-		-e "s/@CC@/$(tc-getCC)/" \
-		-e "s/@AR@/$(tc-getAR)/" \
-		-e "s/@RANLIB@/$(tc-getRANLIB)/" \
-		"${FILESDIR}"/Makefile.inc.in > Makefile.inc || die
-}
-
-src_compile() {
-	emake PICFLAGS=-fPIC
-	local lib
-	for lib in $(find . -name lib\*.a); do
-		make_shared_lib ${lib} || die "shared ${lib} failed"
-	done
-	if use mpi; then
-		emake PICFLAGS=-fPIC ptscotch
-		for lib in $(find . -name libpt\*.a); do
-			make_shared_lib ${lib} mpicc || die "shared ${lib} failed"
-		done
-	fi
-	if use static-libs; then
-		emake clean
-		emake
-		use mpi && emake ptscotch
-	fi
-}
-
-src_install() {
-	cd ..
-	local l b m
-	for l in $(find . -name \*.so.\*); do
-		dolib.so ${l}
-		dosym $(basename ${l}) /usr/$(get_libdir)/$(basename ${l%.*})
-	done
-	use static-libs && dolib.a $(find . -name \*.a)
-
-	pushd bin > /dev/null
-	for b in *; do
-		newbin ${b} scotch_${b}
-	done
-	popd
-
-	pushd man/man1 > /dev/null
-	for m in *; do
-		newman ${m} scotch_${m}
-	done
-	popd > /dev/null
-
-	insinto /usr/include/scotch
-	doins include/*
-
-	dodoc README.txt
-
-	use doc && dodoc doc/*.pdf
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/* tgt grf
-	fi
-}
diff --git a/sci-libs/scotch/scotch-5.1.12b.ebuild b/sci-libs/scotch/scotch-5.1.12b.ebuild
index fbb3b9679386..081a82a6f44a 100644
--- a/sci-libs/scotch/scotch-5.1.12b.ebuild
+++ b/sci-libs/scotch/scotch-5.1.12b.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/scotch/scotch-5.1.12b.ebuild,v 1.2 2012/08/03 14:54:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scotch/scotch-5.1.12b.ebuild,v 1.3 2012/08/03 15:22:53 bicatali Exp $
 
 EAPI=4
 
@@ -19,7 +19,7 @@ SRC_URI="http://dev.gentooexperimental.org/~patrick/${MYP}.tar.gz"
 
 LICENSE="CeCILL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples int64 mpi static-libs tools"
 
 DEPEND="sys-libs/zlib
@@ -28,34 +28,33 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MYP/b}"
 
-LIBVER=$(get_major_version)
-make_shared_lib() {
-	local libstatic=${1}
+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
-		local dylibname=$(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=$(basename "${1%.a}").so.${LIBVER}
-		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%.*}"
+			-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
 }
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-as-needed.patch
-	sed \
-		-e "s/gcc/$(tc-getCC)/" \
-		-e "s/-O3/${CFLAGS}/" \
+	sed -e "s/gcc/$(tc-getCC)/" \
+		-e "s/-O3/${CFLAGS} -pthread/" \
 		-e "s/ ar/ $(tc-getAR)/" \
 		-e "s/ranlib/$(tc-getRANLIB)/" \
 		src/Make.inc/Makefile.inc.i686_pc_linux2 > src/Makefile.inc || die
@@ -64,20 +63,20 @@ src_prepare() {
 
 src_compile() {
 	emake -C src CLIBFLAGS=-fPIC
-	make_shared_lib lib/libscotcherr.a
-	make_shared_lib lib/libscotcherrexit.a
-	make_shared_lib lib/libscotch.a -Llib -lz -lm -lrt -lscotcherr
-	make_shared_lib lib/libesmumps.a -Llib -lscotch
-	make_shared_lib lib/libscotchmetis.a -Llib -lscotch
+	static_to_shared lib/libscotcherr.a
+	static_to_shared lib/libscotcherrexit.a
+	static_to_shared lib/libscotch.a -Llib -lz -lm -lrt -lscotcherr
+	static_to_shared lib/libesmumps.a -Llib -lscotch
+	static_to_shared lib/libscotchmetis.a -Llib -lscotch
 
 	if use mpi; then
 		emake -C src CLIBFLAGS=-fPIC ptscotch
 		export LINK=mpicc
-		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
+		static_to_shared lib/libptscotcherr.a
+		static_to_shared lib/libptscotcherrexit.a
+		static_to_shared lib/libptscotch.a -Llib -lptscotcherr -lz -lm -lrt
+		static_to_shared lib/libptesmumps.a -Llib -lptscotch
+		static_to_shared lib/libptscotchparmetis.a -Llib -lptscotch
 	fi
 	if use static-libs; then
 		emake -C src clean
@@ -87,7 +86,7 @@ src_compile() {
 }
 
 src_install() {
-	dolib.so lib/*.so*
+	dolib.so lib/lib*$(get_libname)*
 	use static-libs && dolib.a lib/*.a
 
 	insinto /usr/include/scotch
diff --git a/sci-libs/scotch/scotch-5.1.7.ebuild b/sci-libs/scotch/scotch-5.1.7.ebuild
deleted file mode 100644
index 7150e553683a..000000000000
--- a/sci-libs/scotch/scotch-5.1.7.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scotch/scotch-5.1.7.ebuild,v 1.3 2012/08/03 14:54:44 jlec Exp $
-
-EAPI=3
-
-inherit eutils multilib
-
-DESCRIPTION="Software for graph, mesh and hypergraph partitioning"
-HOMEPAGE="http://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/"
-SRC_URI="http://gforge.inria.fr/frs/download.php/23390/${PN}_${PV}.tgz"
-
-LICENSE="CeCILL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mpi"
-
-RDEPEND="mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
-	sys-devel/bison"
-
-S=${WORKDIR}"/scotch_5.1/src"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/shared-libs_${PV}.patch \
-		"${FILESDIR}"/metis-header.patch
-}
-
-src_configure() {
-	cp "${FILESDIR}"/Makefile.inc_${PV} ./Makefile.inc
-}
-
-src_compile() {
-	emake -j1 || die "make failed"
-	use mpi && emake -j1 ptscotch || die "make failed"
-}
-
-src_install() {
-	dodir "/usr"
-	emake prefix="${D}/usr" install
-
-	use mpi && dobin "${S}"/../bin/{dgord,dgscat,dgtst}
-
-	for file in `ls "${D}"/usr/bin`
-	do
-		mv "${D}/usr/bin/$file" "${D}/usr/bin/scotch_$file"
-	done
-
-	for file in `ls "${D}"/usr/share/man/man1`
-	do
-		mv "${D}/usr/share/man/man1/$file" "${D}/usr/share/man/man1/scotch_$file"
-	done
-
-	dolib.so "${S}"/{libscotch,libscotchmetis}/*.so
-	if [ "$(get_libdir)" != "lib" ]; then
-		mv "${D}"/usr/lib/* "${D}"/usr/$(get_libdir)
-		rm -rf "${D}"/usr/lib
-	fi
-
-	insinto /usr/include/scotch
-	doins "${S}"/libscotch/*.h
-
-	insinto /usr/include/scotchmetis
-	doins "${S}"/libscotchmetis/*.h
-
-	mv "${D}"/usr/include/*scotch*.h "${D}"/usr/include/scotch/
-
-	insinto "/usr/share/${PN}/tgt"
-	doins "${S}"/../tgt/*
-	insinto "/usr/share/${PN}/grf"
-	doins "${S}"/../grf/*
-
-	cd "${S}/../doc"
-	dodoc *.pdf
-}