Bump, thanks to Oliver Borm. Fixes #301012 and #297656

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

5 files changed, 153 insertions, 3 deletions

diff --git a/sci-libs/scotch/ChangeLog b/sci-libs/scotch/ChangeLog
index a8d254463afb..1350a8daa082 100644
--- a/sci-libs/scotch/ChangeLog
+++ b/sci-libs/scotch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/scotch
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scotch/ChangeLog,v 1.1 2009/09/03 16:58:50 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scotch/ChangeLog,v 1.2 2010/01/15 22:43:52 patrick Exp $
+
+*scotch-5.1.7 (15 Jan 2010)
+
+  15 Jan 2010; Patrick Lauer <pal@gentoo.org> +scotch-5.1.7.ebuild,
+  +files/Makefile.inc_5.1.7, +files/shared-libs_5.1.7.patch:
+  Bump, thanks to Oliver Borm. Fixes #301012 and #297656
 
 *scotch-5.1.6 (03 Sep 2009)
 
diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest
index 1ef70f900a35..c83cdd8ba6f2 100644
--- a/sci-libs/scotch/Manifest
+++ b/sci-libs/scotch/Manifest
@@ -1,8 +1,12 @@
 AUX Makefile.inc 334 RMD160 5830a8b6ac25318a3de9ed626df24bc1e19f71e1 SHA1 9897bc6257429ca37361998ffe05f6f29336ff2c SHA256 d442ce39a336e5544ff97189a391fdbe46426de030633f01033c602c174d5824
+AUX Makefile.inc_5.1.7 358 RMD160 5c57b2912e1a999f340edc7baf3a8a093fe05cba SHA1 b0eb5cb80f53b3c78a533e4610df4ec952a94a6d SHA256 395539dc772f6cbd05d43f9b591be917657ccfdd9cea44b14403f6b54b4f3690
 AUX metis-header.patch 381 RMD160 f364262003c72bd6f6614f0d2dae8f3be4495f2f SHA1 52ade3b7948c933f713602d39ddca88e6bb9eebe SHA256 271fe884e6a8eb423f89dbbb1fc9a73f742526d76233b1f81ab9b8d0b7d27091
 AUX mmkt-typo.patch 569 RMD160 0359f562cf127abbdda857a4db9c04ed4c9e916c SHA1 cfc7e00b0c62f7e96cf7e3eb6df27e17f347945f SHA256 f00596e95e511095a1c869d3f33c10310d84b8f12f0af7af7e699480edce4448
 AUX shared-libs.patch 1803 RMD160 206c811dffbb0a46cbaba3e46884dc47746d7c0c SHA1 95c9b0349f6d7cc301c80588373d6a148f9f8fdc SHA256 faf1c70f37d1e2e258c3f8b1da9399ad19280b26c2f963d26e57b62c72f4521c
+AUX shared-libs_5.1.7.patch 1837 RMD160 923eaa8207875961ed9ca12886dfbaf72845dfa2 SHA1 f2312a488b9bb8e3a0f65c7f73b54229f8d81573 SHA256 21faebd6ddd3248dee0af3e184bf5343d9ce398cf412d0079e500dd5dec6205e
 DIST scotch_5.1.6.tgz 3480891 RMD160 d4fad76ae6c420b9524243d79c8361007a310fbd SHA1 940e4aabfa5fed8288c291fe9328d8b63cc10b0b SHA256 ee714ee7d6c3353ff4dab587d6a976bd4a4d09a25da0eb83430633d8c6c8c8ff
+DIST scotch_5.1.7.tgz 3733642 RMD160 3424d4386dc257cabae46a2a55081162a8e41e4a SHA1 45be932de03d9a404d83b577346d2e63d856d7c7 SHA256 51ac6046eec0229ac257969a44926b87e0f4eec0a4ca1ad7f3e287be40070a2d
 EBUILD scotch-5.1.6.ebuild 1570 RMD160 850075017f74000bf3e90014df1b344521d977c9 SHA1 2cfa35318ef6545e7ec92f0be6d1b37d1141dd24 SHA256 d4a7947e0c1113bd0dac883c545258703d1bfce7303c612429727b2c199185c4
-MISC ChangeLog 535 RMD160 e007f9e19c13cbba9d31dddae98c1d5c5751b11b SHA1 e96613c57f6d3195407ce795d2843418dd8bdbc6 SHA256 dd23ea1dbc171fd618f3a8b223821cab7f517d89f0734a5f4247197a252d0b64
+EBUILD scotch-5.1.7.ebuild 1790 RMD160 e323b1685ff537c833fd5811a82e728e0a5b23ee SHA1 41731ff01c3744a56c41b9df57860dd82dc9d0c8 SHA256 58698f935a664ff893e124fb9930e43774175b8995421af6b9631b021b6bcf3f
+MISC ChangeLog 751 RMD160 c726094578f56f3ff63bd2a4be53a4e84b5ff725 SHA1 a60f47f2290656fdf500d9638968d3cc6cdbf4b4 SHA256 bcce83700864da6245a3735e6ed27d20286018d0f92ba29867e2de07689b2a28
 MISC metadata.xml 342 RMD160 bba0c7eb3af0d1cd2322a40e86f4a80a0f48b6cf SHA1 7950d74b3d7d4fbe7167b487c5cd26559548b4ab SHA256 b57f05d81648f5a92cedd91c025852cb3bc5fc8d4ab4d110eb6886fc89e2ba97
diff --git a/sci-libs/scotch/files/Makefile.inc_5.1.7 b/sci-libs/scotch/files/Makefile.inc_5.1.7
new file mode 100644
index 000000000000..9121528e7835
--- /dev/null
+++ b/sci-libs/scotch/files/Makefile.inc_5.1.7
@@ -0,0 +1,20 @@
+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/shared-libs_5.1.7.patch b/sci-libs/scotch/files/shared-libs_5.1.7.patch
new file mode 100644
index 000000000000..edc60a16efc1
--- /dev/null
+++ b/sci-libs/scotch/files/shared-libs_5.1.7.patch
@@ -0,0 +1,45 @@
+--- 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/scotch-5.1.7.ebuild b/sci-libs/scotch/scotch-5.1.7.ebuild
new file mode 100644
index 000000000000..a2cb7475df72
--- /dev/null
+++ b/sci-libs/scotch/scotch-5.1.7.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2010 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.1 2010/01/15 22:43:52 patrick Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Software package and libraries for graph partitioning, static mapping, and sparse matrix block ordering"
+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"
+
+DEPEND="sys-devel/bison
+	mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}"/scotch_5.1/src"
+
+src_prepare() {
+	epatch "${FILESDIR}"/shared-libs_${PV}.patch
+	epatch "${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
+}