Fixed file collision with "sys-apps/coreutils" (bug #115482)

(Portage version: 2.0.51.22-r3)

5 files changed, 30 insertions, 2 deletions

diff --git a/sci-biology/phylip/ChangeLog b/sci-biology/phylip/ChangeLog
index 643014a18b2d..8a30ea1101be 100644
--- a/sci-biology/phylip/ChangeLog
+++ b/sci-biology/phylip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-biology/phylip
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/phylip/ChangeLog,v 1.14 2005/10/18 01:03:07 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/phylip/ChangeLog,v 1.15 2005/12/14 16:28:55 ribosome Exp $
+
+*phylip-3.65-r1 (14 Dec 2005)
+
+  14 Dec 2005; Olivier Fisette <ribosome@gentoo.org> +files/README.Gentoo,
+  -phylip-3.65.ebuild, +phylip-3.65-r1.ebuild:
+  Fixed file collision with "sys-apps/coreutils" (bug #115482). Keep only
+  fixed ebuild.
 
 *phylip-3.65 (18 Oct 2005)
 
diff --git a/sci-biology/phylip/Manifest b/sci-biology/phylip/Manifest
index 061bd576a4b3..a1b6561afb1f 100644
--- a/sci-biology/phylip/Manifest
+++ b/sci-biology/phylip/Manifest
@@ -1,6 +1,9 @@
+MD5 372c4f29f2f41ac2e70e67ea1f2cf9e2 phylip-3.65-r1.ebuild 1421
 MD5 22be4554cada0fd30a522d7b9e27b0bf phylip-3.65.ebuild 1273
 MD5 4f5e4fad2ff0866da98dff9d77c52279 ChangeLog 3112
 MD5 f189a3c4ff5ae55bcee4f8ed0ace5d20 metadata.xml 254
 MD5 b56d632ce611256d9e51dff8a142efe1 phylip-3.64.ebuild 988
 MD5 6a0365a6136c482528c2ddcd860a9d97 files/digest-phylip-3.64 64
 MD5 d87091a1c48c794109dbfb88336d9068 files/digest-phylip-3.65 64
+MD5 db251cf00973e0ed3fbf253071c8cec6 files/README.Gentoo 632
+MD5 d87091a1c48c794109dbfb88336d9068 files/digest-phylip-3.65-r1 64
diff --git a/sci-biology/phylip/files/README.Gentoo b/sci-biology/phylip/files/README.Gentoo
new file mode 100644
index 000000000000..0598c1541631
--- /dev/null
+++ b/sci-biology/phylip/files/README.Gentoo
@@ -0,0 +1,15 @@
+Using the PHYlogeny Inference Package on Gentoo systems
+
+Location of the factor program
+
+On Gentoo systems, the PHYLIP program "factor" is named "factor-phylip", in
+order to avoid a file collision with the program of the same name provided by
+the "sys-apps/coreutils" package.
+
+Location of the font files
+
+PHYLIP programs will find font files only if they are in a directory
+referenced by the "PATH" variable or if they are in the current working
+directory. When working with PHYLIP programs that need these files, either
+copy the fonts you need in your working directory, or add
+"/usr/share/phylip/fonts/" to your "PATH" variable.
diff --git a/sci-biology/phylip/files/digest-phylip-3.65 b/sci-biology/phylip/files/digest-phylip-3.65-r1
index ab57e5b003a0..ab57e5b003a0 100644
--- a/sci-biology/phylip/files/digest-phylip-3.65
+++ b/sci-biology/phylip/files/digest-phylip-3.65-r1
diff --git a/sci-biology/phylip/phylip-3.65.ebuild b/sci-biology/phylip/phylip-3.65-r1.ebuild
index 92973d37fb86..5414b633c8a0 100644
--- a/sci-biology/phylip/phylip-3.65.ebuild
+++ b/sci-biology/phylip/phylip-3.65-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/phylip/phylip-3.65.ebuild,v 1.1 2005/10/18 01:03:07 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/phylip/phylip-3.65-r1.ebuild,v 1.1 2005/12/14 16:28:55 ribosome Exp $
 
 inherit toolchain-funcs
 
@@ -26,6 +26,7 @@ src_compile() {
 	mkdir ../fonts
 	emake -j1 all put || die "Compilation failed."
 	mv ../exe/font* ../fonts || die "Font move failed."
+	mv ../exe/factor ../exe/factor-${PN} || die "Renaming factor failed."
 }
 
 src_install() {
@@ -33,6 +34,8 @@ src_install() {
 
 	dobin exe/* || "Failed to install programs."
 
+	dodoc "${FILESDIR}"/README.Gentoo || die "Failed to install Gentoo notes."
+
 	dohtml phylip.html || "Failed to install HTML documentation index."
 	insinto /usr/share/doc/${PF}/html/doc
 	doins doc/* || "Failed to install HTML documentation."