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 | b1fdb5e278f46921685c5f0b05fefeae7960d964 (patch) | |
| tree | e6ad3646de178304093908cd7a42e8b963259b70 /sys-cluster | |
| parent | old (diff) | |
| download | gentoo-2-b1fdb5e278f46921685c5f0b05fefeae7960d964.tar.gz gentoo-2-b1fdb5e278f46921685c5f0b05fefeae7960d964.tar.bz2 gentoo-2-b1fdb5e278f46921685c5f0b05fefeae7960d964.zip | |
Remove sweep to avoid conflict with media-libs/sweep. #245439.
(Portage version: 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/lam-mpi-7.1.4-r1.ebuild | 9 |
2 files changed, 13 insertions, 2 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/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 |