Fix the mpich2 pkgconfig file, #257921. Mark patchses to be sent upstream.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 36 insertions, 7 deletions

diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 98cf4d1d964f..24fe98eddff6 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/mpich2
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.33 2009/01/21 18:56:27 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.34 2009/02/12 03:05:39 jsbronder Exp $
+
+  12 Feb 2009; Justin Bronder <jsbronder@gentoo.org>
+  +files/mpich2-1.0.8-pkgconfig.patch, mpich2-1.0.8.ebuild:
+  Fix the mpich2 pkgconfig file, #257921. Mark patchses to be sent upstream.
 
   21 Jan 2009; Justin Bronder <jsbronder@gentoo.org> mpich2-1.0.8.ebuild:
   sys-cluster/mpich-1.0.8 bugfixes, no revbump. Fix some doc file locations
diff --git a/sys-cluster/mpich2/Manifest b/sys-cluster/mpich2/Manifest
index 3a6b5c8abd13..b5e2f03d2154 100644
--- a/sys-cluster/mpich2/Manifest
+++ b/sys-cluster/mpich2/Manifest
@@ -13,6 +13,7 @@ AUX mpich2-1.0.6-no-pvfs2.patch 1014 RMD160 627224ce6f4093ef5624107d53211b4de9c4
 AUX mpich2-1.0.6-shlib.patch 1576 RMD160 b68da396b97cfce783e5439eb53388c96ee74bef SHA1 0f6f7f929d69ec70c5ec14a785c4388a032166b7 SHA256 32ed3e4fa4048b3efcea3db55326c89ccb50bf86d0928e6fc8b0b3e715702089
 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
+AUX mpich2-1.0.8-pkgconfig.patch 928 RMD160 5ce7a800423f250dba0dd69560abebf845e7e556 SHA1 afba6883d1204a4b7c082af7e976186153263d64 SHA256 7f8dcafcb0d138130a684284d9bca86e4834f74a5132f0fef4556391abf43f8e
 AUX mpich2-1.0.8-site-packages-py.patch 7534 RMD160 93b2cab20620da379615eaf3bfc7279384987722 SHA1 706313c20e1d4d6a4a060c8ac36befdb5ee3b926 SHA256 a857e7c0effa7cdd62c1bc1bd054b4746764246410062d373e7e0892bcd20df8
 AUX mpich2.envd 45 RMD160 e29a0d617bbc15cc42d3088f8a79c1c715b353fa SHA1 765b885d0e1d65fe7ba845cf72e3e923613d6514 SHA256 d6f128f84e1d015922af42e1280586b84737740b2517cc0b35f498b571f252f9
 DIST mpich2-1.0.3.tar.gz 12166368 RMD160 5e7cd42f8359d81e6578d1fffca4708471e03cec SHA1 0ca48abaa98e98f0136508463886aad39ecefccb SHA256 294717fc05e9d509ed0e45c99709ddba696ad6919c47fc0801a410fe129623df
@@ -21,13 +22,13 @@ DIST mpich2-1.0.8.tar.gz 17237476 RMD160 646cf50fbdc60a49809f4d0a6bcaf2835844db1
 EBUILD mpich2-1.0.3-r1.ebuild 6000 RMD160 567b0c8a1490cf027360f64922bb1c7b790febfe SHA1 c3f299110632a25b820fe535523c82ef5916751e SHA256 53a1eb944df4cd7e3298c517ea9d5cd75def1630e6f5fd307d66f01b3295025c
 EBUILD mpich2-1.0.3.ebuild 2809 RMD160 2b55e1f9737baa86305da05949dbab67d47352a3 SHA1 4c1c76a39202f91f859c43647900060fba9328f4 SHA256 65b88fa53a8d68d7f8db72c74badf5f4e8925f700d9affb7c5555562b4bf3ff3
 EBUILD mpich2-1.0.6.ebuild 10906 RMD160 2352bb02c24166018cbbcd4bad9eba9ffa86597b SHA1 c9ba43c633a7bbbe0f29ceba085252ab2d1f7763 SHA256 930a4d98329b2daac7d8ea8f15299125a3c4a8c311a446e831b80aa7eade5c17
-EBUILD mpich2-1.0.8.ebuild 5519 RMD160 479bba7a30c7e8694f33c994e84f444cfd5bfcde SHA1 efa3f4799f57d1c94680fb7feceed591f04d79d7 SHA256 2bff8c29b70df648908be43888b573db502c21637419f508db492bd6a09c6bff
-MISC ChangeLog 8149 RMD160 59e4243bbc0b269dea67b8e46c7d203d3da6ebdd SHA1 60ee1388847ab0ee8439cd2db0e4fae401d920d5 SHA256 5a4e0c2cdb98822d6826d06dddde607cefd29fa4fa97eaacf7b65b0fc30e15a0
+EBUILD mpich2-1.0.8.ebuild 5695 RMD160 a78508352320c4b33dfe1a7939627874b656a68d SHA1 7b1e863fcc50a7e9c1f1e0aecee436a1874fb734 SHA256 680061447ebb80efc4dc2a3220b2709549698c316749df65ae62e6e4e853e3ba
+MISC ChangeLog 8340 RMD160 d7cea5e06c6f2a69c9df270c4db744dc20391a16 SHA1 736e1edc41da856c526f0d7da3d89c480f1e81dc SHA256 72c527756753b8b7b61e5cbb34b0b33696f0949209d4adc6fc9f8d1567a0ec3e
 MISC metadata.xml 668 RMD160 f56f9c5c751af5fa65c848c16dae61f11ad40de6 SHA1 9e5221933dd0c7bd918fa7a4791bb6e0017fba27 SHA256 843b215b79e31646bb4f205a62a612c5a98224845288fadcb8a2e25ecf1d5668
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkl3b+UACgkQ4MrvBE1wQ8kq+gCfRO+jUJbrOOjhkYRYsbq6kkLT
-a3UAoKVzY2pNHt5zw9VG2GsKBp0Iedf1
-=mf9O
+iEYEARECAAYFAkmTkgkACgkQ4MrvBE1wQ8lJ/ACfR9RN4xmuEiyZmajCWt4GWWJC
+MeAAnjMhf8XRTuyWNq/NDpWCx5NIGX/p
+=cEoF
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/mpich2/files/mpich2-1.0.8-pkgconfig.patch b/sys-cluster/mpich2/files/mpich2-1.0.8-pkgconfig.patch
new file mode 100644
index 000000000000..1d3a456bdd26
--- /dev/null
+++ b/sys-cluster/mpich2/files/mpich2-1.0.8-pkgconfig.patch
@@ -0,0 +1,17 @@
+--- a/mpich2-1.0.8/src/pkgconfig/mpich2-ch3.pc.in	2008-11-04 20:36:38.931970012 -0500
++++ b/mpich2-1.0.8/src/pkgconfig/mpich2-ch3.pc.in	2009-02-11 21:39:00.279871039 -0500
+@@ -1,8 +1,12 @@
+ # this gives access to the mpich2 header files
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
+ 
+ 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: @VERSION@
+ Requires: 
+-Libs: -L@libdir@ -lmpich -lmpichcxx @LIBS@
+-Cflags: @CFLAGS@ -I@includedir@ -DMPICH_IGNORE_CXX_SEEK
++Libs: -L${libdir} -lmpich -lmpichcxx @LIBS@
++Cflags: @CFLAGS@ -I${includedir} -DMPICH_IGNORE_CXX_SEEK
diff --git a/sys-cluster/mpich2/mpich2-1.0.8.ebuild b/sys-cluster/mpich2/mpich2-1.0.8.ebuild
index 691439b441bb..71731421c900 100644
--- a/sys-cluster/mpich2/mpich2-1.0.8.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.0.8.ebuild,v 1.3 2009/01/21 18:56:27 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.0.8.ebuild,v 1.4 2009/02/12 03:05:39 jsbronder Exp $
 
 EAPI=1
 inherit python eutils fortran
@@ -71,9 +71,11 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-site-packages-py.patch
 
 	# Respect the env var MPD_CONF_FILE
+	# TODO:  Send upstream
 	epatch "${FILESDIR}"/${P}-mpdconf-env.patch
 
 	# Fix gforker instal-alt
+	# TODO:  Send upstream
 	epatch "${FILESDIR}"/${P}-gforker-install-alt-fix.patch
 
 	# We need f90 to include the directory with mods, and to
@@ -85,8 +87,13 @@ src_unpack() {
 		$(find ./test/ -name 'Makefile.in') || die
 
 	# 254167, I'm pretty sure they meant srcdir in the path to remove files.
+	# TODO:  Send upstream
 	sed -i 's:scrdir:srcdir:g' "${S}"/src/pm/mpd/Makefile.in || die
 
+	# #257821, fix the pkgconfig file.
+	# TODO:  Send upstream
+	epatch "${FILESDIR}"/${P}-pkgconfig.patch
+
 	if ! use romio; then
 		# These tests in errhan/ rely on MPI::File ...which is in romio
 		echo "" > test/mpi/errors/cxx/errhan/testlist