Bump, borrowed from sci overlay, thanks to bicatali

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

5 files changed, 287 insertions, 14 deletions

diff --git a/sci-libs/scotch/ChangeLog b/sci-libs/scotch/ChangeLog
index 1870a53c41c3..7b59485a7bd5 100644
--- a/sci-libs/scotch/ChangeLog
+++ b/sci-libs/scotch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/scotch
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scotch/ChangeLog,v 1.6 2011/06/26 10:08:23 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scotch/ChangeLog,v 1.7 2012/03/14 07:11:17 patrick Exp $
+
+*scotch-5.1.12b (14 Mar 2012)
+
+  14 Mar 2012; Patrick Lauer <patrick@gentoo.org>
+  +files/scotch-5.1.12b-as-needed.patch, +scotch-5.1.12b.ebuild, metadata.xml:
+  Bump, borrowed from sci overlay, thanks to bicatali
 
   26 Jun 2011; Justin Lecher <jlec@gentoo.org> scotch-5.1.7.ebuild,
   scotch-5.1.11.ebuild, metadata.xml:
diff --git a/sci-libs/scotch/Manifest b/sci-libs/scotch/Manifest
index 2257d34cc193..df601e82fc25 100644
--- a/sci-libs/scotch/Manifest
+++ b/sci-libs/scotch/Manifest
@@ -1,22 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX Makefile.inc.in 369 RMD160 3261d40521cff31e0f6a4c20799578145eb7a570 SHA1 4e616420e499c7993f673f3df3519c3883f7c94f SHA256 d31c8abd49e662b0bb6af56602277e3d70c2274c9ce19110967c93539032178d
 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 respect-ldflags.patch 3867 RMD160 87a069731aa5a6a15ba892d1333419c0cc6fbcc5 SHA1 add77e8e11604adb2461112117c858b429d0d1e3 SHA256 b277e980cc6e671604dae0e5a4cba28255a786b4294f800ec20ca88d10d8aa49
+AUX scotch-5.1.12b-as-needed.patch 4878 RMD160 4ecc1a0caed86823bf7c3d97a9a736ed47119868 SHA1 a41d9894d2d9265f2413000a44ec028e3ed40890 SHA256 e9084641e7cea9fdf21293a4ae7dcf65b73837e3ba59881d32dafa08bde88a8a
 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.11_esmumps.tgz 3952439 RMD160 f8db2bb02cbdadb7e02782daccddcdc4cdec4cac SHA1 b62501e0bf7fd24af3712647578b3e764f166287 SHA256 595ccc664ba070264b851a27b7860042a6bc716d6aade93e0909619decfabc92
+DIST scotch_5.1.12b_esmumps.tar.gz 3989632 RMD160 38ed5135e401767d0df8ecea6bcf8f7e4a60a464 SHA1 3866deea3199bc364d31ec46c63adcb799a8cf48 SHA256 82654e63398529cd3bcc8eefdd51d3b3161c0429bb11770e31f8eb0c3790db6e
 DIST scotch_5.1.7.tgz 3733642 RMD160 3424d4386dc257cabae46a2a55081162a8e41e4a SHA1 45be932de03d9a404d83b577346d2e63d856d7c7 SHA256 51ac6046eec0229ac257969a44926b87e0f4eec0a4ca1ad7f3e287be40070a2d
 EBUILD scotch-5.1.11.ebuild 2371 RMD160 696afb1f85076d444b78ad349d4a9ca557b00c97 SHA1 a745462f39257d3b4b5ee0358925eccfd1cf5f5f SHA256 2dd39282543e2ef86d14df9f8e7b247ff320cf81b36cde487f0f3703399bed6c
+EBUILD scotch-5.1.12b.ebuild 4394 RMD160 6f5a7e897ffb076e50cd3a0211cdbfffac681e4e SHA1 3645f5d066fa0734adb3021b3d1368b594aecc6e SHA256 141ffbe9968c4bd431cdaa5d3796d60aeaaa540210b0762fb6ecce89b0b22713
 EBUILD scotch-5.1.7.ebuild 1733 RMD160 550ce8848999fdd28cc9cb860ccdcfff709e8934 SHA1 3be084d8bd654a9b289f42b6c0cf630155794901 SHA256 8db8d41b7d912b21bb05b0f715ed60a8ff5fc2e0fb9c31794da454838f2c5cd2
-MISC ChangeLog 1519 RMD160 30e11ffdf33ee8a2ec2646e435ed725feeeb7b11 SHA1 2a5882c2b52fea9e845486f6b50a1e71fae2619e SHA256 70199a93ae298d4b93c2acb807f8dc5763b54e09b28c7685ba7b2dc23dd04bd5
-MISC metadata.xml 1013 RMD160 874e5d947e06a47940a3364cad71f91c01133eca SHA1 cb885288e75c33203311a37f996d756c8c1b23f4 SHA256 e085b0eddc33bf63da97c914f1f9ebf957a932e313d1d941a0fb616639e6b85d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk4HBR0ACgkQgAnW8HDreRZ7zwCfXIZFvh0NyK2FSoQazqQ/y+34
-5BwAoIqjHptNiBV6wlhqHR54AaBfoAYU
-=diB7
------END PGP SIGNATURE-----
+MISC ChangeLog 1737 RMD160 69797485bb31e98428ed6773716339350865a5ab SHA1 ffadc8977ddf94bddd115e81fa0329922e035acb SHA256 d8fdd653b5f6bd8d940f8a3ce724b80941a3d4cb756165bcad5853a6759751ab
+MISC metadata.xml 1182 RMD160 9a7049a43505f33460394c6c7be3898d50cfe706 SHA1 ae27bf24a09e1e30fd74884e573b98b2fa11be7c SHA256 92ad748925fc26697679060e428225f5d5943305a8ca470757e0221a7360f525
diff --git a/sci-libs/scotch/files/scotch-5.1.12b-as-needed.patch b/sci-libs/scotch/files/scotch-5.1.12b-as-needed.patch
new file mode 100644
index 000000000000..73888d8797e7
--- /dev/null
+++ b/sci-libs/scotch/files/scotch-5.1.12b-as-needed.patch
@@ -0,0 +1,112 @@
+diff -Nur src.orig/esmumps/Makefile src/esmumps/Makefile
+--- src.orig/esmumps/Makefile	2012-03-12 00:14:14.536109811 +0000
++++ src/esmumps/Makefile	2012-03-12 04:26:12.884108074 +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) -I$(includedir) $(<) -L$(libdir) -L. -l$(ESMUMPSLIB) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -o $(@)
+ 
+ ##
+ ##  Project rules.
+@@ -57,9 +57,9 @@
+ 					libesmumps$(LIB)							\
+ 					main_esmumps$(EXE)
+ 
+-ptscotch			:	clean
++ptscotch			:	clean common.h
+ 					$(MAKE) CFLAGS="$(CFLAGS) -DSCOTCH_PTSCOTCH" CC=$(CCP) SCOTCHLIB=ptscotch ESMUMPSLIB=ptesmumps	\
+-					libesmumps$(LIB)										\
++					libptesmumps$(LIB)										\
+ 					main_esmumps$(EXE)
+ 
+ install				:
+@@ -142,7 +142,7 @@
+ 					common.h				\
+ 					esmumps.h
+ 
+-libesmumps$(LIB)		:	graph_graph$(OBJ)			\
++lib$(ESMUMPSLIB)$(LIB)		:	graph_graph$(OBJ)			\
+ 					order$(OBJ)				\
+ 					order_scotch_graph$(OBJ)		\
+ 					dof$(OBJ)				\
+diff -Nur src.orig/libscotch/Makefile src/libscotch/Makefile
+--- src.orig/libscotch/Makefile	2012-03-12 00:14:14.496108751 +0000
++++ src/libscotch/Makefile	2012-03-12 01:32:28.562403624 +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) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) $(LDFLAGS) -o $(@)
+ 
+ ##
+ ##  Project rules.
+@@ -2543,7 +2543,7 @@
+ 					mapping.h				\
+ 					order.h					\
+ 					parser.h
+-			 		$(CCD) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<) -o $(@) $(LDFLAGS)
++			 		$(CCD) $(CFLAGS) -DSCOTCH_VERSION=$(VERSION) -DSCOTCH_RELEASE=$(RELEASE) -DSCOTCH_PATCHLEVEL=$(PATCHLEVEL) $(<)  $(LDFLAGS) -o $(@)
+ 
+ scotch.h			:	dummysizes$(EXE)			\
+ 					library.h
+diff -Nur src.orig/libscotchmetis/Makefile src/libscotchmetis/Makefile
+--- src.orig/libscotchmetis/Makefile	2012-03-12 00:14:14.456107691 +0000
++++ src/libscotchmetis/Makefile	2012-03-12 01:35:00.166422784 +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) -I$(includedir) -I../libscotch $(<) -L$(libdir) $(LDFLAGS) -o $(@) 
+ 
+ ##
+ ##  Project rules.
+diff -Nur src.orig/scotch/Makefile src/scotch/Makefile
+--- src.orig/scotch/Makefile	2012-03-12 00:14:14.536109811 +0000
++++ src/scotch/Makefile	2012-03-12 00:50:22.033571205 +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) -I$(includedir) -I../libscotch $(<) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -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) -I$(includedir) -I../libscotch $(<) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -o $(@)
+ 
+ ##
+ ##  Project rules.
+@@ -205,7 +205,7 @@
+ 					$(libdir)/libptscotch$(LIB)		\
+ 					$(libdir)/libptscotcherrexit$(LIB)	\
+ 					dgmap.h
+-			 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS)
++			 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -o $(@)
+ 
+ dgscat$(EXE)			:	dgscat.c				\
+ 					../libscotch/module.h			\
+@@ -315,7 +315,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) -I../libscotch -I$(includedir) gout_c.c gout_o.c -L$(libdir) -lscotch -lscotcherrexit $(LDFLAGS) -o $(@) 
+ 
+ gpart$(EXE)			:	gmap.c					\
+ 					../libscotch/module.h			\
+@@ -324,7 +324,7 @@
+ 					$(libdir)/libscotch$(LIB)		\
+ 					$(libdir)/libscotcherrexit$(LIB)	\
+ 					gmap.h
+-			 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -o $(@) -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS)
++			 		$(CC) $(CFLAGS) -I$(includedir) -I../libscotch $(<) -DSCOTCH_COMPILE_PART -L$(libdir) -l$(SCOTCHLIB) -l$(SCOTCHLIB)errexit $(LDFLAGS) -o $(@)
+ 
+ 
+ gscat$(EXE)			:	gscat.c					\
diff --git a/sci-libs/scotch/metadata.xml b/sci-libs/scotch/metadata.xml
index cd485f5a4712..31b6fd4c865e 100644
--- a/sci-libs/scotch/metadata.xml
+++ b/sci-libs/scotch/metadata.xml
@@ -10,6 +10,10 @@
 		<email>oli.borm@web.de</email>
 		<name>Oliver Borm</name>
 	</maintainer>
+	<use>
+		<flag name='int64'>Build the 64 bits integer library (needed for > 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
diff --git a/sci-libs/scotch/scotch-5.1.12b.ebuild b/sci-libs/scotch/scotch-5.1.12b.ebuild
new file mode 100644
index 000000000000..3ae7447a1a8c
--- /dev/null
+++ b/sci-libs/scotch/scotch-5.1.12b.ebuild
@@ -0,0 +1,158 @@
+# 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.1 2012/03/14 07:11:17 patrick Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs versionator flag-o-matic
+
+# use esmumps version to allow linking with mumps
+MYP="${PN}_${PV}_esmumps"
+# download id on gforge changes every goddamn release
+DID=28978
+
+DESCRIPTION="Software for graph, mesh and hypergraph partitioning"
+HOMEPAGE="http://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/"
+# broken ssl cert, so mirroring
+#SRC_URI="http://gforge.inria.fr/frs/download.php/${DID}/${MYP}.tar.gz"
+SRC_URI="http://dev.gentooexperimental.org/~patrick/${MYP}.tar.gz"
+
+LICENSE="CeCILL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples int64 mpi static-libs tools"
+
+DEPEND="sys-libs/zlib
+	mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MYP/b}"
+
+LIBVER=$(get_major_version)
+make_shared_lib() {
+	local libstatic=${1}
+	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
+	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%.*}"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	sed -e "s/-O3/${CFLAGS}/" \
+		-e "s/gcc/$(tc-getCC)/" \
+		-e "s/ ar/ $(tc-getAR)/" \
+		-e "s/ranlib/$(tc-getRANLIB)/" \
+		src/Make.inc/Makefile.inc.i686_pc_linux2 > src/Makefile.inc || die
+	use int64 && append-cflags -DIDXSIZE64
+}
+
+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
+
+	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
+	fi
+	if use static-libs; then
+		emake -C src clean
+		emake -C src
+		use mpi && emake -C src ptscotch
+	fi
+}
+
+src_install() {
+	dolib.so lib/*.so*
+	use static-libs && dolib.a lib/*.a
+
+	insinto /usr/include/scotch
+	doins include/*
+
+	cat <<-EOF > scotchmetis.pc
+		prefix=${EPREFIX}/usr
+		libdir=\${prefix}/$(get_libdir)
+		includedir=\${prefix}/include
+		Name: scotchmetis
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Libs: -L\${libdir} -lscotchmetis -lscotcherr -lscotch
+		Private: -lm -lz -lrt
+		Cflags: -I\${includedir}/scotch
+	EOF
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins scotchmetis.pc
+
+	# not sure it is actually a full replacement of metis
+	#alternatives_for metis scotch 0 \
+	#	/usr/$(get_libdir)/pkgconfig/metis.pc scotchmetis.pc
+
+	if use mpi; then
+		cat <<-EOF > ptscotchparmetis.pc
+			prefix=${EPREFIX}/usr
+			libdir=\${prefix}/$(get_libdir)
+			includedir=\${prefix}/include
+			Name: ptscotchparmetis
+			Description: ${DESCRIPTION}
+			Version: ${PV}
+			URL: ${HOMEPAGE}
+			Libs: -L\${libdir} -lptscotchparmetis -lptscotcherr -lptscotch
+			Private: -lm -lz -lrt
+			Cflags: -I\${includedir}/scotch
+			Requires: scotchmetis
+		EOF
+			insinto /usr/$(get_libdir)/pkgconfig
+			doins ptscotchparmetis.pc
+			# not sure it is actually a full replacement of parmetis
+			#alternatives_for metis-mpi ptscotch 0 \
+			#	/usr/$(get_libdir)/pkgconfig/metis-mpi.pc ptscotchparmetis.pc
+	fi
+
+	dodoc README.txt
+
+	if use tools; then
+		local b m
+		pushd bin > /dev/null
+		for b in *; do
+			newbin ${b} scotch_${b}
+		done
+		popd > /dev/null
+
+		pushd man/man1 > /dev/null
+		for m in *; do
+			newman ${m} scotch_${m}
+		done
+		popd > /dev/null
+	fi
+
+	use doc && dodoc doc/*.pdf
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples/* tgt grf
+	fi
+}