summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2010-05-22 12:49:34 +0000
committerJustin Lecher <jlec@gentoo.org>2010-05-22 12:49:34 +0000
commit46ac2520fed730269accbe9477bb18fe1ed2f6ff (patch)
tree90647552a355fc9f182cb33e52aa274ff1862928 /sci-chemistry
parentUpdate syntax for the new eclass changes, add a dependency on itself or tests... (diff)
downloadgentoo-2-46ac2520fed730269accbe9477bb18fe1ed2f6ff.tar.gz
gentoo-2-46ac2520fed730269accbe9477bb18fe1ed2f6ff.tar.bz2
gentoo-2-46ac2520fed730269accbe9477bb18fe1ed2f6ff.zip
Removed last collision
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sci-chemistry')
-rw-r--r--sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r3.ebuild5
1 files changed, 3 insertions, 2 deletions
diff --git a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r3.ebuild b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r3.ebuild
index d32bf415f82f..110a0e448757 100644
--- a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r3.ebuild
+++ b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r3.ebuild,v 1.1 2010/05/22 11:34:22 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r3.ebuild,v 1.2 2010/05/22 12:49:34 jlec Exp $
EAPI="3"
@@ -422,7 +422,8 @@ src_install() {
dosym ../../share/doc/${PF}/html /usr/$(get_libdir)/ccp4/html
# Fix overlaps with other packages
- rm -f "${D}"/usr/share/man/man1/rasmol.1* "${D}"/usr/lib/font84.dat || die
+ rm -f "${ED}"/usr/share/man/man1/rasmol.1* "${ED}"/usr/lib/font84.dat || die
+ mv "${ED}"/usr/share/man/man1/truncate{,-ccp4}* || die
cat >> "${T}"/baubles <<- EOF
#!${EPREFIX}/bin/bash