Version bump. Adapted autotools patch to work for all versions

(Portage version: 2.1.10.9/cvs/Linux x86_64)

4 files changed, 66 insertions, 30 deletions

diff --git a/sci-libs/parmetis/ChangeLog b/sci-libs/parmetis/ChangeLog
index 3d9bd4a3b87f..6244529f0d4f 100644
--- a/sci-libs/parmetis/ChangeLog
+++ b/sci-libs/parmetis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/parmetis
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/parmetis/ChangeLog,v 1.6 2010/12/22 20:05:13 bicatali Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/parmetis/ChangeLog,v 1.7 2011/08/03 20:23:43 bicatali Exp $
+
+*parmetis-3.2.0 (03 Aug 2011)
+
+  03 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org> parmetis-3.1.1.ebuild,
+  files/parmetis-3.1.1-autotools.patch, +parmetis-3.2.0.ebuild:
+  Version bump. Adapted autotools patch to work for all versions
 
   22 Dec 2010; Sébastien Fabbro <bicatali@gentoo.org> parmetis-3.1.1.ebuild:
   Added static-libs flag
diff --git a/sci-libs/parmetis/files/parmetis-3.1.1-autotools.patch b/sci-libs/parmetis/files/parmetis-3.1.1-autotools.patch
index 0c4ef28b5bc4..d38a2f7575cf 100644
--- a/sci-libs/parmetis/files/parmetis-3.1.1-autotools.patch
+++ b/sci-libs/parmetis/files/parmetis-3.1.1-autotools.patch
@@ -1,6 +1,5 @@
-diff -Nur ParMetis-3.1.1.orig/configure.ac ParMetis-3.1.1/configure.ac
---- ParMetis-3.1.1.orig/configure.ac	1970-01-01 01:00:00.000000000 +0100
-+++ ParMetis-3.1.1/configure.ac	2009-03-14 11:37:58.804041439 +0000
+--- configure.ac	1970-01-01 01:00:00.000000000 +0100
++++ configure.ac	2009-03-14 11:37:58.804041439 +0000
 @@ -0,0 +1,18 @@
 +# -*- Autoconf -*-
 +AC_PREREQ(2.59)
@@ -20,18 +19,16 @@ diff -Nur ParMetis-3.1.1.orig/configure.ac ParMetis-3.1.1/configure.ac
 +		 METISLib/Makefile
 +		 Programs/Makefile])
 +AC_OUTPUT
-diff -Nur ParMetis-3.1.1.orig/Makefile.am ParMetis-3.1.1/Makefile.am
---- ParMetis-3.1.1.orig/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ ParMetis-3.1.1/Makefile.am	2009-03-14 11:37:15.700900498 +0000
+--- Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ Makefile.am	2009-03-14 11:37:15.700900498 +0000
 @@ -0,0 +1,5 @@
 +SUBDIRS = METISLib ParMETISLib Programs
 +EXTRA_DIST = CHANGES VERSION parmetis.pc.in metis.pc.in
 +include_HEADERS = parmetis.h
 +pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfig_DATA = metis.pc parmetis.pc
-diff -Nur ParMetis-3.1.1.orig/METISLib/Makefile.am ParMetis-3.1.1/METISLib/Makefile.am
---- ParMetis-3.1.1.orig/METISLib/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ ParMetis-3.1.1/METISLib/Makefile.am	2009-03-14 11:37:15.700900498 +0000
+--- METISLib/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ METISLib/Makefile.am	2009-03-14 11:37:15.700900498 +0000
 @@ -0,0 +1,18 @@
 +pkginclude_HEADERS = defs.h macros.h metis.h proto.h rename.h \
 +	stdheaders.h struct.h
@@ -51,9 +48,8 @@ diff -Nur ParMetis-3.1.1.orig/METISLib/Makefile.am ParMetis-3.1.1/METISLib/Makef
 +	kvmetis.c kwayvolrefine.c kwayvolfm.c subdomains.c \
 +	mfm.c memory.c mrefine.c checkgraph.c
 +libmetis_la_LDFLAGS = -no-undefined -version-info 4:1:0 
-diff -Nur ParMetis-3.1.1.orig/metis.pc.in ParMetis-3.1.1/metis.pc.in
---- ParMetis-3.1.1.orig/metis.pc.in	1970-01-01 01:00:00.000000000 +0100
-+++ ParMetis-3.1.1/metis.pc.in	2009-03-14 11:37:15.700900498 +0000
+--- metis.pc.in	1970-01-01 01:00:00.000000000 +0100
++++ metis.pc.in	2009-03-14 11:37:15.700900498 +0000
 @@ -0,0 +1,10 @@
 +prefix=@prefix@
 +exec_prefix=@exec_prefix@
@@ -65,9 +61,8 @@ diff -Nur ParMetis-3.1.1.orig/metis.pc.in ParMetis-3.1.1/metis.pc.in
 +Version: @VERSION@
 +Libs: -L${libdir} -lmetis
 +Cflags: -I${includedir}/metis
-diff -Nur ParMetis-3.1.1.orig/ParMETISLib/Makefile.am ParMetis-3.1.1/ParMETISLib/Makefile.am
---- ParMetis-3.1.1.orig/ParMETISLib/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ ParMetis-3.1.1/ParMETISLib/Makefile.am	2009-03-14 11:57:08.006017954 +0000
+--- ParMETISLib/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ ParMETISLib/Makefile.am	2009-03-14 11:57:08.006017954 +0000
 @@ -0,0 +1,21 @@
 +pkginclude_HEADERS = defs.h macros.h parmetislib.h proto.h \
 +	rename.h stdheaders.h struct.h
@@ -90,9 +85,8 @@ diff -Nur ParMetis-3.1.1.orig/ParMETISLib/Makefile.am ParMetis-3.1.1/ParMETISLib
 +	mmetis.c mesh.c memory.c weird.c backcompat.c
 +libparmetis_la_LDFLAGS = -no-undefined -version-info 3:1:1
 +libparmetis_la_LIBADD = @MPILIBS@ $(top_builddir)/METISLib/libmetis.la
-diff -Nur ParMetis-3.1.1.orig/parmetis.pc.in ParMetis-3.1.1/parmetis.pc.in
---- ParMetis-3.1.1.orig/parmetis.pc.in	1970-01-01 01:00:00.000000000 +0100
-+++ ParMetis-3.1.1/parmetis.pc.in	2009-03-14 11:37:15.700900498 +0000
+--- parmetis.pc.in	1970-01-01 01:00:00.000000000 +0100
++++ parmetis.pc.in	2009-03-14 11:37:15.700900498 +0000
 @@ -0,0 +1,11 @@
 +prefix=@prefix@
 +exec_prefix=@exec_prefix@
@@ -105,9 +99,8 @@ diff -Nur ParMetis-3.1.1.orig/parmetis.pc.in ParMetis-3.1.1/parmetis.pc.in
 +Requires: metis
 +Libs: -L${libdir} -lparmetis
 +Cflags: -I${includedir}
-diff -Nur ParMetis-3.1.1.orig/Programs/Makefile.am ParMetis-3.1.1/Programs/Makefile.am
---- ParMetis-3.1.1.orig/Programs/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ ParMetis-3.1.1/Programs/Makefile.am	2009-03-14 11:37:15.700900498 +0000
+--- Programs/Makefile.am	1970-01-01 01:00:00.000000000 +0100
++++ Programs/Makefile.am	2009-03-14 11:37:15.700900498 +0000
 @@ -0,0 +1,13 @@
 +AM_CPPFLAGS = -I$(top_srcdir)/ParMETISLib
 +LDADD = $(top_builddir)/METISLib/libmetis.la \
@@ -122,9 +115,8 @@ diff -Nur ParMetis-3.1.1.orig/Programs/Makefile.am ParMetis-3.1.1/Programs/Makef
 +check-local: $(check_PROGRAMS)
 +	$(MPIRUN) ptest ../Graphs/rotor.graph
 +	$(MPIRUN) mtest ../Graphs/bricks.hex3d 2
-diff -Nur ParMetis-3.1.1.orig/ax_mpi.m4 ParMetis-3.1.1/ax_mpi.m4
---- ParMetis-3.1.1.orig/ax_mpi.m4	1970-01-01 01:00:00.000000000 +0100
-+++ ParMetis-3.1.1/ax_mpi.m4	2010-01-20 20:33:15.000000000 +0000
+--- ax_mpi.m4	1970-01-01 01:00:00.000000000 +0100
++++ ax_mpi.m4	2010-01-20 20:33:15.000000000 +0000
 @@ -0,0 +1,178 @@
 +# ===========================================================================
 +#             http://www.nongnu.org/autoconf-archive/ax_mpi.html
diff --git a/sci-libs/parmetis/parmetis-3.1.1.ebuild b/sci-libs/parmetis/parmetis-3.1.1.ebuild
index b98762316d1f..51b9b8fef4c6 100644
--- a/sci-libs/parmetis/parmetis-3.1.1.ebuild
+++ b/sci-libs/parmetis/parmetis-3.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/parmetis/parmetis-3.1.1.ebuild,v 1.2 2010/12/22 20:05:13 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/parmetis/parmetis-3.1.1.ebuild,v 1.3 2011/08/03 20:23:43 bicatali Exp $
 
 EAPI=2
 inherit eutils autotools
@@ -23,9 +23,7 @@ RDEPEND="${DEPEND}
 S="${WORKDIR}/${MYP}"
 
 src_prepare() {
-	cd "${WORKDIR}"
 	epatch "${FILESDIR}"/${P}-autotools.patch
-	cd "${S}"
 	eautoreconf
 	export CC=mpicc
 }
diff --git a/sci-libs/parmetis/parmetis-3.2.0.ebuild b/sci-libs/parmetis/parmetis-3.2.0.ebuild
new file mode 100644
index 000000000000..698748bb9b12
--- /dev/null
+++ b/sci-libs/parmetis/parmetis-3.2.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/parmetis/parmetis-3.2.0.ebuild,v 1.1 2011/08/03 20:23:43 bicatali Exp $
+
+EAPI=4
+inherit eutils autotools
+
+MYP=ParMetis-${PV}
+
+DESCRIPTION="Parallel graph partitioner"
+HOMEPAGE="http://www-users.cs.umn.edu/~karypis/metis/parmetis/"
+SRC_URI="http://glaros.dtc.umn.edu/gkhome/fetch/sw/${PN}/${MYP}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="free-noncomm"
+SLOT="0"
+IUSE="doc static-libs"
+
+DEPEND="virtual/mpi"
+RDEPEND="${DEPEND}
+	!sci-libs/metis"
+
+S="${WORKDIR}/${MYP}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.1.1-autotools.patch
+	sed -i -e "s/3.1.1/${PV}/" configure.ac || die
+	sed -i -e 's/order.c//' -e 's/lmatch.c//' ParMETISLib/Makefile.am || die
+	eautoreconf
+	export CC=mpicc
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	use doc && dodoc Manual/*.pdf
+}