Remove old which fixes #507194

Package-Manager: portage-2.2.7/cvs/Linux x86_64 Manifest-Sign-Key: 0x4D7043C9
author: Justin Bronder <jsbronder@gentoo.org> 2014-04-09 14:20:58 +0000
committer: Justin Bronder <jsbronder@gentoo.org> 2014-04-09 14:20:58 +0000
commit: 0603b6d2d18e31be16283de06b77a0d70589ecc9 (patch)
tree: aad7a7de960ae46c5209728d60c1ce528ff8dc31 /sys-cluster
parent: Cleanup old. (diff)
download: historical-0603b6d2d18e31be16283de06b77a0d70589ecc9.tar.gz
historical-0603b6d2d18e31be16283de06b77a0d70589ecc9.tar.bz2
historical-0603b6d2d18e31be16283de06b77a0d70589ecc9.zip
20 files changed, 24 insertions, 1377 deletions
diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 98904a29370a..cb4837e25105 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for sys-cluster/mpich2
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.91 2013/07/09 22:26:38 jsbronder Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.92 2014/04/09 14:20:53 jsbronder Exp $
+
+  09 Apr 2014; Justin Bronder <jsbronder@gentoo.org>
+  -files/0001-MPD_CONF_FILE-should-be-readable.patch,
+  -files/mpich2-1.0.8-gforker-install-alt-fix.patch,
+  -files/0002-mpd_conf_file-search-order.patch,
+  -files/mpich2-1.0.8-mpdconf-env.patch,
+  -files/0003-Fix-pkgconfig-for-mpich2-ch3-v1.2.1.patch,
+  -files/mpich2-1.0.8-pkgconfig.patch,
+  -files/0003-Fix-pkgconfig-for-mpich2-ch3.patch,
+  -files/mpich2-1.0.8-py26.patch, -files/mpich2-1.0.8-site-packages-py.patch,
+  -files/mpich2-1.2.1-fix-missing-libs.patch,
+  -files/mpich2-1.4.1-fix-pkg-config-files.patch,
+  -files/mpich2-1.4_rc2-fix-pkg-config-files.patch,
+  -files/fix-pkg-config-files.patch, -files/mpd.conf,
+  -files/mpich2-hvector.patch, -files/mpich2.envd, -mpich2-1.2.1_p1-r1.ebuild,
+  -mpich2-1.4.1_p1.ebuild:
+  Remove old which fixes #507194
 
   09 Jul 2013; Justin Bronder <jsbronder@gentoo.org> mpich2-1.2.1_p1-r1.ebuild,
   mpich2-1.4.1_p1.ebuild, mpich2-1.5.ebuild:
diff --git a/sys-cluster/mpich2/Manifest b/sys-cluster/mpich2/Manifest
index a8119f5b341f..227ce943f62a 100644
--- a/sys-cluster/mpich2/Manifest
+++ b/sys-cluster/mpich2/Manifest
@@ -1,34 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 0001-MPD_CONF_FILE-should-be-readable.patch 1496 SHA256 747462d1d2272291fd956631cee4170112523027e2b89d4f2abf6d618cc004aa SHA512 e7b3a21a90b35993d8a3f08d0612d48e63f034730ea043d88f7292824ee6a5ccf8c01e0ac7cd4e4ab9b9a28aff16b7e240b1821ae86d7ecf9ecc83c1dadf34a8 WHIRLPOOL f48e3818ebaf859748fb4f4869ec44f73665d3f62a76ed3dea4b6a40f992057c498fe135b12debeb060d3250073a413fe7b662f762be2c678919a9276ab4fdb9
-AUX 0002-mpd_conf_file-search-order.patch 3882 SHA256 a56c943e68e0bcf69900ae76cb4df73ef19d60f0e9e16e6d75d48b2651324b33 SHA512 f8a0db86c381a1678744215854434c50f582709009c83a63f0681b84d93ebe69090482baa62e3ba537aefc9259e00b5255e904453d4e56e033e68d9a50200946 WHIRLPOOL fa850f179c0d69e7e8f295bd32b3c7ff932242a4e36aa9537687a78675261332f61c22dd3b0f26b975b0f92c459841bbe733da6461c2f42a26c0a621158ee5da
-AUX 0003-Fix-pkgconfig-for-mpich2-ch3-v1.2.1.patch 1510 SHA256 84896b8c127a872fac3a99e9acdb41a2a051275399b186b54349a72d478acb00 SHA512 9acebd259c5fc36238375949b17fd5247a34c8c835e3b1647b2de45f900d6eebe04d05a5f301a2bdae885fa71a3c8fc74e6e0af2d138dedbe88a799f0ee82482 WHIRLPOOL 2a6ab1dbd1714899cb9ba88e7e7d5cd7e1b28503dcf101af3737a324e07a201dcae2eb9d326637f81b657f528c4bf0393b88cf3d19691cc321152003a06fb52f
-AUX 0003-Fix-pkgconfig-for-mpich2-ch3.patch 1488 SHA256 ddf570a0eb1c4bdedef4357ee82b5662ded3739928c4cda4b512d84ad7577488 SHA512 d7777bc366b5ed5697723b8c61f90561f88d82a0fa500d6692709c6d77f86f64dcc3d013a4c482e4861cece26e1737f5745754fe9a19b49078d5899619820758 WHIRLPOOL a827957d171c8d6432b9c02e06991466bec7d507fe45e6a83610684ff16f42085a67941afa1eb009630dd879e72e2b274adc442ad181d880c0c34f4aad3a91f5
-AUX fix-pkg-config-files.patch 5435 SHA256 ee74f05f221abea43f13c652fc26bc70e8e537959c065e9a7366ccfadc8955b7 SHA512 ba8931e484a8ee44eefa9212728b8d0dc3c185f9378a5179c83f40318ebd13b0ecdb97dfbad1a5b3d995df606bab74e2c5d6d6ea7a182704f42dae284a975563 WHIRLPOOL c2677a2f2a420cd90a602f6079627b86a9ef7f43c0dd72c5f99dfc055fbf262149dff93f1db7e3752edf751a55ab3b7bb3c41ab000d0e52838cf994e0a4ad4b8
-AUX mpd.conf 48 SHA256 ae740cacaf2cb798921cb2092f5af98de67445e27af3f88858f3e6d2bbb127f4 SHA512 82eafba82e93066ee2faea52b08f59c2231a5bb1a5e64551d399dceb7e48cdb5edda51c264a2e2b6016826613dff50aa2b7d4e946eb0732e2a260332b87f2ec7 WHIRLPOOL 3fc71bb16abbc090549af95912e0945e15abf3c303d6e89bad77d6064acf30fb26067fe95f26f707cd13274f30a8ab090f9b1bf1fc26dd018e652c280dbecb54
-AUX mpich2-1.0.8-gforker-install-alt-fix.patch 621 SHA256 a79e469b08e0a3f6c17ec7ec7ea01d3a56a553803fefd24f3794237eead36ced SHA512 afe005c2148b5ab95d36536356df271065b338f3aba036665de78d67ab2c419aa17db714ce40cdbb864324ee38a191e26dbfcf7354e118270b062503baf1aee8 WHIRLPOOL b88f8fdd53cd218dda56b394c17c6d2e24cf42d2c5ad735b49d0b75c3f5b698ebc3de68480ec596ea592fed95e36c704b32bd2d5ca6837480822fac5152a8a75
-AUX mpich2-1.0.8-mpdconf-env.patch 5041 SHA256 b8c81614bba8c748db2ec24a7683d27b3a0430950fecd5644fd1f97f8e5ab2f9 SHA512 9a49efa589dd7449bdb6a3f7245891c204a370f96430fb24d7a365ea33497308d4f5f54820b88715cda4dfb71ccb71f4a368773a8ba7d1320a362293e6c0482f WHIRLPOOL d63791137c75be1bddcbb41889cce09288ab0371872b0ef3d965981f67715cb29acce595992e5e6c107f350847ff03b5cba482236ec39c8d4dbfd6760c0ee002
-AUX mpich2-1.0.8-pkgconfig.patch 928 SHA256 7f8dcafcb0d138130a684284d9bca86e4834f74a5132f0fef4556391abf43f8e SHA512 46629c479a0c4655288f74b12cbe3aaa8df89032db48009dd89d546d722ad59849423614a6348de1ef45c952f3fc844c7194be49aa18320535c98992e79571fd WHIRLPOOL 2b73121695fa677a17aa21b7084972c68dfee03218a886e52952851a90dd2dd3182fe3250101fdf5b97d645538ef902053d2bd33da23239d3545a56b7ff8bdc9
-AUX mpich2-1.0.8-py26.patch 1341 SHA256 43dfaa60a2822728eae874dc423563aac1e658873702858b5bef237577270331 SHA512 97b314f065c2a7a8b7c44e492ccd3fe046c163a4107317a50e2d640a3ea93bdac3528dce3163e5dd7340fea2a3f1e1b697a838e2ce25e4bc34464d0de1e2bbb4 WHIRLPOOL dddf71bd4316916428c3af9a771dda43edc3715199112d93be402e528802d0d0cbb1d0f89ff838c2faf2adc9547be88e62e84530720bee68e48d1b3c31aed5eb
-AUX mpich2-1.0.8-site-packages-py.patch 7534 SHA256 a857e7c0effa7cdd62c1bc1bd054b4746764246410062d373e7e0892bcd20df8 SHA512 be1ca10d5879e690947200cb085ea16a2de18cf0a2f35d8573d87eb809798f60035d19b0a3b040fb35fc0b94b6a9f235f348ca12a4525bd2fc5a9e947c90fe99 WHIRLPOOL ae66f904c75e8af3104b640bf967da55475954141e74604bcc1460cab1551bf89eefbb88fa684fe8aaa2b5844c1bd95cbf858e997f3ec184b0f88ad336479ddf
-AUX mpich2-1.2.1-fix-missing-libs.patch 1825 SHA256 f645d00fc6adeef553517078dcc3313cbabfbf8069ad5a76e2570d183b2d824b SHA512 007f29030b20196765a90a66f31edf0cbeb5cae6c150898b2670afbb620149035f270491bd70733265f528a278f490a5c6ccef1ef920e547144796f1d21dcd07 WHIRLPOOL 696165fbfc5e63e17fdd365c09b2746842e3085b2b66e05d7e3f906b808d4b3dd8aa83da0488f067608c72ea815a1241360c60526a27b4be9e1f30e9e39c2182
-AUX mpich2-1.4.1-fix-pkg-config-files.patch 5217 SHA256 fa8c48e38725432f944c1a4d09238a31338c40dcdca1a0273f9ebc44e2392c44 SHA512 c112d78732f9c0578774be7e6c62c0923324912fccd4b086b177e3162e2eebf436153b7f17769d2ef1991ed95c3910420715057a39f0d1e635d49abb18e315ed WHIRLPOOL c486bf172b7decb404fffd843c428963ab4231b73166b8be99cbfefab398df94436af96b831152bd951e6095396b1b3f2f973f424d282e0e6ff388696dcbeccc
-AUX mpich2-1.4_rc2-fix-pkg-config-files.patch 5435 SHA256 ee74f05f221abea43f13c652fc26bc70e8e537959c065e9a7366ccfadc8955b7 SHA512 ba8931e484a8ee44eefa9212728b8d0dc3c185f9378a5179c83f40318ebd13b0ecdb97dfbad1a5b3d995df606bab74e2c5d6d6ea7a182704f42dae284a975563 WHIRLPOOL c2677a2f2a420cd90a602f6079627b86a9ef7f43c0dd72c5f99dfc055fbf262149dff93f1db7e3752edf751a55ab3b7bb3c41ab000d0e52838cf994e0a4ad4b8
-AUX mpich2-hvector.patch 2011 SHA256 c6e7b522f1dd6d7a4936e44fc63bebefbdb1d6d6138b07cddc35609057b6ca34 SHA512 d260b26c798a8a830eba7c727095ef4a153feaee698ebaad6c22478724744b8e26bb88050cedbb2352460e0dd02146b9f19187f3d2da2fc373949e15c8910e8c WHIRLPOOL f8f629a90ef8bf03442031a24ee3d776704a58dae2c7cb7a08189bfda4f2099bd19cfacd9fc6ee834a5bbcbe6a44197359248b808049d529a30b743698f25197
-AUX mpich2.envd 45 SHA256 d6f128f84e1d015922af42e1280586b84737740b2517cc0b35f498b571f252f9 SHA512 57cd9cf83c38ec3f776d321d4c669a95cc0103b560402be4ab95c15237f03e6f8ecf4d285fbcf1ff64411f7aa30dfee65d2cae27b3dc773e3689fd0044329210 WHIRLPOOL 61bca797a71070fd05cb5cd432cfe4abcfb1a018c785081b282287a803b9b7f4325f8551dbe7a1e175316824592b9aed394c39d67cd4be384704dab13e4914f8
-DIST mpich2-1.2.1p1.tar.gz 18014859 SHA256 a55d1682ee0b5ebbacc047f60620ed291e0a9b3ded3eaeb6a2c81a1598c4c964
-DIST mpich2-1.4.1p1.tar.gz 19502854 SHA256 a20f798ceaad6b0161ddecac98623b65d6a4033072f39ced13b9043916e3d1ee SHA512 3d12e2246a01869ee739b7d63f83f7c289ebf28616e34e35deb554e6c73d2383a35713f652ad26c655ac1087da30867a2bb26f20433beef0339c4324497c5700 WHIRLPOOL c81f26bbf961b5ad702fd77b0e3522e8abf6058ca8dca9aa09aa90d50aaa4a933c92ac7786069f5ad1434d3e5e27b876a7d93bf7e36891cb79b4ea5ee9f3f664
 DIST mpich2-1.5.tar.gz 22826035 SHA256 7175926fc2e4230f00201e880318c08de4f949c0dbe167fe1b2e256ac79d5f66 SHA512 01ef68accdd60af805705c1c7a144a570eee6f01984939fe151a093f963c956fba366247b1058885ba1a2ff626278d30e928e03d394bd6cf2a4b6dab99586c15 WHIRLPOOL 2cffe3dc6942f4d141601fcb51a08405c5c61af84c8e224dc9301b18846862d27f7646637aa199720c3858345471c244cb78800d4f2b484742edd8ef6a674b45
-EBUILD mpich2-1.2.1_p1-r1.ebuild 4895 SHA256 e3c3b1fedff9ea525d7ae464ecc250e6bc496b1e0eab1106ce7d31c733f196e4 SHA512 c925c764a724817fadb5e70791eac0e85ca0a070d49551c57ca20c070d5e2b239a3e0c18fea74bf99e56491103fe87e5464e613d8c03b63210756a56ec879e98 WHIRLPOOL d0fabfcc5fb5053d6452f05d2f97c1f40ffe1712fdb06b642ec846239947379c3ae47301a7fd097f20ae18f0d3cf410ead5a73bd291036cd71fd16c55f416525
-EBUILD mpich2-1.4.1_p1.ebuild 4620 SHA256 712d903c5c78f7d26b2821025bf2541d344f65f467600c214815b3270365ba00 SHA512 b4023730c24a1eb9cd2959dd2b466c6c39a666ae2804a17f6875c1bfad4890aceef806bf8ceac380cdbbcf210f9510910f575c3b826509538391c19bef743d41 WHIRLPOOL ed32536819205517e409335277e74957d55b9a4bc6a52ce7fcb2089c0a656d11ebba290dad0afe6b7508cbe17487b858c1c47ffb56652ebc5a976754a9a8b7c9
 EBUILD mpich2-1.5.ebuild 2704 SHA256 b5dcb36313fcd971c69aeb183eb0e3f71481807b8f0ae73ccfc8423eb263c115 SHA512 c517c32a0a99d391c20f0d47dfb170de4c8ee8c5c5d2ec15c963af76d495872cfb07da72a7b15ed0156c43e6411a2482c1ede70818a1d26fc884ce41e3874700 WHIRLPOOL 41f50d3afd8840633ec2ef5ffdf3863a6709c171350f366a2013803507d8d1dd0d6585855e578d4b506799b04af1fd4a7db7f3e8e57f6711de1d196cda54892b
-MISC ChangeLog 16767 SHA256 54b4760c473a89f1c6c2ec2a73fc0373989030e1e97897337dff58e6c8f473cc SHA512 ff0804d26d1a6e6365bc48771177c1c483c234609f3ba2a6dd124e7734710446f6c4d10f234b4e01c75a6375f4ce00ccdbc5e826a56baf2416593993dd7fd4e6 WHIRLPOOL 3a85e0b192a042de34dcdae1819bc06609e51c4edae14634c2431a21ee1a302ef595ccc2bd739abffa9252a6bff6f727a9b71bb9d21398e8014f7e271778a31c
+MISC ChangeLog 17582 SHA256 9c92113c92ab216448a4e27b44def1defb66646527659f6715a0aaa0976f7fc9 SHA512 5a4e7191941cc986b1880523f8ee4ec5052fba021730c3c5d2a1f50d0e9db8aba0f722a710b138962df31546b7b885d137a6788ef928e7a9f123069fa8ea1081 WHIRLPOOL b1a8654eaf59a0e8158cb5a3e52e54de265ad035540e9e1ac3316a25df449052a61ee4a74502dcec98bab9120ed1e14291dfcaedb07fa384c72a6cc64ef95f2f
 MISC metadata.xml 427 SHA256 5f7515943fb388b8088c1cbadcd788d485a5aebe0f4c4783e271f3ae1bfbc04f SHA512 224f20695e38ec6ce9038454ad23ed590163cfd32f1643faf38065b32bfe1f52ce466316aed238b06bc470f775d6166def98e67f8eb883841257ecda71274292 WHIRLPOOL d1fa4e3855df6e84648c6aba7f6e2ebfa2d9a101816aa7e3bcaf7025d42cba906bab0905452470a49ca73d1a43da66ccc243390276677cf2b47c3fcb605c2faf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHcji0ACgkQ4MrvBE1wQ8nXnwCgohdnuY26/F7yaCyTYS3x0zrH
-rPMAoK2KBfTg9u/0yOOikS1JReciuYqW
-=Vpyw
+iEYEAREIAAYFAlNFV0oACgkQ4MrvBE1wQ8mJ/ACaA2EpxB3icu+CXlPVZo9c+Fdw
+/dEAnAxrvYzNRTp00Wr4ObBl+4qxmvjS
+=t7v4
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/mpich2/files/0001-MPD_CONF_FILE-should-be-readable.patch b/sys-cluster/mpich2/files/0001-MPD_CONF_FILE-should-be-readable.patch
deleted file mode 100644
index fa685e36431d..000000000000
--- a/sys-cluster/mpich2/files/0001-MPD_CONF_FILE-should-be-readable.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 4daa0519150f38bd322964157157fb3369ee0f38 Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Wed, 16 Sep 2009 11:43:59 -0400
-Subject: [PATCH 1/3] MPD_CONF_FILE should be readable
-
-When looking for the MPD_CONF_FILE, the existance is not enough, the
-file also needs to be readable by the current user.
----
- src/pm/mpd/mpdlib.py |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/pm/mpd/mpdlib.py b/src/pm/mpd/mpdlib.py
-index 8ea8a05..31ddcb4 100644
---- a/src/pm/mpd/mpdlib.py
-+++ b/src/pm/mpd/mpdlib.py
-@@ -1359,11 +1359,11 @@ class MPDParmDB(dict):
-             if os.environ.has_key(k):
-                 self[('env',k)] = os.environ[k]
-     def get_parms_from_rcfile(self,parmsToOverride,errIfMissingFile=0):
--        if os.environ.has_key('MPD_CONF_FILE'):
-+        if os.environ.has_key('MPD_CONF_FILE') and os.access(os.environ['MPD_CONF_FILE'], os.R_OK):
-             parmsRCFilename = os.environ['MPD_CONF_FILE']
-         elif hasattr(os,'getuid')  and  os.getuid() == 0:    # if ROOT
-             parmsRCFilename = os.path.abspath('/etc/mpd.conf')
--        elif os.environ.has_key('HOME'):
-+        elif os.environ.has_key('HOME') and os.access(os.path.join(os.environ['HOME'], '.mpd.conf'), os.R_OK):
-             parmsRCFilename = os.path.join(os.environ['HOME'],'.mpd.conf')
-         elif os.environ.has_key('HOMEPATH'):    # e.g. win32
-             parmsRCFilename = os.path.join(os.environ['HOMEPATH'],'.mpd.conf')
--- 
-1.6.3.3
-
diff --git a/sys-cluster/mpich2/files/0002-mpd_conf_file-search-order.patch b/sys-cluster/mpich2/files/0002-mpd_conf_file-search-order.patch
deleted file mode 100644
index 2bb59e7c28cb..000000000000
--- a/sys-cluster/mpich2/files/0002-mpd_conf_file-search-order.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From c5c6b5677854d2e835ed7d8d0497ab4f475c63fc Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Wed, 16 Sep 2009 11:50:20 -0400
-Subject: [PATCH 2/3] mpd_conf_file search order.
-
-Make sure the search order for mpd.conf is the following:
-    - MPD_CONF_FILE set in environment
-    - .mpd.conf in the user's home directory
-    - The system wide default in SYSCONFDIR/mpd.conf
----
- src/pm/mpd/Makefile.in |    9 ++++++---
- src/pm/mpd/mpdroot.c   |   27 +++++++++++++++++++++++++--
- 2 files changed, 31 insertions(+), 5 deletions(-)
-
-diff --git a/src/pm/mpd/Makefile.in b/src/pm/mpd/Makefile.in
-index e1752f8..4ef65fc 100644
---- a/src/pm/mpd/Makefile.in
-+++ b/src/pm/mpd/Makefile.in
-@@ -74,7 +74,7 @@ mpdroot: ${mpdroot_OBJECTS}
- 	$(C_LINK) -o mpdroot ${mpdroot_OBJECTS} $(LIBS)
- 
- mpdroot.o: ${srcdir}/mpdroot.c ${srcdir}/mpdroot.h mpdconf.h
--	${C_COMPILE} -c  $< 
-+	${C_COMPILE} -DSYSCONFDIR=\"@sysconfdir@\" -c  $< 
- 
- # The following lines provide the right libraries for all example programs
- .c:
-@@ -128,7 +128,10 @@ install: all
- 	@echo "copying python files/links into " $(DESTDIR)${bindir}
- 	-@for cmd in ${PYTHON_SOURCE} ; do \
- 	    if [ ! -s $(srcdir)/$$cmd.py ] ; then continue ; fi ; \
--	    sed -e 's#/usr/bin/env python.*#/usr/bin/env ${PYTHON}#' ${srcdir}/$$cmd.py > $(DESTDIR)${bindir}/temp$$cmd.py ; \
-+		sed \
-+			-e 's#/usr/bin/env python.*#/usr/bin/env ${PYTHON}#' \
-+			-e 's,/etc/mpd.conf,@sysconfdir@/mpd.conf,g' \
-+			${srcdir}/$$cmd.py > $(DESTDIR)${bindir}/temp$$cmd.py ; \
- 	    ${INSTALL} -m 755 $(DESTDIR)${bindir}/temp$$cmd.py $(DESTDIR)${bindir}/$$cmd.py; \
- 	    ( rm -f $(DESTDIR)${bindir}/temp$$cmd.py >/dev/null 2>&1 || exit 0 ) ; \
- 	done
-@@ -210,7 +213,7 @@ mpich2-mpdroot: mpich2-mpdroot.o
- 
- mpich2-mpdroot.o: ${srcdir}/mpdroot.c ${srcdir}/mpdroot.h mpdconf.h
- 	${INSTALL} -m 644 ${srcdir}/mpdroot.c mpich2-mpdroot.c
--	${C_COMPILE} -c mpich2-mpdroot.c
-+	${C_COMPILE} -DSYSCONFDIR=\"@sysconfdir@\" -c mpich2-mpdroot.c
- 	rm -f mpich2-mpdroot.c
- 
- # A special alternate installation target when using multiple process managers
-diff --git a/src/pm/mpd/mpdroot.c b/src/pm/mpd/mpdroot.c
-index 348c7b6..1a4f2a5 100644
---- a/src/pm/mpd/mpdroot.c
-+++ b/src/pm/mpd/mpdroot.c
-@@ -19,6 +19,7 @@ int main(int argc, char *argv[])
-     struct passwd *pwent;
-     char input_line[NAME_LEN+1], secretword[NAME_LEN+1];
-     FILE *conf_file;
-+    char *mpdconf_path = NULL;
- 
-     if ((pwent = getpwuid(getuid())) == NULL)    /* for real id */
-     {
-@@ -26,10 +27,32 @@ int main(int argc, char *argv[])
-         exit(-1);
-     }
- 
--    conf_file = fopen("/etc/mpd.conf","r");
-+    /*
-+     * We look for a readable mpd.conf in the following order.
-+     * - MPD_CONF_FILE set in environment
-+     * - .mpd.conf in the user's home directory
-+     * - The system wide default in SYSCONFDIR/mpd.conf
-+     */
-+    mpdconf_path = getenv("MPD_CONF_FILE");
-+    if ( ! (mpdconf_path && access( mpdconf_path, R_OK ) == 0) ){
-+        /* By far, the largest we'll need */
-+        size_t mpdconf_path_len = strlen(pwent->pw_dir) \
-+            + strlen(SYSCONFDIR) + strlen("/.mpd.conf");
-+
-+        mpdconf_path = (char*) malloc( sizeof(char) * mpdconf_path_len ); 
-+        if ( ! mpdconf_path ){
-+            fprintf( stderr, "%s:  Failed to allocate a buffer for path to mpd.conf\n", argv[0]);
-+            exit(-1);
-+        }
-+        snprintf( mpdconf_path, mpdconf_path_len-1, "%s/.mpd.conf", pwent->pw_dir );
-+        if ( access( mpdconf_path, R_OK ) != 0 )
-+            snprintf( mpdconf_path, mpdconf_path_len-1, "%s/mpd.conf", SYSCONFDIR );
-+    }
-+    conf_file = fopen( mpdconf_path, "r");
-+
-     if (conf_file == NULL)
-     {
--        printf("%s: open failed for root's mpd conf file",argv[0]);
-+        printf("%s: open failed for root's mpd conf file\n",argv[0]);
-         exit(-1);
-     }
-     secretword[0] = '\0';
--- 
-1.6.3.3
-
diff --git a/sys-cluster/mpich2/files/0003-Fix-pkgconfig-for-mpich2-ch3-v1.2.1.patch b/sys-cluster/mpich2/files/0003-Fix-pkgconfig-for-mpich2-ch3-v1.2.1.patch
deleted file mode 100644
index 266990c0b25d..000000000000
--- a/sys-cluster/mpich2/files/0003-Fix-pkgconfig-for-mpich2-ch3-v1.2.1.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 6572e098d5463bdcdcb9563ee9a736efed4a01c9 Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Tue, 24 Nov 2009 10:27:51 -0500
-Subject: [PATCH] Fix pkgconfig for mpich2-ch3 v1.2.1
-
-Variables were undefined, see http://bugs.gentoo.org/257821
-
-$ pkg-config --list-all
-[lots of output, then]
-Variable 'exec_prefix' not defined in '/usr/lib/pkgconfig/mpich2-ch3.pc'
----
- src/packaging/pkgconfig/mpich2-ch3.pc.in |    8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/packaging/pkgconfig/mpich2-ch3.pc.in b/src/packaging/pkgconfig/mpich2-ch3.pc.in
-index b061464..275b535 100644
---- a/src/packaging/pkgconfig/mpich2-ch3.pc.in
-+++ b/src/packaging/pkgconfig/mpich2-ch3.pc.in
-@@ -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: @MPICH2_VERSION@
- Requires: 
--Libs: -L@libdir@ -lmpich -lmpichcxx -lopa @LIBS@
--Cflags: @CFLAGS@ -I@includedir@ -DMPICH_IGNORE_CXX_SEEK
-+Libs: -L${libdir} -lmpich -lmpichcxx -lopa @LIBS@
-+Cflags: @CFLAGS@ -I${includedir} -DMPICH_IGNORE_CXX_SEEK
--- 
-1.6.3.3
-
diff --git a/sys-cluster/mpich2/files/0003-Fix-pkgconfig-for-mpich2-ch3.patch b/sys-cluster/mpich2/files/0003-Fix-pkgconfig-for-mpich2-ch3.patch
deleted file mode 100644
index 04be31337d5d..000000000000
--- a/sys-cluster/mpich2/files/0003-Fix-pkgconfig-for-mpich2-ch3.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 06eaaf72d12ca70275fd4f403af14bcb2d609718 Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Wed, 16 Sep 2009 11:59:57 -0400
-Subject: [PATCH 3/3] Fix pkgconfig for mpich2-ch3
-
-Variables were undefined, see http://bugs.gentoo.org/257821
-
-$ pkg-config --list-all
-[lots of output, then]
-Variable 'exec_prefix' not defined in '/usr/lib/pkgconfig/mpich2-ch3.pc'
----
- src/packaging/pkgconfig/mpich2-ch3.pc.in |    8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/packaging/pkgconfig/mpich2-ch3.pc.in b/src/packaging/pkgconfig/mpich2-ch3.pc.in
-index df10b7f..8621ef5 100644
---- a/src/packaging/pkgconfig/mpich2-ch3.pc.in
-+++ b/src/packaging/pkgconfig/mpich2-ch3.pc.in
-@@ -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
--- 
-1.6.3.3
-
diff --git a/sys-cluster/mpich2/files/fix-pkg-config-files.patch b/sys-cluster/mpich2/files/fix-pkg-config-files.patch
deleted file mode 100644
index 9e319f4acfc0..000000000000
--- a/sys-cluster/mpich2/files/fix-pkg-config-files.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-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/files/mpd.conf b/sys-cluster/mpich2/files/mpd.conf
deleted file mode 100644
index 07dd9825023a..000000000000
--- a/sys-cluster/mpich2/files/mpd.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-secretword=test69hike
-MPD_SECRETWORD=test69hike
diff --git a/sys-cluster/mpich2/files/mpich2-1.0.8-gforker-install-alt-fix.patch b/sys-cluster/mpich2/files/mpich2-1.0.8-gforker-install-alt-fix.patch
deleted file mode 100644
index 00774049fa32..000000000000
--- a/sys-cluster/mpich2/files/mpich2-1.0.8-gforker-install-alt-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- mpich2-1.0.8/src/pm/gforker/Makefile.in-orig	2008-11-01 13:18:37.685990975 -0400
-+++ mpich2-1.0.8/src/pm/gforker/Makefile.in	2008-11-01 13:19:03.584804978 -0400
-@@ -176,6 +176,9 @@
- 
- # A special alternate installation target when using multiple process managers
- install-alt: mpiexec
-+	if [ ! -d ${DESTDIR}${exec_prefix} ] ; then $(MKDIR_P) ${DESTDIR}${exec_prefix} ; fi
-+	if [ ! -d ${DESTDIR}${prefix} ] ; then $(MKDIR_P) ${DESTDIR}${prefix} ; fi
-+	if [ ! -d ${DESTDIR}${bindir} ] ; then $(MKDIR_P) ${DESTDIR}${bindir} ; fi
- 	$(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) mpiexec $(DESTDIR)${bindir}/mpiexec.gforker
- 
- 
diff --git a/sys-cluster/mpich2/files/mpich2-1.0.8-mpdconf-env.patch b/sys-cluster/mpich2/files/mpich2-1.0.8-mpdconf-env.patch
deleted file mode 100644
index f29682ad950a..000000000000
--- a/sys-cluster/mpich2/files/mpich2-1.0.8-mpdconf-env.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-diff -urN mpich2-1.0.8/src/pm/mpd/Makefile.in mpich2-1.0.8_p/src/pm/mpd/Makefile.in
---- mpich2-1.0.8/src/pm/mpd/Makefile.in	2008-11-01 16:55:07.409787116 -0400
-+++ mpich2-1.0.8_p/src/pm/mpd/Makefile.in	2008-11-04 20:37:19.510506041 -0500
-@@ -78,7 +78,7 @@
- 	$(C_LINK) -o mpdroot ${mpdroot_OBJECTS} $(LIBS)
- 
- mpdroot.o: ${srcdir}/mpdroot.c ${srcdir}/mpdroot.h mpdconf.h
--	${C_COMPILE} -c  $< 
-+	${C_COMPILE} -DSYSCONFDIR=\"@sysconfdir@\" -c  $< 
- 
- # The following lines provide the right libraries for all example programs
- .c:
-@@ -136,7 +136,10 @@
- 	fi
- 	-@for cmd in ${PYTHON_SOURCE} ; do \
- 	    if [ ! -s $(srcdir)/$$cmd.py ] ; then continue ; fi ; \
--	    sed -e 's#/usr/bin/env python.*#/usr/bin/env ${PYTHON}#' ${srcdir}/$$cmd.py > $(DESTDIR)${bindir}/temp$$cmd.py ; \
-+	    sed \
-+			-e 's#/usr/bin/env python.*#/usr/bin/env ${PYTHON}#' \
-+			-e 's,/etc/mpd.conf,@sysconfdir@/mpd.conf,g' \
-+			${srcdir}/$$cmd.py > $(DESTDIR)${bindir}/temp$$cmd.py ; \
- 	    ${INSTALL} -m 755 $(DESTDIR)${bindir}/temp$$cmd.py $(DESTDIR)${PYTHONDIR}/$$cmd.py; \
- 	    ( rm -f $(DESTDIR)${bindir}/temp$$cmd.py >/dev/null 2>&1 || exit 0 ) ; \
- 	done
-@@ -218,7 +221,7 @@
- 
- mpich2-mpdroot.o: ${srcdir}/mpdroot.c ${srcdir}/mpdroot.h mpdconf.h
- 	${INSTALL} -m 644 ${srcdir}/mpdroot.c mpich2-mpdroot.c
--	${C_COMPILE} -c mpich2-mpdroot.c
-+	${C_COMPILE} -DSYSCONFDIR=\"@sysconfdir@\" -c mpich2-mpdroot.c
- 	rm -f mpich2-mpdroot.c
- 
- # A special alternate installation target when using multiple process managers
-@@ -238,7 +241,10 @@
- 	fi
- 	for cmd in ${PYTHON_SOURCE} ; do \
- 	    if [ ! -s $(srcdir)/$$cmd.py ] ; then continue ; fi ; \
--	    sed -e 's#/usr/bin/env python.*#/usr/bin/env ${PYTHON}#' ${srcdir}/$$cmd.py > $(DESTDIR)${bindir}/temp$$cmd.py ; \
-+	    sed \
-+			-e 's#/usr/bin/env python.*#/usr/bin/env ${PYTHON}#' \
-+			-e 's,/etc/mpd.conf,@sysconfdir@/mpd.conf,g' \
-+			${srcdir}/$$cmd.py > $(DESTDIR)${bindir}/temp$$cmd.py ; \
- 	    ${INSTALL} -m 755 $(DESTDIR)${bindir}/temp$$cmd.py $(DESTDIR)${PYTHONDIR}/$$cmd.py; \
- 	    ( rm -f $(DESTDIR)${bindir}/temp$$cmd.py >/dev/null 2>&1 || exit 0 ) ; \
- 	done
-diff -urN mpich2-1.0.8/src/pm/mpd/mpdlib.py mpich2-1.0.8_p/src/pm/mpd/mpdlib.py
---- mpich2-1.0.8/src/pm/mpd/mpdlib.py	2007-11-08 18:47:44.000000000 -0500
-+++ mpich2-1.0.8_p/src/pm/mpd/mpdlib.py	2008-11-04 20:40:36.812894529 -0500
-@@ -1341,11 +1341,11 @@
-             if os.environ.has_key(k):
-                 self[('env',k)] = os.environ[k]
-     def get_parms_from_rcfile(self,parmsToOverride,errIfMissingFile=0):
--        if os.environ.has_key('MPD_CONF_FILE'):
-+        if os.environ.has_key('MPD_CONF_FILE') and os.access(os.environ['MPD_CONF_FILE'], os.R_OK):
-             parmsRCFilename = os.environ['MPD_CONF_FILE']
-         elif hasattr(os,'getuid')  and  os.getuid() == 0:    # if ROOT
-             parmsRCFilename = os.path.abspath('/etc/mpd.conf')
--        elif os.environ.has_key('HOME'):
-+        elif os.environ.has_key('HOME') and os.access(os.path.join(os.environ['HOME'],'.mpd.conf'), os.R_OK):
-             parmsRCFilename = os.path.join(os.environ['HOME'],'.mpd.conf')
-         elif os.environ.has_key('HOMEPATH'):    # e.g. win32
-             parmsRCFilename = os.path.join(os.environ['HOMEPATH'],'.mpd.conf')
-diff -urN mpich2-1.0.8/src/pm/mpd/mpdroot.c mpich2-1.0.8_p/src/pm/mpd/mpdroot.c
---- mpich2-1.0.8/src/pm/mpd/mpdroot.c	2007-11-02 18:50:19.000000000 -0400
-+++ mpich2-1.0.8_p/src/pm/mpd/mpdroot.c	2008-11-07 13:45:10.560017904 -0500
-@@ -19,6 +19,7 @@
-     struct passwd *pwent;
-     char input_line[NAME_LEN+1], secretword[NAME_LEN+1];
-     FILE *conf_file;
-+    char *mpdconf_path = NULL;
- 
-     if ((pwent = getpwuid(getuid())) == NULL)    /* for real id */
-     {
-@@ -26,10 +27,32 @@
-         exit(-1);
-     }
- 
--    conf_file = fopen("/etc/mpd.conf","r");
-+    /*
-+     * We look for a readable mpd.conf in the following order.
-+     * - MPD_CONF_FILE set in environment
-+     * - .mpd.conf in the user's home directory
-+     * - The system wide default in SYSCONFDIR/mpd.conf
-+     */
-+    mpdconf_path = getenv("MPD_CONF_FILE");
-+    if ( ! (mpdconf_path && access( mpdconf_path, R_OK ) == 0) ){
-+        /* By far, the largest we'll need */
-+        size_t mpdconf_path_len = strlen(pwent->pw_dir) \
-+            + strlen(SYSCONFDIR) + strlen("/.mpd.conf");
-+
-+        mpdconf_path = (char*) malloc( sizeof(char) * mpdconf_path_len ); 
-+        if ( ! mpdconf_path ){
-+            fprintf( stderr, "%s:  Failed to allocate a buffer for path to mpd.conf\n", argv[0]);
-+            exit(-1);
-+        }
-+        snprintf( mpdconf_path, mpdconf_path_len-1, "%s/.mpd.conf", pwent->pw_dir );
-+        if ( access( mpdconf_path, R_OK ) != 0 )
-+            snprintf( mpdconf_path, mpdconf_path_len-1, "%s/mpd.conf", SYSCONFDIR );
-+    }
-+    conf_file = fopen( mpdconf_path, "r");
-+
-     if (conf_file == NULL)
-     {
--        printf("%s: open failed for root's mpd conf file",argv[0]);
-+        printf("%s: open failed for root's mpd conf file\n",argv[0]);
-         exit(-1);
-     }
-     secretword[0] = '\0';
diff --git a/sys-cluster/mpich2/files/mpich2-1.0.8-pkgconfig.patch b/sys-cluster/mpich2/files/mpich2-1.0.8-pkgconfig.patch
deleted file mode 100644
index 1d3a456bdd26..000000000000
--- a/sys-cluster/mpich2/files/mpich2-1.0.8-pkgconfig.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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/files/mpich2-1.0.8-py26.patch b/sys-cluster/mpich2/files/mpich2-1.0.8-py26.patch
deleted file mode 100644
index 52e22b8e81be..000000000000
--- a/sys-cluster/mpich2/files/mpich2-1.0.8-py26.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -urN a/mpich2-1.0.8/src/pm/mpd/configure.in b/mpich2-1.0.8/src/pm/mpd/configure.in
---- a/mpich2-1.0.8/src/pm/mpd/configure.in	2008-03-08 16:58:08.000000000 -0500
-+++ b/mpich2-1.0.8/src/pm/mpd/configure.in	2009-06-13 14:01:38.921760910 -0400
-@@ -81,13 +81,15 @@
- # echo "GOT PYTHON", $PYTHON
- if test -z "$PYTHON" ; then  ## user did not give us a python; find one
-     dnl Find a Python
-+    AC_CHECK_PROG(PY26, python2.6, python2.6)
-     AC_CHECK_PROG(PY25, python2.5, python2.5)
-     AC_CHECK_PROG(PY24, python2.4, python2.4)
-     AC_CHECK_PROG(PY23, python2.3, python2.3)
-     AC_CHECK_PROG(PY22, python2.2, python2.2)
-     AC_CHECK_PROG(PY2,  python2, python2)
-     AC_CHECK_PROG(PY,   python, python)
--    if test -z "$PY25"  -a  \
-+    if test -z "$PY26"  -a  \
-+            -z "$PY25"  -a  \
-             -z "$PY24"  -a  \
-             -z "$PY23"  -a  \
-             -z "$PY22"  -a  \
-@@ -96,7 +98,7 @@
-         AC_MSG_WARN([Could not find a python executable in path: $PATH]) 
-     fi
-     dnl See if one of the pythons has the right modules
--    for pypgm in $PY25 $PY24 $PY23 $PY22 $PY2 $PY ; do \
-+    for pypgm in $PY26 $PY25 $PY24 $PY23 $PY22 $PY2 $PY ; do \
-         AC_MSG_CHECKING([that $pypgm is a valid python version])
-         changequote(,)dnl
-         py_version=`$pypgm -c "import sys;print sys.version_info[0]"`
diff --git a/sys-cluster/mpich2/files/mpich2-1.0.8-site-packages-py.patch b/sys-cluster/mpich2/files/mpich2-1.0.8-site-packages-py.patch
deleted file mode 100644
index a3e894e740de..000000000000
--- a/sys-cluster/mpich2/files/mpich2-1.0.8-site-packages-py.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-diff -urN mpich2-1.0.8/src/pm/mpd/Makefile.in mpich2-1.0.8_p/src/pm/mpd/Makefile.in
---- mpich2-1.0.8/src/pm/mpd/Makefile.in	2008-09-17 16:40:53.000000000 -0400
-+++ mpich2-1.0.8_p/src/pm/mpd/Makefile.in	2008-11-01 13:17:08.518285830 -0400
-@@ -20,6 +20,10 @@
- INSTALL   = @INSTALL@
- CFLAGS    = @CFLAGS@
- 
-+LIBDIRNAME = `echo @libdir@ | sed 's:.*@prefix@/::'`
-+PYTHONDIR  = ${prefix}/${LIBDIRNAME}/${PYTHON}/site-packages/mpich2
-+PYTHONLINK = ../${LIBDIRNAME}/${PYTHON}/site-packages/mpich2
-+
- C_COMPILE = ${CC} ${INCLUDES} ${CFLAGS} ${COPTIONS}
- C_LINK	  = ${CLINKER} ${CFLAGS} ${COPTIONS} ${LDFLAGS}
- 
-@@ -125,29 +129,33 @@
-         else \
- 	    ${INSTALL} -m  755 mpdroot $(DESTDIR)${bindir}/mpdroot ;\
- 	fi
--	@echo "copying python files/links into " $(DESTDIR)${bindir}
-+	@echo "copying python files/links into " $(DESTDIR)${PYTHONDIR}
-+	@if [ ! -d $(DESTDIR)${PYTHONDIR} ] ; then \
-+		echo "mkdir -p $(DESTDIR)${PYTHONDIR} " ;\
-+		mkdir -p $(DESTDIR)${PYTHONDIR} ; \
-+	fi
- 	-@for cmd in ${PYTHON_SOURCE} ; do \
- 	    if [ ! -s $(srcdir)/$$cmd.py ] ; then continue ; fi ; \
- 	    sed -e 's#/usr/bin/env python.*#/usr/bin/env ${PYTHON}#' ${srcdir}/$$cmd.py > $(DESTDIR)${bindir}/temp$$cmd.py ; \
--	    ${INSTALL} -m 755 $(DESTDIR)${bindir}/temp$$cmd.py $(DESTDIR)${bindir}/$$cmd.py; \
-+	    ${INSTALL} -m 755 $(DESTDIR)${bindir}/temp$$cmd.py $(DESTDIR)${PYTHONDIR}/$$cmd.py; \
- 	    ( rm -f $(DESTDIR)${bindir}/temp$$cmd.py >/dev/null 2>&1 || exit 0 ) ; \
- 	done
- 	-@cd $(DESTDIR)${bindir} && rm -f mpd
--	-@cd $(DESTDIR)${bindir} && @LN_S@ mpd.py mpd
-+	-@cd $(DESTDIR)${bindir} && @LN_S@ ${PYTHONLINK}/mpd.py mpd
- 	-@cd $(DESTDIR)${bindir} && rm -f mpdboot
--	-@cd $(DESTDIR)${bindir} && @LN_S@ mpdboot.py mpdboot
-+	-@cd $(DESTDIR)${bindir} && @LN_S@ ${PYTHONLINK}/mpdboot.py mpdboot
- 	-@for cmd in ${CMDS} ; do \
- 	    ( cd $(DESTDIR)${bindir} && rm -f $$cmd ; ) ; \
--	    ( cd $(DESTDIR)${bindir} && @LN_S@ $$cmd.py $$cmd ; ) \
-+	    ( cd $(DESTDIR)${bindir} && @LN_S@ ${PYTHONLINK}/$$cmd.py $$cmd ; ) \
- 	done
- 	-@( rm -f $(DESTDIR)${bindir}/mpdrun >/dev/null 2>&1 || exit 0 )
--	-@( rm -f $(DESTDIR)${bindir}/mpdrun.py >/dev/null 2>&1 || exit 0 )
-+	-@( rm -f $(DESTDIR)${PYTHONDIR}/mpdrun.py >/dev/null 2>&1 || exit 0 )
- 	-@( rm -f $(DESTDIR)${bindir}/mpirun >/dev/null 2>&1 || exit 0 )
--	-@( rm -f $(DESTDIR)${bindir}/mpirun.py >/dev/null 2>&1 || exit 0 )
--	-@cd $(DESTDIR)${bindir} && @LN_S@ mpiexec mpdrun
--	-@cd $(DESTDIR)${bindir} && @LN_S@ mpiexec.py mpdrun.py
--	-@cd $(DESTDIR)${bindir} && @LN_S@ mpiexec mpirun
--	-@cd $(DESTDIR)${bindir} && @LN_S@ mpiexec.py mpirun.py
-+	-@( rm -f $(DESTDIR)${PYTHONDIR}/mpirun.py >/dev/null 2>&1 || exit 0 )
-+	-@cd $(DESTDIR)${bindir} && @LN_S@ ${PYTHONLINK}/mpiexec.py mpdrun
-+	-@cd $(DESTDIR)${bindir} && @LN_S@ ${PYTHONLINK}/mpiexec.py mpdrun.py
-+	-@cd $(DESTDIR)${bindir} && @LN_S@ ${PYTHONLINK}/mpiexec.py mpirun
-+	-@cd $(DESTDIR)${bindir} && @LN_S@ ${PYTHONLINK}/mpiexec.py mpirun.py
- 	-@if [ "${DO_MTV}" = "yes" ] ; then \
- 	    ${INSTALL} -m 755 mtv.so $(DESTDIR)${bindir}/mtv.so ;\
- 	fi
-@@ -166,43 +174,43 @@
- 	-rm -f $(DESTDIR)${bindir}/mpdroot
- 	-rm -f $(DESTDIR)${bindir}/Zeroconf.py
- 	-rm -f $(DESTDIR)${bindir}/mpd
--	-rm -f $(DESTDIR)${bindir}/mpd.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpd.py
- 	-rm -f $(DESTDIR)${bindir}/mpdallexit
--	-rm -f $(DESTDIR)${bindir}/mpdallexit.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdallexit.py
- 	-rm -f $(DESTDIR)${bindir}/mpdboot
--	-rm -f $(DESTDIR)${bindir}/mpdboot.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdboot.py
- 	-rm -f $(DESTDIR)${bindir}/mpdcheck
--	-rm -f $(DESTDIR)${bindir}/mpdcheck.py
--	-rm -f $(DESTDIR)${bindir}/mpdchkpyver.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdcheck.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdchkpyver.py
- 	-rm -f $(DESTDIR)${bindir}/mpdcleanup
--	-rm -f $(DESTDIR)${bindir}/mpdcleanup.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdcleanup.py
- 	-rm -f $(DESTDIR)${bindir}/mpdexit
--	-rm -f $(DESTDIR)${bindir}/mpdexit.py
--	-rm -f $(DESTDIR)${bindir}/mpdgdbdrv.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdexit.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdgdbdrv.py
- 	-rm -f $(DESTDIR)${bindir}/mpdhelp
--	-rm -f $(DESTDIR)${bindir}/mpdhelp.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdhelp.py
- 	-rm -f $(DESTDIR)${bindir}/mpdkilljob
--	-rm -f $(DESTDIR)${bindir}/mpdkilljob.py
--	-rm -f $(DESTDIR)${bindir}/mpdlib.py
--	-rm -f $(DESTDIR)${bindir}/mpdlib.pyc
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdkilljob.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdlib.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdlib.pyc
- 	-rm -f $(DESTDIR)${bindir}/mpdlistjobs
--	-rm -f $(DESTDIR)${bindir}/mpdlistjobs.py
--	-rm -f $(DESTDIR)${bindir}/mpdman.py
--	-rm -f $(DESTDIR)${bindir}/mpdman.pyc
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdlistjobs.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdman.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdman.pyc
- 	-rm -f $(DESTDIR)${bindir}/mpdringtest
--	-rm -f $(DESTDIR)${bindir}/mpdringtest.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdringtest.py
- 	-rm -f $(DESTDIR)${bindir}/mpdrun
--	-rm -f $(DESTDIR)${bindir}/mpdrun.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdrun.py
- 	-rm -f $(DESTDIR)${bindir}/mpdsigjob
--	-rm -f $(DESTDIR)${bindir}/mpdsigjob.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdsigjob.py
- 	-rm -f $(DESTDIR)${bindir}/mpdtrace
--	-rm -f $(DESTDIR)${bindir}/mpdtrace.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpdtrace.py
- 	-rm -f $(DESTDIR)${bindir}/mpecc.in
- 	-rm -f $(DESTDIR)${bindir}/mpefc.in
- 	-rm -f $(DESTDIR)${bindir}/mpiexec
--	-rm -f $(DESTDIR)${bindir}/mpiexec.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpiexec.py
- 	-rm -f $(DESTDIR)${bindir}/mpirun
--	-rm -f $(DESTDIR)${bindir}/mpirun.py
-+	-rm -f $(DESTDIR)${PYTHONDIR}/mpirun.py
- 
- mpich2-mpdroot: mpich2-mpdroot.o
- 	$(C_LINK) -o mpich2-mpdroot mpich2-mpdroot.o $(LIBS)
-@@ -224,25 +232,29 @@
- 	    echo "mkdir -p $(DESTDIR)${bindir} " ;\
- 	    mkdir -p $(DESTDIR)${bindir} ;\
- 	fi   
-+	@if [ ! -d $(DESTDIR)${PYTHONDIR} ] ; then \
-+		echo "mkdir -p $(DESTDIR)${PYTHONDIR} " ;\
-+		mkdir -p $(DESTDIR)${PYTHONDIR} ; \
-+	fi
- 	for cmd in ${PYTHON_SOURCE} ; do \
- 	    if [ ! -s $(srcdir)/$$cmd.py ] ; then continue ; fi ; \
- 	    sed -e 's#/usr/bin/env python.*#/usr/bin/env ${PYTHON}#' ${srcdir}/$$cmd.py > $(DESTDIR)${bindir}/temp$$cmd.py ; \
--	    ${INSTALL} -m 755 $(DESTDIR)${bindir}/temp$$cmd.py $(DESTDIR)${bindir}/$$cmd.py; \
-+	    ${INSTALL} -m 755 $(DESTDIR)${bindir}/temp$$cmd.py $(DESTDIR)${PYTHONDIR}/$$cmd.py; \
- 	    ( rm -f $(DESTDIR)${bindir}/temp$$cmd.py >/dev/null 2>&1 || exit 0 ) ; \
- 	done
- 	cd $(DESTDIR)${bindir} && rm -f mpd
--	cd $(DESTDIR)${bindir} && @LN_S@ mpd.py mpd
-+	cd $(DESTDIR)${bindir} && @LN_S@ ${PYTHONLINK}/mpd.py mpd
- 	cd $(DESTDIR)${bindir} && rm -f mpdboot
--	cd $(DESTDIR)${bindir} && @LN_S@ mpdboot.py mpdboot
-+	cd $(DESTDIR)${bindir} && @LN_S@ ${PYTHONLINK}/mpdboot.py mpdboot
- 	for cmd in ${CMDS} ; do \
- 	    if [ $$cmd = "mpiexec" ] ; then continue ; fi ; \
- 	    ( cd $(DESTDIR)${bindir} && rm -f $$cmd ; ) ; \
--	    ( cd $(DESTDIR)${bindir} && @LN_S@ $$cmd.py $$cmd ; ) \
-+	    ( cd $(DESTDIR)${bindir} && @LN_S@ )${PYTHONLINK}/$$cmd.py $$cmd ; ) \
- 	done
--	( rm -f $(DESTDIR)${bindir}/mpdrun >/dev/null 2>&1 || exit 0 )
-+	( rm -f $(DESTDIR)${PYTHONDIR}/mpdrun >/dev/null 2>&1 || exit 0 )
- 	( rm -f $(DESTDIR)${bindir}/mpdrun.py >/dev/null 2>&1 || exit 0 )
--	mv -f $(DESTDIR)${bindir}/mpiexec.py $(DESTDIR)${bindir}/mpiexec.mpd
--	cd $(DESTDIR)${bindir} && @LN_S@ mpiexec.mpd mpdrun
-+	mv -f $(DESTDIR)${PYTHONDIR}/mpiexec.py $(DESTDIR)${PYTHONDIR}/mpiexec.mpd
-+	cd $(DESTDIR)${bindir} && @LN_S@ )${PYTHONLINK}/mpiexec.mpd mpdrun
- 
- # Empty dependencies target (MPICH2 wants this target)
- dependencies:
diff --git a/sys-cluster/mpich2/files/mpich2-1.2.1-fix-missing-libs.patch b/sys-cluster/mpich2/files/mpich2-1.2.1-fix-missing-libs.patch
deleted file mode 100644
index 1f2ba04cfe1c..000000000000
--- a/sys-cluster/mpich2/files/mpich2-1.2.1-fix-missing-libs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 94707148dc8c33a1d3245e1f0dd7e28542f91e75 Mon Sep 17 00:00:00 2001
-From: Steve Arnold <nerdboy@gentoo.org>
-Date: Wed, 4 Aug 2010 23:34:06 -0400
-Subject: [PATCH] Added missing library references for the f90 and C++ shared libraries
-
-Backport of upstream r6848.  Directly modifies the Makefile.in to avoid
-having to call simplemake to regenerate the entire build system.
-
-http://trac.mcs.anl.gov/projects/mpich2/changeset/6848
----
- Makefile.in |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index cbe4a93..d12babb 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -143,10 +143,10 @@ lib/libf${MPILIBNAME}.@SHLIB_EXT@: lib/libf${MPILIBNAME}.la
- 	(cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o libf${MPILIBNAME}.la  -rpath $(libdir) -L. -l$(MPILIBNAME) -ldflags "$(LDFLAGS)" $(LIBS))
- # Build the shared library from the shared object files
- lib/lib${MPILIBNAME}f90.@SHLIB_EXT@: lib/lib${MPILIBNAME}f90.la
--	(cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o lib${MPILIBNAME}f90.la  -rpath $(libdir)  -ldflags "$(LDFLAGS)" $(LIBS))
-+	(cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o lib${MPILIBNAME}f90.la  -rpath $(libdir) -L. -l$(MPILIBNAME) -ldflags "$(LDFLAGS)" $(LIBS))
- # Build the shared library from the shared object files
- lib/lib${MPICXXLIBNAME}.@SHLIB_EXT@: lib/lib${MPICXXLIBNAME}.la
--	(cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o lib${MPICXXLIBNAME}.la  -rpath $(libdir)  -ldflags "$(LDFLAGS)" $(LIBS))
-+	(cd lib && $(CREATESHLIB) --mode=link -version-info "@ABIVERSION@" -o lib${MPICXXLIBNAME}.la  -rpath $(libdir) -L. -l$(MPILIBNAME) -ldflags "$(LDFLAGS)" $(LIBS))
- 
- # --------------------------------------------------------------------------
- .libstamp0: 
--- 
-1.7.1
-
diff --git a/sys-cluster/mpich2/files/mpich2-1.4.1-fix-pkg-config-files.patch b/sys-cluster/mpich2/files/mpich2-1.4.1-fix-pkg-config-files.patch
deleted file mode 100644
index d9c311e31bb8..000000000000
--- a/sys-cluster/mpich2/files/mpich2-1.4.1-fix-pkg-config-files.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From cba731049a24735beb660dc236f61070aa6e387a Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Thu, 5 Jan 2012 22:20:31 -0500
-Subject: [PATCH] fix pkg config files
-
-Conditionals are not supported.
-https://trac.mcs.anl.gov/projects/mpich2/ticket/1044
----
- configure.in                             |    6 ++++++
- src/packaging/pkgconfig/mpich2-c.pc.in   |    8 +-------
- src/packaging/pkgconfig/mpich2-cxx.pc.in |    8 +-------
- src/packaging/pkgconfig/mpich2-f77.pc.in |    8 +-------
- src/packaging/pkgconfig/mpich2-f90.pc.in |    8 +-------
- 5 files changed, 10 insertions(+), 28 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 294dc85..44b1010 100644
---- a/configure.in
-+++ b/configure.in
-@@ -5332,6 +5332,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 394630b..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@
-+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 936ade6..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@
-+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 291462e..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@
-+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 ca15e18..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@
-+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/files/mpich2-1.4_rc2-fix-pkg-config-files.patch b/sys-cluster/mpich2/files/mpich2-1.4_rc2-fix-pkg-config-files.patch
deleted file mode 100644
index 9e319f4acfc0..000000000000
--- a/sys-cluster/mpich2/files/mpich2-1.4_rc2-fix-pkg-config-files.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-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/files/mpich2-hvector.patch b/sys-cluster/mpich2/files/mpich2-hvector.patch
deleted file mode 100644
index 9d67561e3680..000000000000
--- a/sys-cluster/mpich2/files/mpich2-hvector.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- src/binding/f90/buildiface	2011-12-06 09:57:04.000000000 +0100
-+++ src/binding/f90/buildiface	2011-12-06 09:57:54.000000000 +0100
-@@ -117,9 +117,13 @@
- 		  'Type_hindexed-3' => 'int[]',
- 		  'Type_indexed-2' => 'int[]',
- 		  'Type_indexed-3' => 'int[]',
-+		  'Type_hvector-3' => 'int', 
- 		  'Type_struct-2' => 'int[]',
- 		  'Type_struct-3' => 'int[]',
- 		  'Type_struct-4' => 'MPI_Datatype[]',
-+		  'Type_extent-2' => 'int',
-+		  'Type_lb-2' => 'int',
-+		  'Type_ub-2' => 'int',
- 		  'Waitall-2' => 'MPI_Request[]',
- 		  'Waitall-3' => 'MPI_Status[]',
- 		  'Waitany-2' => 'MPI_Request[]',
---- src/binding/f90/mpi_base.f90.in	2011-12-06 09:58:42.000000000 +0100
-+++ src/binding/f90/mpi_base.f90.in	2011-12-06 10:00:30.000000000 +0100
-@@ -15,9 +15,7 @@
-        END SUBROUTINE MPI_COMM_FREE_KEYVAL
- 
-        SUBROUTINE MPI_TYPE_EXTENT(v0,v1,ierror)
--       USE MPI_CONSTANTS,ONLY:MPI_ADDRESS_KIND
--       INTEGER v0
--       INTEGER(KIND=MPI_ADDRESS_KIND) v1
-+       INTEGER v0, v1
-        INTEGER ierror
-        END SUBROUTINE MPI_TYPE_EXTENT
- 
-@@ -114,9 +112,7 @@
-        END SUBROUTINE MPI_OP_COMMUTATIVE
- 
-        SUBROUTINE MPI_TYPE_LB(v0,v1,ierror)
--       USE MPI_CONSTANTS,ONLY:MPI_ADDRESS_KIND
--       INTEGER v0
--       INTEGER(KIND=MPI_ADDRESS_KIND) v1
-+       INTEGER v0, v1
-        INTEGER ierror
-        END SUBROUTINE MPI_TYPE_LB
- 
-@@ -562,9 +558,7 @@
-        END SUBROUTINE MPI_TYPE_CREATE_RESIZED
- 
-        SUBROUTINE MPI_TYPE_UB(v0,v1,ierror)
--       USE MPI_CONSTANTS,ONLY:MPI_ADDRESS_KIND
--       INTEGER v0
--       INTEGER(KIND=MPI_ADDRESS_KIND) v1
-+       INTEGER v0, v1
-        INTEGER ierror
-        END SUBROUTINE MPI_TYPE_UB
- 
-@@ -822,10 +816,7 @@
-        END SUBROUTINE MPI_GET_VERSION
- 
-        SUBROUTINE MPI_TYPE_HVECTOR(v0,v1,v2,v3,v4,ierror)
--       USE MPI_CONSTANTS,ONLY:MPI_ADDRESS_KIND
--       INTEGER v0, v1
--       INTEGER(KIND=MPI_ADDRESS_KIND) v2
--       INTEGER v3, v4
-+       INTEGER v0, v1, v2, v3, v4
-        INTEGER ierror
-        END SUBROUTINE MPI_TYPE_HVECTOR
- 
diff --git a/sys-cluster/mpich2/files/mpich2.envd b/sys-cluster/mpich2/files/mpich2.envd
deleted file mode 100644
index 624fedede93d..000000000000
--- a/sys-cluster/mpich2/files/mpich2.envd
+++ /dev/null
@@ -1 +0,0 @@
-MPD_CONF_FILE="@MPD_CONF_FILE_DIR@/mpd.conf"
diff --git a/sys-cluster/mpich2/mpich2-1.2.1_p1-r1.ebuild b/sys-cluster/mpich2/mpich2-1.2.1_p1-r1.ebuild
deleted file mode 100644
index 0d9506d49d57..000000000000
--- a/sys-cluster/mpich2/mpich2-1.2.1_p1-r1.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.2.1_p1-r1.ebuild,v 1.18 2013/07/09 22:26:38 jsbronder Exp $
-
-EAPI=2
-
-PYTHON_DEPEND="2"
-FORTRAN_NEEDED=fortran
-
-inherit eutils fortran-2 python toolchain-funcs
-
-MY_PV=${PV/_/}
-DESCRIPTION="MPICH2 - A portable MPI implementation"
-HOMEPAGE="http://www.mcs.anl.gov/research/projects/mpich2/index.php"
-SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${MY_PV}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="mpich2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86"
-IUSE="+cxx debug doc fortran threads romio mpi-threads"
-
-COMMON_DEPEND="dev-libs/libaio
-	romio? ( net-fs/nfs-utils )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	sys-devel/libtool"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	!media-sound/mpd
-	!sys-cluster/mpich
-	!sys-cluster/openmpi"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python_set_active_version 2
-	python_pkg_setup
-
-	if use mpi-threads && ! use threads; then
-		ewarn "mpi-threads requires threads, assuming that's what you want"
-	fi
-	MPD_CONF_FILE_DIR=/etc/${PN}
-}
-
-src_prepare() {
-	# Upstream trunk, r5843
-	epatch "${FILESDIR}"/0001-MPD_CONF_FILE-should-be-readable.patch
-	# Upstream trunk, r5844
-	epatch "${FILESDIR}"/0002-mpd_conf_file-search-order.patch
-	# Upstream trunk, r5845
-	epatch "${FILESDIR}"/0003-Fix-pkgconfig-for-mpich2-ch3-v1.2.1.patch
-	# Upstream trunk, r6848  #313045
-	epatch "${FILESDIR}"/mpich2-1.2.1-fix-missing-libs.patch
-
-	# We need f90 to include the directory with mods, and to
-	# fix hardcoded paths for src_test()
-	sed -i \
-		-e "s,F90FLAGS\( *\)=,F90FLAGS\1?=," \
-		-e "s,\$(bindir)/,${S}/bin/,g" \
-		-e "s,@MPIEXEC@,${S}/bin/mpiexec,g" \
-		$(find ./test/ -name 'Makefile.in') || die
-
-	if ! use romio; then
-		# These tests in errhan/ rely on MPI::File ...which is in romio
-		echo "" > test/mpi/errors/cxx/errhan/testlist
-	fi
-
-	# 293665:  Should check in on MPICH2_MPIX_FLAGS in later releases
-	# (>1.3) as this is seeing some development in trunk as of r6350.
-	sed -i \
-		-e 's|\(WRAPPER_[A-Z90]*FLAGS\)="@.*@"|\1=""|' \
-		src/env/mpi*.in || die
-
-}
-
-src_configure() {
-	local c="--enable-sharedlibs=gcc"
-	local romio_conf
-
-	# The configure statements can be somewhat confusing, as they
-	# don't all show up in the top level configure, however, they
-	# are picked up in the children directories.
-
-	use debug && c="${c} --enable-g=all --enable-debuginfo"
-
-	if use mpi-threads; then
-		# MPI-THREAD requries threading.
-	    c="${c} --with-thread-package=pthreads"
-		c="${c} --enable-threads=default"
-	else
-		if use threads ; then
-	    	c="${c} --with-thread-package=pthreads"
-		else
-	    	c="${c} --with-thread-package=none"
-		fi
-		c="${c} --enable-threads=single"
-	fi
-
-	# enable f90 support for appropriate compilers
-	case "$(tc-getFC)" in
-	    gfortran|if*)
-			c="${c} --enable-f77 --enable-f90";;
-	    g77)
-			c="${c} --enable-f77 --disable-f90";;
-	esac
-
-	c="${c} --sysconfdir=/etc/${PN}"
-	econf ${c} ${romio_conf} \
-		--docdir=/usr/share/doc/${PF} \
-		--with-pm=mpd:hydra \
-		--disable-mpe \
-		$(use_enable romio) \
-		$(use_enable cxx)
-}
-
-src_compile() {
-	# Oh, the irony.
-	# http://wiki.mcs.anl.gov/mpich2/index.php/Frequently_Asked_Questions#Q:_The_build_fails_when_I_use_parallel_make.
-	# https://trac.mcs.anl.gov/projects/mpich2/ticket/297
-	emake -j1 || die
-}
-
-src_test() {
-	local rc
-
-	cp "${FILESDIR}"/mpd.conf "${T}"/mpd.conf || die
-	chmod 600 "${T}"/mpd.conf
-	export MPD_CONF_FILE="${T}/mpd.conf"
-	"${S}"/bin/mpd --daemon --pid="${T}"/mpd.pid
-
-	make \
-		CC="${S}"/bin/mpicc \
-		CXX="${S}"/bin/mpicxx \
-		FC="${S}"/bin/mpif77 \
-		F90="${S}"/bin/mpif90 \
-		F90FLAGS="${F90FLAGS} -I${S}/src/binding/f90/" \
-		testing
-	rc=$?
-
-	"${S}"/bin/mpdallexit || kill $(<"${T}"/mpd.pid)
-	return ${rc}
-}
-
-src_install() {
-	local f
-	emake DESTDIR="${D}" install || die
-
-	dodir ${MPD_CONF_FILE_DIR}
-	insinto ${MPD_CONF_FILE_DIR}
-	doins "${FILESDIR}"/mpd.conf || die
-
-	dodir /usr/share/doc/${PF}
-	dodoc COPYRIGHT README CHANGES RELEASE_NOTES || die
-	newdoc src/pm/mpd/README README.mpd || die
-	if use romio; then
-		newdoc src/mpi/romio/README README.romio || die
-	fi
-
-	if ! use doc; then
-		rm -rf "${D}"/usr/share/doc/www*
-	else
-		dodir /usr/share/doc/${PF}/www
-		mv "${D}"/usr/share/doc/www*/* "${D}"/usr/share/doc/${PF}/www/
-	fi
-
-	# See #316937
-	MPD_PYTHON_MODULES=""
-	for f in "${D}"/usr/bin/*.py; do
-		MPD_PYTHON_MODULES="${MPD_PYTHON_MODULES} ${f##${D}}"
-	done
-}
-
-pkg_postinst() {
-	# Here so we can play with ebuild commands as a normal user
-	chown root:root "${ROOT}"${MPD_CONF_FILE_DIR}/mpd.conf
-	chmod 600 "${ROOT}"${MPD_CONF_FILE_DIR}/mpd.conf
-
-	elog ""
-	elog "MPE2 has been removed from this ebuild and now stands alone"
-	elog "as sys-cluster/mpe2."
-	elog ""
-
-	python_mod_optimize ${MPD_PYTHON_MODULES}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${MPD_PYTHON_MODULES}
-}
diff --git a/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild b/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
deleted file mode 100644
index ab3a6512e97c..000000000000
--- a/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild,v 1.9 2013/07/09 22:26:38 jsbronder Exp $
-
-EAPI=4
-
-FORTRAN_NEEDED=fortran
-
-inherit autotools eutils fortran-2 toolchain-funcs
-
-MY_PV=${PV/_/}
-DESCRIPTION="A high performance and portable MPI implementation"
-HOMEPAGE="http://www.mcs.anl.gov/research/projects/mpich2/index.php"
-SRC_URI="http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${MY_PV}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="mpich2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+cxx debug doc fortran mpi-threads romio threads"
-
-COMMON_DEPEND="dev-libs/libaio
-	<sys-apps/hwloc-1.5
-	romio? ( net-fs/nfs-utils )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	sys-devel/libtool"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-cluster/mpich
-	!sys-cluster/openmpi"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-pkg_setup() {
-	if use fortran; then
-		FORTRAN_STANDARD="77 90"
-		fortran-2_pkg_setup
-	fi
-
-	if use mpi-threads && ! use threads; then
-		ewarn "mpi-threads requires threads, assuming that's what you want"
-	fi
-}
-
-src_prepare() {
-	# Cannot use bin/mpiexec as hydra is built by autotools and is
-	# a shell wrapped executable.
-	sed -i \
-		-e "s,@MPIEXEC@,${S}/src/pm/hydra/mpiexec.hydra,g" \
-		$(find ./test/ -name 'Makefile.in') || die
-
-	# #293665
-	# We could use MPICH2LIB_XFLAGS here and unset the cooresponding ones
-	# in the environment, however that's messy and doesn't for for LDFLAGS.
-	sed -i \
-		-e 's,\(.*=\ *\)"@WRAPPER_[A-Z]*FLAGS@",\1"",' \
-		src/env/*.in || die
-
-	# See
-	# http://lists.mcs.anl.gov/pipermail/mpich-discuss/2011-August/010680.html
-	# http://lists.mcs.anl.gov/pipermail/mpich-discuss/2011-August/010678.html
-	# and countless other sources pointing out the insanity.
-	sed -i \
-		-e 's|prefix=${DESTDIR}|prefix=|g' \
-		-e 's|dir=${DESTDIR}|dir=|g' \
-		Makefile.in || die
-
-	sed -i \
-		-e "s|prefix='\${DESTDIR}|prefix='|" \
-		-e "s|dir='\${DESTDIR}|dir='|" \
-		src/env/Makefile.in || die
-
-	# 369263 and 1500 upstream.
-	epatch "${FILESDIR}"/mpich2-1.4.1-fix-pkg-config-files.patch
-
-	# 393361, backport of r8809 upstream.
-	epatch "${FILESDIR}"/mpich2-hvector.patch
-
-	AT_M4DIR="${S}"/confdb eautoreconf
-}
-
-src_configure() {
-	local c="--enable-shared --disable-rpath"
-	local romio_conf
-
-	# The configure statements can be somewhat confusing, as they
-	# don't all show up in the top level configure, however, they
-	# are picked up in the children directories.
-
-	use debug && c="${c} --enable-g=dbg --enable-debuginfo"
-
-	if use mpi-threads; then
-		# MPI-THREAD requries threading.
-		c="${c} --with-thread-package=pthreads"
-		c="${c} --enable-threads=runtime"
-	else
-		if use threads ; then
-			c="${c} --with-thread-package=pthreads"
-		else
-			c="${c} --with-thread-package=none"
-		fi
-		c="${c} --enable-threads=single"
-	fi
-
-	c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
-	econf ${c} ${romio_conf} \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--with-pm=hydra \
-		--disable-mpe \
-		--with-hwloc-prefix="${EPREFIX}/usr" \
-		--disable-fast \
-		--enable-smpcoll \
-		$(use_enable romio) \
-		$(use_enable cxx) \
-		$(use_enable fortran f77) \
-		$(use_enable fortran fc)
-}
-
-src_compile() {
-	# Oh, the irony.
-	# http://wiki.mcs.anl.gov/mpich2/index.php/Frequently_Asked_Questions#Q:_The_build_fails_when_I_use_parallel_make.
-	# https://trac.mcs.anl.gov/projects/mpich2/ticket/711
-	emake -j1
-}
-
-src_test() {
-	# See #362655 and comments in the testlist files.
-	# large_message:  only on machines with > 8gb of ram
-	# bcastlength:  This is an extension to MPI that's not necessary
-	# non_zero_root: performance test
-	# Also note that I/O tests may fail on non-local filesystems.
-	sed -i '/^[# ]*large_message/d' test/mpi/pt2pt/testlist || die
-	sed -i '/^[# ]*bcastlength/d' test/mpi/errors/coll/testlist || die
-	sed -i '/^[# ]*non_zero_root/d' test/mpi/perf/testlist || die
-
-	# Failing tests based on requiring MPI_THREAD_MULTIPLE.
-	# http://lists.mcs.anl.gov/pipermail/mpich-discuss/2012-January/011618.html
-	sed -i \
-		-e '/^[# ]*pt2pt/d' \
-		-e '/^[# ]*comm/d' \
-		-e '/^[# ]*spawn/d' \
-		test/mpi/threads/testlist || die
-
-	emake -j1 \
-		CC="${S}"/bin/mpicc \
-		CXX="${S}"/bin/mpicxx \
-		F77="${S}"/bin/mpif77 \
-		FC="${S}"/bin/mpif90 \
-		testing
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-
-	dodir /usr/share/doc/${PF}
-	dodoc COPYRIGHT README CHANGES RELEASE_NOTES || die
-	newdoc src/pm/hydra/README README.hydra|| die
-	if use romio; then
-		newdoc src/mpi/romio/README README.romio || die
-	fi
-
-	if ! use doc; then
-		rm -rf "${D}"/usr/share/doc/${PF}/www* || die
-	fi
-}
author	Justin Bronder <jsbronder@gentoo.org>	2014-04-09 14:20:58 +0000
committer	Justin Bronder <jsbronder@gentoo.org>	2014-04-09 14:20:58 +0000
commit	0603b6d2d18e31be16283de06b77a0d70589ecc9 (patch)
tree	aad7a7de960ae46c5209728d60c1ce528ff8dc31 /sys-cluster
parent	Cleanup old. (diff)
download	historical-0603b6d2d18e31be16283de06b77a0d70589ecc9.tar.gz historical-0603b6d2d18e31be16283de06b77a0d70589ecc9.tar.bz2 historical-0603b6d2d18e31be16283de06b77a0d70589ecc9.zip