Added 3.61 to x86. New version 3.62. Removed old versions.

8 files changed, 18 insertions, 61 deletions

diff --git a/app-sci/phylip/ChangeLog b/app-sci/phylip/ChangeLog
index f4c736f96b7a..80013e916dba 100644
--- a/app-sci/phylip/ChangeLog
+++ b/app-sci/phylip/ChangeLog
@@ -1,6 +1,12 @@
 # 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.6 2004/08/07 18:54:54 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/phylip/ChangeLog,v 1.7 2004/09/29 21:39:58 ribosome Exp $
+
+*phylip-3.62 (29 Sep 2004)
+
+  29 Sep 2004; Olivier Fisette <ribosome@gentoo.org> -phylip-3.5.ebuild,
+  -phylip-3.6.ebuild, phylip-3.61.ebuild, +phylip-3.62.ebuild:
+  Added 3.61 to x86. New version 3.62. Removed old versions.
 
 *phylip-3.61.ebuild (7 Aug 2004)
 
diff --git a/app-sci/phylip/Manifest b/app-sci/phylip/Manifest
index b3fd20b62a6b..f95905cf58a7 100644
--- a/app-sci/phylip/Manifest
+++ b/app-sci/phylip/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 f99e734a348ee2861ba45a28ec151812 phylip-3.61.ebuild 786
+MD5 a622a19ca3925ee9188f71ec1830caa0 phylip-3.62.ebuild 963
 MD5 ce71ede2777f6e196c27980a53a7ddae ChangeLog 982
 MD5 e8b4df3df76800c376905734d8043cfa metadata.xml 216
-MD5 e3e8ee33c6204b2395f4c2793cd95c7e phylip-3.5.ebuild 1401
-MD5 4d8f84b42744a11547c845cfa8493b72 phylip-3.6.ebuild 844
-MD5 ffb8dc265c840e7fb43d03cc6ed1822a phylip-3.61.ebuild 787
-MD5 cfa8a22ac65037bfe8dfefda7c4171f5 files/digest-phylip-3.5 57
-MD5 bb199081099f331eaaf2e491736e754e files/digest-phylip-3.6 62
 MD5 77bbf087b7d892c8912f13ae85e74f32 files/digest-phylip-3.61 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBU2LfHTu7gpaalycRAmWyAJwMLWOKehJEBL6dB03WamYZYFJQAACaAvfu
-1Oh7OkzmhwFTuDjPRcD2zVI=
-=VNsS
------END PGP SIGNATURE-----
+MD5 0481945687ffd40c06299b75ef705653 files/digest-phylip-3.62 64
diff --git a/app-sci/phylip/files/digest-phylip-3.5 b/app-sci/phylip/files/digest-phylip-3.5
deleted file mode 100644
index d8a2c6e6b732..000000000000
--- a/app-sci/phylip/files/digest-phylip-3.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d437d19d82fd84c723a73b6420aae4fc phylip.tar.Z 932516
diff --git a/app-sci/phylip/files/digest-phylip-3.6 b/app-sci/phylip/files/digest-phylip-3.6
deleted file mode 100644
index 4ebfb819dd59..000000000000
--- a/app-sci/phylip/files/digest-phylip-3.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 80a234e102da5dc2ee17515e599d1d30 phylip-3.6.tar.gz 839710
diff --git a/app-sci/phylip/files/digest-phylip-3.62 b/app-sci/phylip/files/digest-phylip-3.62
new file mode 100644
index 000000000000..001d7d7d8187
--- /dev/null
+++ b/app-sci/phylip/files/digest-phylip-3.62
@@ -0,0 +1 @@
+MD5 2f3858d2628e499cb6d7a817f359364b phylip-3.62.tar.gz 1046539
diff --git a/app-sci/phylip/phylip-3.5.ebuild b/app-sci/phylip/phylip-3.5.ebuild
deleted file mode 100644
index 5eef8b21d524..000000000000
--- a/app-sci/phylip/phylip-3.5.ebuild
+++ /dev/null
@@ -1,37 +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.5.ebuild,v 1.6 2004/09/23 23:57:07 vapier Exp $
-
-DESCRIPTION="PHYLIP (the PHYLogeny Inference Package) is a package of programs for inferring phylogenies (evolutionary trees)"
-HOMEPAGE="http://evolution.genetics.washington.edu/phylip.html"
-SRC_URI="ftp://evolution.genetics.washington.edu/pub/phylip/${PN}.tar.Z"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND=""
-
-S=${WORKDIR}
-
-src_compile() {
-	emake -e ${CFLAGS} || die
-}
-
-src_install() {
-	dobin clique consense contml contrast dnacomp dnadist dnainvar
-	dobin dnaml dnamlk dnamove dnapars dnapenny dollop dolmove dolpenny
-	dobin drawgram drawtree factor fitch gendist kitsch mix move neighbor
-	dobin penny protdist protpars restml retree seqboot
-
-	dodoc README clique.doc dnadist.doc dolmove.doc
-	dodoc kitsch.doc protml.doc consense.doc dnainvar.doc
-	dodoc dolpenny.doc main.doc protpars.doc contchar.doc
-	dodoc dnaml.doc draw.doc makeinf.doc restml.doc contml.doc
-	dodoc dnamlk.doc drawgram.doc
-	dodoc mix.doc retree.doc contrast.doc dnamove.doc drawtree.doc
-	dodoc move.doc seqboot.doc discrete.doc dnapars.doc factor.doc
-	dodoc neighbor.doc  sequence.doc distance.doc  dnapenny.doc  fitch.doc
-	dodoc penny.doc dnacomp.doc   dollop.doc    gendist.doc   protdist.doc
-}
diff --git a/app-sci/phylip/phylip-3.61.ebuild b/app-sci/phylip/phylip-3.61.ebuild
index f120a8be87e9..5bdf37ea32ae 100644
--- a/app-sci/phylip/phylip-3.61.ebuild
+++ b/app-sci/phylip/phylip-3.61.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2004/09/23 23:57:07 vapier Exp $
+# $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"
@@ -8,7 +8,7 @@ SRC_URI="ftp://evolution.genetics.washington.edu/pub/${PN}/${P}.tar.gz"
 
 LICENSE="freedist"
 SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~ppc x86"
 IUSE=""
 
 DEPEND="virtual/libc
diff --git a/app-sci/phylip/phylip-3.6.ebuild b/app-sci/phylip/phylip-3.62.ebuild
index b71cd56d6032..3093151a84f9 100644
--- a/app-sci/phylip/phylip-3.6.ebuild
+++ b/app-sci/phylip/phylip-3.62.ebuild
@@ -1,6 +1,6 @@
 # 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.6.ebuild,v 1.3 2004/07/23 16:03:01 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/phylip/phylip-3.62.ebuild,v 1.1 2004/09/29 21:39:58 ribosome Exp $
 
 DESCRIPTION="PHYLIP - The PHYLogeny Inference Package"
 HOMEPAGE="http://evolution.genetics.washington.edu/${PN}.html"
@@ -17,8 +17,11 @@ DEPEND="virtual/libc
 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
 	mkdir ../fonts
-	emake -j1 -e all put || die
+	emake -j1 all put || die
 	mv ../exe/font* ../fonts
 }
 
@@ -34,6 +37,4 @@ src_install()
 
 	insinto /usr/share/${PN}/fonts
 	doins fonts/*
-	insinto /usr/share/${PN}/icons
-	doins src/icons/*.ico
 }