aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <seb@saffron.(none)>2009-04-02 16:30:35 +0100
committerSebastien Fabbro <seb@saffron.(none)>2009-04-02 16:30:35 +0100
commit0c36bab8e103769115befd73c59eee376665aa8a (patch)
tree8338832150deee5a14e16325a90116e94de09212
parentMerge branch 'master' of git+ssh://git@git.overlays.gentoo.org/proj/sci (diff)
parentFix manifest, again (diff)
downloadsci-0c36bab8e103769115befd73c59eee376665aa8a.tar.gz
sci-0c36bab8e103769115befd73c59eee376665aa8a.tar.bz2
sci-0c36bab8e103769115befd73c59eee376665aa8a.zip
Merge branch 'master' of git+ssh://git@git.overlays.gentoo.org/proj/sci
-rw-r--r--sys-cluster/mpich2/ChangeLog4
-rw-r--r--sys-cluster/mpich2/Manifest5
-rw-r--r--sys-cluster/mpich2/files/mpich2.envd1
-rw-r--r--sys-cluster/mpich2/mpich2-1.0.8-r1.ebuild11
4 files changed, 6 insertions, 15 deletions
diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 0ac102dd9..d4979c843 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 02 Apr 2009; Justin Bronder <jsbronder@gentoo.org>
+ -sys-cluster/mpich2/files/mpich2.envd:
+ Remove envd file, no longer necessary.
+
01 Apr 2009; Justin Bronder <jsbronder@gentoo.org>
sys-cluster/mpich2/files/mpich2-1.0.8-mpdconf-env.patch,
-sys-cluster/mpich2/files/mpich2-1.0.8-site-packages-py.patch:
diff --git a/sys-cluster/mpich2/Manifest b/sys-cluster/mpich2/Manifest
index 90005b3b2..4114d35d6 100644
--- a/sys-cluster/mpich2/Manifest
+++ b/sys-cluster/mpich2/Manifest
@@ -3,8 +3,7 @@ AUX mpd.conf 48 RMD160 289de9bb40759e3f71229cf47e4d2af83703a85f SHA1 244eee76dbf
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
AUX mpich2-1.0.8-pkgconfig.patch 928 RMD160 5ce7a800423f250dba0dd69560abebf845e7e556 SHA1 afba6883d1204a4b7c082af7e976186153263d64 SHA256 7f8dcafcb0d138130a684284d9bca86e4834f74a5132f0fef4556391abf43f8e
-AUX mpich2.envd 45 RMD160 e29a0d617bbc15cc42d3088f8a79c1c715b353fa SHA1 765b885d0e1d65fe7ba845cf72e3e923613d6514 SHA256 d6f128f84e1d015922af42e1280586b84737740b2517cc0b35f498b571f252f9
DIST mpich2-1.0.8.tar.gz 17237476 RMD160 646cf50fbdc60a49809f4d0a6bcaf2835844db1f SHA1 41d6f6ce1034ecec5c14fb03592730ae2dd071e5 SHA256 7551ce20f3ef366567c566d08782323360b5dbd2d15d816e41c10b5f96eaf369
-EBUILD mpich2-1.0.8-r1.ebuild 5546 RMD160 5332d8b0fa9844f195e246ca6b54619e9e01b318 SHA1 10e4ca39b6caa5b73726450bb40023dba2913260 SHA256 fcf5b454a7013c0efd450da574563e808dcd76ef5971eb0d50366362e92cbbc5
-MISC ChangeLog 1129 RMD160 ada40eabad0ac9f9bf6d5b7460c58826525521ca SHA1 1d3eab1db8f90d2bd7b86c28069597ab4b56f3eb SHA256 2f0d758c46f0738a27a023c14f4d0104d61c8afbe52aa6939c6f0a3d308dec01
+EBUILD mpich2-1.0.8-r1.ebuild 5240 RMD160 f1d871778940074334539cd4f9ef11749fba6eb8 SHA1 36e38cde4a648a31e3e413b6521508a948a18209 SHA256 c9d014301a1c6f6498fab873055bb9f038f2d3890b997aa9d2a4815b20152dca
+MISC ChangeLog 1265 RMD160 b0fdbbc732962beaa5a92132b54486e1ae09f3b0 SHA1 e604ec892c022ba56ec6b3555de9f608671ca086 SHA256 32c05228b74d5cafd73b51353af3560edb0cfce61b9be522c64ca94fc31abdfa
MISC metadata.xml 468 RMD160 98d955b7fd33a5b54c618424df4bc1237bb91a21 SHA1 eb055936e1a4ecafa846c1b7be6bc8c96d503ba1 SHA256 9516aa2c4536c5bc0555b42af1019a82e0f027ba8e52c0c46bcb5ee3fff8a765
diff --git a/sys-cluster/mpich2/files/mpich2.envd b/sys-cluster/mpich2/files/mpich2.envd
deleted file mode 100644
index 624fedede..000000000
--- 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.0.8-r1.ebuild b/sys-cluster/mpich2/mpich2-1.0.8-r1.ebuild
index e16deb49d..4fd2ad798 100644
--- a/sys-cluster/mpich2/mpich2-1.0.8-r1.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.0.8-r1.ebuild
@@ -188,17 +188,6 @@ src_install() {
mv "${D}"/${d}/usr/share/doc/www*/* "${D}"/${d}/usr/share/doc/${PF}/www/
fi
- cp "${FILESDIR}"/${PN}.envd "${T}"/
- sed -i "s,@MPD_CONF_FILE_DIR@,${MPD_CONF_FILE_DIR}," \
- "${T}"/${PN}.envd || die
-
- if mpi_classed; then
- # TODO: This breaks down with more than one mpich2 installed.
- newenvd "${T}"/${PN}.envd 25mpich2-$(mpi_class)
- else
- newenvd "${T}"/${PN}.envd 25mpich2
- fi
-
mpi_imp_add_eselect
}