Fix pkg-config files, #369263

(Portage version: 2.1.9.50/git/Linux x86_64, signed Manifest commit with key 4D7043C9)

4 files changed, 140 insertions, 6 deletions

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 24b5f5777..dd19de233 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*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 fe631b988..3c4066f91 100644
--- a/sys-cluster/mpich2/Manifest
+++ b/sys-cluster/mpich2/Manifest
@@ -6,6 +6,7 @@ AUX 0002-mpd_conf_file-search-order.patch 3882 RMD160 90bf46695398bea605002826c7
 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 eselect.mpi.mpich2 225 RMD160 0e43ee19f4468bf2dec1f3eb818d0e4c1fe7bb86 SHA1 d89d55089e26d8f949a4a9b8a72e20d0294b2f69 SHA256 433677c98927e92f669c410f6408dd16fc97d1f27599b551359a015989356ca5
+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 5355 RMD160 26ffada537073676553fdc4a9ee6a02f1a1af279 SHA1 f40eee99425894d9c76c8eefa87b8e72d9b7a02a SHA256 14cbd73be6969569574a880ad23e7c71c4bb02e6994392b2661bf5fb1965ce3d
@@ -15,13 +16,13 @@ AUX mpich2-1.3-libtvmpich2.so-respect-user-LDFLAGS.patch 1053 RMD160 e38a0c503bd
 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-r2.ebuild 4999 RMD160 e3003de505a38998e0163603fbedb6314ed2046d SHA1 eb17186e8ff543febad806e28acc8a6b358c14be SHA256 9a394130ebdc6c55ca6443fa66df14b5ee877b57eac1999db7760c4368542386
-EBUILD mpich2-1.4_rc2.ebuild 3842 RMD160 5d540f585e5946a9d2c0a0efd5dc4e117589a872 SHA1 1f52fb76e84f5d3b0739aedd5c1054059f084011 SHA256 c6171c24b28306240c273e84dee94b36a702ee2e15272679098c5e0864feca73
-MISC ChangeLog 4916 RMD160 f8d7d265a5ed28a9736bf478b8ec8f165ae1f37e SHA1 0c66d139ff2ec9000e690564f55dc6431c71b371 SHA256 0c2d73391348bab6a7e0bb3b179e8dc87c26cca1ab064d33ebaea2339163c6a3
+EBUILD mpich2-1.4_rc2-r1.ebuild 3982 RMD160 658adbdb4c212b277457cc7e5f573189eee385f2 SHA1 e77c260c91ebaa474a325f075932ce42287c846e SHA256 8b499d5e5595fc5b64967d726bcdde797e9639c1829c3055bcfda20c42246e28
+MISC ChangeLog 5124 RMD160 451e7e19b4947d8af0544b85fe7479e3f596aa37 SHA1 040fbe058ad8ab3a3905b7d1aacfa856968cadae SHA256 2e883c71a9d65ebe5c2f973afc9b488e8336eb3015da1205ed812420a797e7fc
 MISC metadata.xml 534 RMD160 8d4fa7f5f4860a520e58b3866b2a2fdc04ab6d83 SHA1 60bc1b41a847e2f9fbf527b204fcafc054d04d33 SHA256 763dc9199c817bb987335dcdddcc65de5f419410aac2f027fc9a2208e91f5c0a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3JS+wACgkQ4MrvBE1wQ8l5dwCgooZJ6Af8OVHn99gi/V90K4+C
-CtYAoKfrtE9WHUXS4e1J5HsdMs7Jpc0p
-=Rzmp
+iEYEARECAAYFAk31Pi8ACgkQ4MrvBE1wQ8nhAwCeKEsSxR9Wwuys7DurVOqjvfAI
+EX0An3EfkM7EbJaY1nIbycjEEINNxTpC
+=5GLO
 -----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 000000000..9e319f4ac
--- /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 383e59e26..ddfe4b567 100644
--- a/sys-cluster/mpich2/mpich2-1.4_rc2.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=2
-inherit eutils mpi toolchain-funcs
+inherit eutils mpi toolchain-funcs autotools
 
 MY_PV=${PV/_/}
 DESCRIPTION="MPICH2 - A portable MPI implementation"
@@ -56,6 +56,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() {