Fix pkg-config files, #369263

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

4 files changed, 142 insertions, 8 deletions

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index d411874a4ff9..cd6a1b8d150d 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -1,6 +1,12 @@
 # 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.70 2011/05/10 14:31:03 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.71 2011/06/12 22:37:21 jsbronder Exp $
+
+*mpich2-1.4_rc2-r1 (12 Jun 2011)
+
+  12 Jun 2011; Justin Bronder <jsbronder@gentoo.org> -mpich2-1.4_rc2.ebuild,
+  +mpich2-1.4_rc2-r1.ebuild, +files/fix-pkg-config-files.patch:
+  Fix pkg-config files, #369263
 
   10 May 2011; Justin Bronder <jsbronder@gentoo.org> mpich2-1.4_rc2.ebuild:
   Correct fix for #293665
diff --git a/sys-cluster/mpich2/Manifest b/sys-cluster/mpich2/Manifest
index f01d4ecc5e0e..4f361a02391e 100644
--- a/sys-cluster/mpich2/Manifest
+++ b/sys-cluster/mpich2/Manifest
@@ -5,6 +5,7 @@ AUX 0001-MPD_CONF_FILE-should-be-readable.patch 1496 RMD160 33b8db14ab69293a53ec
 AUX 0002-mpd_conf_file-search-order.patch 3882 RMD160 90bf46695398bea605002826c7d9b85c7f07e5e9 SHA1 9f20b59f853e13d81f6227ddb16535d76ec4bab3 SHA256 a56c943e68e0bcf69900ae76cb4df73ef19d60f0e9e16e6d75d48b2651324b33
 AUX 0003-Fix-pkgconfig-for-mpich2-ch3-v1.2.1.patch 1510 RMD160 8bcd0ec310bcbc13bfd3d0200c1b9f5a88fc4677 SHA1 949da42c2fa90c4a298dc37e0994e97317ae75e9 SHA256 84896b8c127a872fac3a99e9acdb41a2a051275399b186b54349a72d478acb00
 AUX 0003-Fix-pkgconfig-for-mpich2-ch3.patch 1488 RMD160 e521747ae9169be0cc2e7e6bc97f07d3cec29237 SHA1 4c4763fcfc91a3edfe9997a00d0222a5ee1efe73 SHA256 ddf570a0eb1c4bdedef4357ee82b5662ded3739928c4cda4b512d84ad7577488
+AUX fix-pkg-config-files.patch 5435 RMD160 fc0b546a7a4d3a9d9a7611a4f9400f0a6be57ce8 SHA1 66f8e6570133ffcb0501abf4e81729cea96cca95 SHA256 ee74f05f221abea43f13c652fc26bc70e8e537959c065e9a7366ccfadc8955b7
 AUX mpd.conf 48 RMD160 289de9bb40759e3f71229cf47e4d2af83703a85f SHA1 244eee76dbf4ff269e4489d5cc7c3577c6c1fa6b SHA256 ae740cacaf2cb798921cb2092f5af98de67445e27af3f88858f3e6d2bbb127f4
 AUX mpich2-1.0.8-gforker-install-alt-fix.patch 621 RMD160 5b9904ae02f1c1098fdfd2dc4717610f89469afd SHA1 a33bcefa87d990a678436ebfac70976069a7f90d SHA256 a79e469b08e0a3f6c17ec7ec7ea01d3a56a553803fefd24f3794237eead36ced
 AUX mpich2-1.0.8-mpdconf-env.patch 5041 RMD160 c3d9f6ebd43443a24614da030253cf8c503afd59 SHA1 5b453a171f8b1dce93e3c2e675e5b3d4f05514e8 SHA256 b8c81614bba8c748db2ec24a7683d27b3a0430950fecd5644fd1f97f8e5ab2f9
@@ -16,13 +17,13 @@ AUX mpich2.envd 45 RMD160 e29a0d617bbc15cc42d3088f8a79c1c715b353fa SHA1 765b885d
 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 4834 RMD160 48aa931dc4119dd2ec66a5a2fbd8fb00dc0b0064 SHA1 5a843ec94fb6aff8e736fbefab5ba50fc8a6cd81 SHA256 2f6fcd6c42532da373e46175ccb7c65028755f43d660da4c2fc0e257c1ca1e9c
-EBUILD mpich2-1.4_rc2.ebuild 3684 RMD160 2151056089202d0f4620149b4010d1f37c09505c SHA1 6bc9f08df8ed817f644bfad82c54d96d8633bf21 SHA256 5ed232853e1a4e4a70915192bfa16e836df589bdf36b5d76829265c65584932d
-MISC ChangeLog 13741 RMD160 5a55043014db7757a0986d63d20dfbcc17e3c18c SHA1 6d62b404dde00c7f2c4aa6daf46a92b5c8d7f000 SHA256 33f81ae570c6691132c68129d16c284739c0fd0fd71e543fe1d6b12f8aaf246d
+EBUILD mpich2-1.4_rc2-r1.ebuild 3828 RMD160 d7ae79a697a8261bc709fd25f9db2169f3e06811 SHA1 6fa25b54b7deddfe5f54d2af2495283b9f3e1764 SHA256 976a1bc2b658f2efc300388f5007c2b73c08199f0092adbbdd022f66c98a8f51
+MISC ChangeLog 13949 RMD160 8a35f47b33e3490b31b998a8001f8fb9a833aa34 SHA1 69fbc428ed3aec46f4ce1f51582da91b891e59be SHA256 b0cb22882ee748a9fc70264bcfe72364c3e196ab1b86bac2a8a892ae3fdb29f9
 MISC metadata.xml 420 RMD160 930e2ff21815f000e213b80bb98074dd7594bafb SHA1 7ef0b850e21959933db71dfa8c57ff9349e37762 SHA256 c6dfa7e480cb95bb9b6bcb3fdbb89836795f8872ff9b098de85ec6e9ec0a1c34
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3JTC0ACgkQ4MrvBE1wQ8mMqACfVIUW/rVLe1Jzgjau8CqVT7LT
-mSAAn2eIu0J/NcAjVnFJYCKpwqaA4iYf
-=R7+u
+iEYEARECAAYFAk31P6cACgkQ4MrvBE1wQ8kZmwCfdjTV6RcoHSClkAwGAOaSE6Lf
+eXcAoLDGisSMtl+Z94dI4ZSXrHkUTkLB
+=dWUn
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/mpich2/files/fix-pkg-config-files.patch b/sys-cluster/mpich2/files/fix-pkg-config-files.patch
new file mode 100644
index 000000000000..9e319f4acfc0
--- /dev/null
+++ b/sys-cluster/mpich2/files/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.ebuild b/sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild
index 12356f86d05e..0300ba5680cc 100644
--- a/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 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.ebuild,v 1.5 2011/05/10 14:31:03 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild,v 1.1 2011/06/12 22:37:21 jsbronder Exp $
 
 EAPI=2
 
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs autotools
 
 MY_PV=${PV/_/}
 DESCRIPTION="MPICH2 - A portable MPI implementation"
@@ -49,6 +49,10 @@ src_prepare() {
 	sed -i \
 		-e 's,\(.*=\ *\)"@WRAPPER_[A-Z]*FLAGS@",\1"",' \
 		src/env/*.in || die
+
+	# 369263 and 1044, 1500 upstream.   
+	epatch "${FILESDIR}"/fix-pkg-config-files.patch
+	AT_M4DIR="${S}"/confdb eautoreconf || die
 }
 
 src_configure() {