Removed old version. Added 3.62 to x86. Use gcc.eclass rather than CC.

5 files changed, 13 insertions, 44 deletions

diff --git a/app-sci/phylip/ChangeLog b/app-sci/phylip/ChangeLog
index 80013e916dba..0768d86fec41 100644
--- a/app-sci/phylip/ChangeLog
+++ b/app-sci/phylip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-sci/phylip
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/phylip/ChangeLog,v 1.7 2004/09/29 21:39:58 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/phylip/ChangeLog,v 1.8 2004/10/14 14:47:55 ribosome Exp $
+
+  14 Oct 2004; Olivier Fisette <ribosome@gentoo.org> -phylip-3.61.ebuild,
+  phylip-3.62.ebuild:
+  Added 3.62 to x86. Removed old version. Use gcc.eclass rather than ${CC}.
 
 *phylip-3.62 (29 Sep 2004)
 
diff --git a/app-sci/phylip/Manifest b/app-sci/phylip/Manifest
index 3798f46136e9..042c91ba62b8 100644
--- a/app-sci/phylip/Manifest
+++ b/app-sci/phylip/Manifest
@@ -1,6 +1,4 @@
-MD5 d8a7af9598c852028ffb06b5fb04e249 phylip-3.61.ebuild 788
-MD5 3b1067010021e647e014e8275d9b2c19 phylip-3.62.ebuild 963
-MD5 0049f9c9530e4c28cefbbce096595e16 ChangeLog 1208
+MD5 84e8eb051b52156cb68752c220e4d4c6 phylip-3.62.ebuild 981
+MD5 4496ac8518a73e1e9e41e394ee761a5e ChangeLog 1381
 MD5 e8b4df3df76800c376905734d8043cfa metadata.xml 216
-MD5 77bbf087b7d892c8912f13ae85e74f32 files/digest-phylip-3.61 63
 MD5 0481945687ffd40c06299b75ef705653 files/digest-phylip-3.62 64
diff --git a/app-sci/phylip/files/digest-phylip-3.61 b/app-sci/phylip/files/digest-phylip-3.61
deleted file mode 100644
index 81ba8f3c3a6e..000000000000
--- a/app-sci/phylip/files/digest-phylip-3.61
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4c5206c0dbb5b5f9a035adddda7c46b2 phylip-3.61.tar.gz 835969
diff --git a/app-sci/phylip/phylip-3.61.ebuild b/app-sci/phylip/phylip-3.61.ebuild
deleted file mode 100644
index 5bdf37ea32ae..000000000000
--- a/app-sci/phylip/phylip-3.61.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/phylip/phylip-3.61.ebuild,v 1.3 2004/09/29 21:39:58 ribosome Exp $
-
-DESCRIPTION="The PHYLogeny Inference Package"
-HOMEPAGE="http://evolution.genetics.washington.edu/${PN}.html"
-SRC_URI="ftp://evolution.genetics.washington.edu/pub/${PN}/${P}.tar.gz"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="~ppc x86"
-IUSE=""
-
-DEPEND="virtual/libc
-	virtual/x11"
-
-src_compile() {
-	cd src
-	mkdir ../fonts
-	emake -j1 -e all put || die
-	mv ../exe/font* ../fonts
-	mv ../doc/phylip.html ../phylip.html
-}
-
-src_install() {
-	dobin exe/* || die
-
-	dohtml phylip.html
-	insinto /usr/share/doc/${PF}/html/doc
-	doins doc/*
-
-	insinto /usr/share/${PN}/fonts
-	doins fonts/*
-}
diff --git a/app-sci/phylip/phylip-3.62.ebuild b/app-sci/phylip/phylip-3.62.ebuild
index 3093151a84f9..7f313d5859d6 100644
--- a/app-sci/phylip/phylip-3.62.ebuild
+++ b/app-sci/phylip/phylip-3.62.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/phylip/phylip-3.62.ebuild,v 1.1 2004/09/29 21:39:58 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/phylip/phylip-3.62.ebuild,v 1.2 2004/10/14 14:47:55 ribosome Exp $
+
+inherit gcc
 
 DESCRIPTION="PHYLIP - The PHYLogeny Inference Package"
 HOMEPAGE="http://evolution.genetics.washington.edu/${PN}.html"
@@ -8,7 +10,7 @@ SRC_URI="ftp://evolution.genetics.washington.edu/pub/${PN}/${P}.tar.gz"
 LICENSE="freedist"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 
 DEPEND="virtual/libc
@@ -18,8 +20,8 @@ S=${WORKDIR}/${P}/src
 
 src_compile() {
 	sed -i -e "s/CFLAGS =/CFLAGS = ${CFLAGS}/" Makefile
-	sed -i -e "s/CC        = cc/CC        = ${CC:gcc}/" Makefile
-	sed -i -e "s/DC        = cc/DC        = ${CC:gcc}/" Makefile
+	sed -i -e "s/CC        = cc/CC        = $(gcc-getCC)/" Makefile
+	sed -i -e "s/DC        = cc/DC        = $(gcc-getCC)/" Makefile
 	mkdir ../fonts
 	emake -j1 all put || die
 	mv ../exe/font* ../fonts