rename patch prior to version bump

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

4 files changed, 138 insertions, 10 deletions

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 0fac6295be3e..5abee19f2caa 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/mpich2
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.73 2011/06/21 14:24:00 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.74 2012/01/12 02:11:50 jsbronder Exp $
+
+  12 Jan 2012; Justin Bronder <jsbronder@gentoo.org> mpich2-1.4_rc2-r1.ebuild,
+  +files/mpich2-1.4_rc2-fix-pkg-config-files.patch:
+  rename patch prior to version bump
 
   21 Jun 2011; Justin Lecher <jlec@gentoo.org> mpich2-1.2.1_p1-r1.ebuild,
   mpich2-1.4_rc2-r1.ebuild:
diff --git a/sys-cluster/mpich2/Manifest b/sys-cluster/mpich2/Manifest
index 660c6a541c97..adcb6824c8c0 100644
--- a/sys-cluster/mpich2/Manifest
+++ b/sys-cluster/mpich2/Manifest
@@ -13,17 +13,18 @@ AUX mpich2-1.0.8-pkgconfig.patch 928 RMD160 5ce7a800423f250dba0dd69560abebf845e7
 AUX mpich2-1.0.8-py26.patch 1341 RMD160 51d9b6ebb1fcce06cabb7ef201ffefcd97e39e3e SHA1 1a7db4a10ef6916f1ab98a38ce3c0de9f1c05725 SHA256 43dfaa60a2822728eae874dc423563aac1e658873702858b5bef237577270331
 AUX mpich2-1.0.8-site-packages-py.patch 7534 RMD160 93b2cab20620da379615eaf3bfc7279384987722 SHA1 706313c20e1d4d6a4a060c8ac36befdb5ee3b926 SHA256 a857e7c0effa7cdd62c1bc1bd054b4746764246410062d373e7e0892bcd20df8
 AUX mpich2-1.2.1-fix-missing-libs.patch 1825 RMD160 aec1251aa66f0d63c5848920c63339d5558a0f61 SHA1 d70695c63d891a32a98324ffd236f8751465fe98 SHA256 f645d00fc6adeef553517078dcc3313cbabfbf8069ad5a76e2570d183b2d824b
+AUX mpich2-1.4_rc2-fix-pkg-config-files.patch 5435 RMD160 fc0b546a7a4d3a9d9a7611a4f9400f0a6be57ce8 SHA1 66f8e6570133ffcb0501abf4e81729cea96cca95 SHA256 ee74f05f221abea43f13c652fc26bc70e8e537959c065e9a7366ccfadc8955b7
 AUX mpich2.envd 45 RMD160 e29a0d617bbc15cc42d3088f8a79c1c715b353fa SHA1 765b885d0e1d65fe7ba845cf72e3e923613d6514 SHA256 d6f128f84e1d015922af42e1280586b84737740b2517cc0b35f498b571f252f9
 DIST mpich2-1.2.1p1.tar.gz 18014859 RMD160 810cc486b65e4bcf977ac8d96ccbbcea87e0cbaa SHA1 26bd5620b45bc654aa3945755d11450be63d650c SHA256 a55d1682ee0b5ebbacc047f60620ed291e0a9b3ded3eaeb6a2c81a1598c4c964
 DIST mpich2-1.4rc2.tar.gz 19764158 RMD160 2d5cbac33cd728ba0fb6b74d2fcd7f166f1bfc1e SHA1 53afd67e0527e0c1459330d70d7077a1da52fe0f SHA256 820fc929bd349a9b4e6ce4a2fa5e3b88b3abf6941a147f6921e3ab44f4a6015a
 EBUILD mpich2-1.2.1_p1-r1.ebuild 4896 RMD160 7bb408b5c713a224e47813c4e5076e9ce1734b7c SHA1 93b8e8fe86e9be52e27af0d15723980f67549601 SHA256 2f6eb4954a003074a4ef3aa278123c89e792cb6c96f37f50bb8be0d1f8954d66
-EBUILD mpich2-1.4_rc2-r1.ebuild 3882 RMD160 19e24b6d99d9cd2296642bb519fa170f4368e0fb SHA1 c4b30e9663d938ed89e47a83d08db1d19d5cbf6e SHA256 867d280859e0cb8a1ffc8bdc25fc6dc533abb2081375a2d6e19f4dc994d95a54
-MISC ChangeLog 14219 RMD160 0e8a16305fd6153bbc8e669b5a46d6e3091e88b5 SHA1 454429b4eb787957fbbfd6997670c21a3e0fe987 SHA256 8c8fd5db49efb2eedeffc9151dac2b2bb4368687531412ae2c0717217840feb5
+EBUILD mpich2-1.4_rc2-r1.ebuild 3902 RMD160 a3faa9438d15dc94e1d99587cde602c122d07028 SHA1 bb856aad68d8a2cb66b5b92b5702576202fdfbf3 SHA256 a08e80d1c5c576cb252036d9f581d0b082e85f1060ed75849b9661687c82ab24
+MISC ChangeLog 14393 RMD160 cbd63870bbf1e0ac8affcb2f8f003b2193d082f0 SHA1 3a7200c1f62436ff732d2c6e2eb192ba3d174ed5 SHA256 98d8e80ec1a6b8a002d64bf218b52f76f78a1629c54644ddbb537a32248578c7
 MISC metadata.xml 420 RMD160 930e2ff21815f000e213b80bb98074dd7594bafb SHA1 7ef0b850e21959933db71dfa8c57ff9349e37762 SHA256 c6dfa7e480cb95bb9b6bcb3fdbb89836795f8872ff9b098de85ec6e9ec0a1c34
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4AqYYACgkQgAnW8HDreRYA7ACeJrBmMpc5PEO8eETi+dvsOOJV
-4zAAnjhaZHELYUR3U+AbOmLMWS54OSiB
-=7I+V
+iEYEARECAAYFAk8OQXIACgkQ4MrvBE1wQ8nd5gCfb5iq1UqgLw6trNTSlIXRgtOu
+j8QAoIjHIOAK3+o3fOXdVoFUby47uqIN
+=ePaS
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/mpich2/files/mpich2-1.4_rc2-fix-pkg-config-files.patch b/sys-cluster/mpich2/files/mpich2-1.4_rc2-fix-pkg-config-files.patch
new file mode 100644
index 000000000000..9e319f4acfc0
--- /dev/null
+++ b/sys-cluster/mpich2/files/mpich2-1.4_rc2-fix-pkg-config-files.patch
@@ -0,0 +1,123 @@
+From e4ffe1eb191ab5d02de5c25e416f1d4d0f471f44 Mon Sep 17 00:00:00 2001
+From: Justin Bronder <jsbronder@gmail.com>
+Date: Sun, 12 Jun 2011 14:45:34 -0400
+Subject: [PATCH] fix pkg-config files
+
+https://trac.mcs.anl.gov/projects/mpich2/ticket/1044
+https://trac.mcs.anl.gov/projects/mpich2/ticket/1500
+---
+ configure.in                             |    6 ++++++
+ src/packaging/pkgconfig/mpich2-c.pc.in   |   10 ++--------
+ src/packaging/pkgconfig/mpich2-cxx.pc.in |   10 ++--------
+ src/packaging/pkgconfig/mpich2-f77.pc.in |   10 ++--------
+ src/packaging/pkgconfig/mpich2-f90.pc.in |   10 ++--------
+ 5 files changed, 14 insertions(+), 32 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index de22cac..8543bb1 100644
+--- a/configure.in
++++ b/configure.in
+@@ -5329,6 +5329,12 @@ AC_SUBST(MPICH_TIMER_KIND)
+ # Setup other replaceable values
+ AC_SUBST(MPILIBNAME)
+ AC_SUBST(PMPILIBNAME)
++PKGCONFIG_PMPILIB=""
++if test "$NEEDSPLIB" = yes -a test -n "${PMPILIBNAME}" ; then
++    PKGCONFIG_PMPILIB="-l${PMPILIBNAME}"
++fi
++AC_SUBST(PKGCONFIG_PMPILIB)
++
+ # Note that aint_size must be used instead of void_p where the desired check
+ # is on the size of MPI_Aint
+ aint_size=$ac_cv_sizeof_void_p
+diff --git a/src/packaging/pkgconfig/mpich2-c.pc.in b/src/packaging/pkgconfig/mpich2-c.pc.in
+index b071fc6..e0ab3fa 100644
+--- a/src/packaging/pkgconfig/mpich2-c.pc.in
++++ b/src/packaging/pkgconfig/mpich2-c.pc.in
+@@ -4,15 +4,9 @@ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+ 
+-if test "@NEEDSPLIB@" = "yes" ; then
+-   plib=@PMPILIBNAME@
+-else
+-   plib=
+-fi
+-
+ Name: mpich2
+ Description: MPICH2 is an implementation of the Message-Passing Interface (MPI). The goals of MPICH2 are to provide an MPI implementation for important platforms, including clusters, SMPs, and massively parallel processors. It also provides a vehicle for MPI implementation research and for developing new and better parallel programming environments.
+ Version: @MPICH2_VERSION@
+ Requires:
+-Libs: @WRAPPER_LDFLAGS@ -L$libdir -l$plib -l@MPILIBNAME@ @WRAPPER_LIBS@
+-Cflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CFLAGS@ -I$includedir
++Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ @WRAPPER_LIBS@
++Cflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CFLAGS@ -I${includedir}
+diff --git a/src/packaging/pkgconfig/mpich2-cxx.pc.in b/src/packaging/pkgconfig/mpich2-cxx.pc.in
+index d21f9e6..d82e184 100644
+--- a/src/packaging/pkgconfig/mpich2-cxx.pc.in
++++ b/src/packaging/pkgconfig/mpich2-cxx.pc.in
+@@ -4,15 +4,9 @@ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+ 
+-if test "@NEEDSPLIB@" = "yes" ; then
+-   plib=@PMPILIBNAME@
+-else
+-   plib=
+-fi
+-
+ Name: mpich2
+ Description: MPICH2 is an implementation of the Message-Passing Interface (MPI). The goals of MPICH2 are to provide an MPI implementation for important platforms, including clusters, SMPs, and massively parallel processors. It also provides a vehicle for MPI implementation research and for developing new and better parallel programming environments.
+ Version: @MPICH2_VERSION@
+ Requires:
+-Libs: @WRAPPER_LDFLAGS@ -L$libdir -l$plib -l@MPILIBNAME@ @WRAPPER_LIBS@
+-Cxxflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CXXFLAGS@ -I$includedir
++Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ @WRAPPER_LIBS@
++Cxxflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CXXFLAGS@ -I${includedir}
+diff --git a/src/packaging/pkgconfig/mpich2-f77.pc.in b/src/packaging/pkgconfig/mpich2-f77.pc.in
+index 1b48bf6..193c2ab 100644
+--- a/src/packaging/pkgconfig/mpich2-f77.pc.in
++++ b/src/packaging/pkgconfig/mpich2-f77.pc.in
+@@ -4,15 +4,9 @@ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+ 
+-if test "@NEEDSPLIB@" = "yes" ; then
+-   plib=@PMPILIBNAME@
+-else
+-   plib=
+-fi
+-
+ Name: mpich2
+ Description: MPICH2 is an implementation of the Message-Passing Interface (MPI). The goals of MPICH2 are to provide an MPI implementation for important platforms, including clusters, SMPs, and massively parallel processors. It also provides a vehicle for MPI implementation research and for developing new and better parallel programming environments.
+ Version: @MPICH2_VERSION@
+ Requires:
+-Libs: @WRAPPER_LDFLAGS@ -L$libdir -l$plib -l@MPILIBNAME@ @WRAPPER_LIBS@
+-Fflags: @WRAPPER_FFLAGS@ -I$includedir
++Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ @WRAPPER_LIBS@
++Fflags: @WRAPPER_FFLAGS@ -I${includedir}
+diff --git a/src/packaging/pkgconfig/mpich2-f90.pc.in b/src/packaging/pkgconfig/mpich2-f90.pc.in
+index ebb8499..700976f 100644
+--- a/src/packaging/pkgconfig/mpich2-f90.pc.in
++++ b/src/packaging/pkgconfig/mpich2-f90.pc.in
+@@ -4,15 +4,9 @@ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+ 
+-if test "@NEEDSPLIB@" = "yes" ; then
+-   plib=@PMPILIBNAME@
+-else
+-   plib=
+-fi
+-
+ Name: mpich2
+ Description: MPICH2 is an implementation of the Message-Passing Interface (MPI). The goals of MPICH2 are to provide an MPI implementation for important platforms, including clusters, SMPs, and massively parallel processors. It also provides a vehicle for MPI implementation research and for developing new and better parallel programming environments.
+ Version: @MPICH2_VERSION@
+ Requires:
+-Libs: @WRAPPER_LDFLAGS@ -L$libdir -l$plib -l@MPILIBNAME@ @WRAPPER_LIBS@
+-Fcflags: @WRAPPER_FCFLAGS@ -I$includedir
++Libs: @WRAPPER_LDFLAGS@ -L${libdir} @PKGCONFIG_PMPILIB@ -l@MPILIBNAME@ @WRAPPER_LIBS@
++Fcflags: @WRAPPER_FCFLAGS@ -I${includedir}
+-- 
+1.7.3.4
+
diff --git a/sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild b/sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild
index 903baecdbd89..c4e0cfde55b5 100644
--- a/sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild,v 1.4 2011/06/21 14:24:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild,v 1.5 2012/01/12 02:11:50 jsbronder Exp $
 
 EAPI=2
 
@@ -54,7 +54,7 @@ src_prepare() {
 		src/env/*.in || die
 
 	# 369263 and 1044, 1500 upstream.
-	epatch "${FILESDIR}"/fix-pkg-config-files.patch
+	epatch "${FILESDIR}"/mpich2-1.4_rc2-fix-pkg-config-files.patch
 	AT_M4DIR="${S}"/confdb eautoreconf || die
 }