diff options
| author |   Justin Bronder <jsbronder@gentoo.org> | 2009-07-15 16:36:12 +0000 |
|---|---|---|
| committer | Justin Bronder <jsbronder@gentoo.org> | 2009-07-15 16:36:12 +0000 |
| commit | 54ec0549ab0187a3ca49e9f7b1ff5fb2e6fdcc73 (patch) | |
| tree | b0973767a8b7b087952bec928ef66b02dbf6b377 /sys-cluster | |
| parent | old (diff) | |
| download | historical-54ec0549ab0187a3ca49e9f7b1ff5fb2e6fdcc73.tar.gz historical-54ec0549ab0187a3ca49e9f7b1ff5fb2e6fdcc73.tar.bz2 historical-54ec0549ab0187a3ca49e9f7b1ff5fb2e6fdcc73.zip | |
Remove sweep to avoid conflict with media-libs/sweep. #245439.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'sys-cluster')
| -rw-r--r-- | sys-cluster/lam-mpi/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-cluster/lam-mpi/Manifest | 10 | ||||
| -rw-r--r-- | sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild | 9 |
3 files changed, 18 insertions, 7 deletions
diff --git a/sys-cluster/lam-mpi/ChangeLog b/sys-cluster/lam-mpi/ChangeLog index 26af3aec4d97..132f1e585b99 100644 --- a/sys-cluster/lam-mpi/ChangeLog +++ b/sys-cluster/lam-mpi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-cluster/lam-mpi # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/ChangeLog,v 1.73 2009/07/10 23:41:47 jsbronder Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/ChangeLog,v 1.74 2009/07/15 16:36:12 jsbronder Exp $ + + 15 Jul 2009; Justin Bronder <jsbronder@gentoo.org> + lam-mpi-7.1.4-r1.ebuild: + Remove sweep to avoid conflict with media-libs/sweep. #245439. 10 Jul 2009; Justin Bronder <jsbronder@gentoo.org> lam-mpi-7.1.4-r1.ebuild: diff --git a/sys-cluster/lam-mpi/Manifest b/sys-cluster/lam-mpi/Manifest index 4a32326cef20..7dee4a6b5c21 100644 --- a/sys-cluster/lam-mpi/Manifest +++ b/sys-cluster/lam-mpi/Manifest @@ -10,14 +10,14 @@ DIST lam-7.1.2.tar.bz2 7851483 RMD160 4aeb62d41dc0b6f910424feb1046c6925bd620c4 S DIST lam-7.1.4.tar.bz2 7865813 RMD160 6c9c6338391472d4cd2572c409cb92360e7fd799 SHA1 ce8a983004f31d5960d34efe3ed9ac489e9dfc9d SHA256 d66c205f57d9ffc38dbfb81faef8b586ef2b9e08853034c0472ef4ae45803d2e EBUILD lam-mpi-7.0.4.ebuild 1482 RMD160 df6743f26ad6df6f15bf27d010539470d73685c7 SHA1 8d429fd88c782acc3176f69d8aa80ba9cd55d849 SHA256 7b5fdc8cdba559a3586599bb7b03884e1cfddd35868ca14a30e74b42bc5bd7ce EBUILD lam-mpi-7.1.2.ebuild 2633 RMD160 e8bc046655650384f71714f5459dcae141cf5e16 SHA1 71ebfe8171b09d1e751b058120a06c4a5cb9191e SHA256 978bf9ff2fefa41d0d6a8a4c9ec9846399a1578028c349df993d9fb27bb6e7c6 -EBUILD lam-mpi-7.1.4-r1.ebuild 4648 RMD160 28f6411841448880f2cc9e16036e931a24565789 SHA1 2eabf3a6a3dde84beb68951654fabfde42f8a1ee SHA256 d01493616e14ccd3649211751ba4331c8dcc17007b624a8ef8994cc8dfdbb1ec +EBUILD lam-mpi-7.1.4-r1.ebuild 4920 RMD160 f85488a758216eb2763e7057f0eae38d682fb582 SHA1 db93780bf2090d54cb232b3e342efd0e75a238d8 SHA256 4bbf528d76ba2e33cab57539951fb61b62a0fce17b141f077649d411f6fc07dc EBUILD lam-mpi-7.1.4.ebuild 3989 RMD160 334f39ea183e242c6b2f12d9248ba492c686e4bf SHA1 68b6ae5e072cc5a00ee2ebb25b04a5ea8bf6c83c SHA256 80344730af0d7046afdca0223de04fcdae19ee7422a4370ced9f06b4db6ba69b -MISC ChangeLog 12277 RMD160 8da4b2420274a0531974b592e7a94a41be89f2bc SHA1 8c5d891fbbc2a62a9b8a28fd8dd1a9154f3761de SHA256 7291800e5a408a9a68b76d101d7b723e8a5ff68ed7c8631e8e0d041522f94842 +MISC ChangeLog 12423 RMD160 c5d85b615657057d852c498fd1fe4ba0581b696a SHA1 de936aa8e631e17bf8b0d902a7922aa8d0dc20cd SHA256 5f39157ccda04fcb9477a251985c4e95f9073fdaecf4c0eb551108ab47b175fe MISC metadata.xml 506 RMD160 b07d8e3f5f1b8a9b4c9ab9106e0219382256ef59 SHA1 7f2fa66c0847b74f32827241201d30a0d9050759 SHA256 98f3e810fe814223972ecdf54cbb519ce2d687cc5bbac4ef739d44d0efe451b0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAkpX0cYACgkQ4MrvBE1wQ8k2MwCfUdJkx0WUnX7xh4vzG9ir9yLN -idAAnjGQvlUe/Y8S3ney4Blc4bWNuhKH -=dKpF +iEYEARECAAYFAkpeBYEACgkQ4MrvBE1wQ8lmowCfQu7NaC0sOZ1yjXJaA8gykHsa +KiAAn1wlFgjW7Y2IwkXUAS5xLjwrLkJq +=W0ZS -----END PGP SIGNATURE----- diff --git a/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild b/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild index 88effd3739cd..bd5ecd891b34 100644 --- a/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild +++ b/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.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/lam-mpi/lam-mpi-7.1.4-r1.ebuild,v 1.4 2009/07/10 23:41:47 jsbronder Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/lam-mpi/lam-mpi-7.1.4-r1.ebuild,v 1.5 2009/07/15 16:36:12 jsbronder Exp $ inherit autotools eutils fortran flag-o-matic multilib portability @@ -138,6 +138,13 @@ src_install () { dodoc README HISTORY VERSION dodoc "${S}"/doc/{user,install}.pdf + # With USE=xmpi /usr/bin/sweep is installed. However it's just + # a bash script to call bfctl -R and it causes file collisions + # with media-sound/sweep. Hence, we remove it, see man bfcfl. + if [ -f "${D}"/usr/bin/sweep ]; then + rm -f "${D}"/usr/bin/sweep || die + fi + if use examples; then cd "${S}"/examples dodir /usr/share/${P}/examples |