Version bump and removed old ebuilds.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-SENTINEL-2 i686

4 files changed, 21 insertions, 46 deletions

diff --git a/sci-biology/paml/ChangeLog b/sci-biology/paml/ChangeLog
index 76b367db7884..14a46a4f9dff 100644
--- a/sci-biology/paml/ChangeLog
+++ b/sci-biology/paml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-biology/paml
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/paml/ChangeLog,v 1.3 2008/04/20 11:11:20 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/paml/ChangeLog,v 1.4 2008/09/07 12:02:02 markusle Exp $
+
+*paml-4.1 (07 Sep 2008)
+
+  07 Sep 2008; Markus Dittrich <markusle@gentoo.org> -paml-3.15.ebuild,
+  +paml-4.1.ebuild, -paml-4a.ebuild:
+  Version bump and removed old ebuilds.
 
 *paml-4b (20 Apr 2008)
 
diff --git a/sci-biology/paml/Manifest b/sci-biology/paml/Manifest
index 936464c45388..d7614adc3c7c 100644
--- a/sci-biology/paml/Manifest
+++ b/sci-biology/paml/Manifest
@@ -1,8 +1,6 @@
-DIST paml3.15.tar.gz 2364043 RMD160 b38655012237f9237a1c9474746f504804395045 SHA1 0628b3557a20ba8a9a173c39fec2093f056e1050 SHA256 f698b1d57b514e5e06e746899eae1245d098e96881e2a31c9b8fc956beb4f62a
-DIST paml4a.tar.gz 2377543 RMD160 5be2b6e82f0abc52e1e4251a0b8728e4cece684b SHA1 7f1d8b40f27d735385735cc1652b6bf5a7aa1c06 SHA256 436968adfad51c0b9f28a5bc1196a5e123005b8e9c6df0c4200d791b7ed90f4e
+DIST paml4.1.tar.gz 2865301 RMD160 44e5eb18eb9a168c6d2f090ff45462e07234bc07 SHA1 790c83990a93baec48b55686bb350bed43fdc440 SHA256 64680a56304bb3f5cd61cfc9be253fe1fe37250cb450bceaaf76b99ee08111f1
 DIST paml4b.tar.gz 2380479 RMD160 4772ee6c736cc80cc299086c3f18446c22316321 SHA1 adbea6d18d3ea7f87ec37f14a1fe9cabecd1075f SHA256 2b8ebb8f276a822f7589fffe54ee31e170577b811e256536649c793e57d5a94a
-EBUILD paml-3.15.ebuild 799 RMD160 1590abccf695a390f4ebdd875f88bea662fcaba1 SHA1 cda700a52156d4441a561078aa8c6de216d14c61 SHA256 880d7c220b0ae9f1f10f20d5a1cc7a549a29d7d918165f0a0a93d6ad4a4884f7
-EBUILD paml-4a.ebuild 1091 RMD160 a622f5b7952f73d1460ba93f87bbc7f77909f1fa SHA1 fb54e9266541e2ff23c6f610e4e382e03b5100d8 SHA256 f42967e0be8ce0a420f303b366ec895430cbd965269e9e9c22fe08811f108fb0
+EBUILD paml-4.1.ebuild 1159 RMD160 e92d3c17407d5362b4438749c3d0d21eaad34337 SHA1 c848a2aee7e7fd0bfbde46b95899a5f84c7e58d6 SHA256 552630b699f130fa154eb719eecccc3a5ec58bfc398344aa3d54ca270fee4aa7
 EBUILD paml-4b.ebuild 1098 RMD160 aae656e556014013603f048c7bfa950cbf668e61 SHA1 a3326fc7c9f0409116dc00395241b749d043dc7a SHA256 7d0a9eec0b66114a6e1a201de8e5909f84dfd74b57fc81e3c76d247582b55d13
-MISC ChangeLog 644 RMD160 bf32f2573d8888379d01f8e9db5d01140f4ed588 SHA1 43ad58ccaf95f592dcfe394d570427cd51617587 SHA256 d7d102ec5ba7dcd33433f8143354d73f475d7416012f4f574dc1e281c956a388
+MISC ChangeLog 819 RMD160 293fa03f8081c82a8fc8155e1d27d938bb84eb0f SHA1 0bf663c5bb4d7ffcafba6d6b78d4b35ae1381f8e SHA256 0233e402d6913b7d87aec6831ae4a57f6c488a1f45e3a521e808a06656e34d4d
 MISC metadata.xml 164 RMD160 2f441200f2672ab5f1efae7cbdb08b284603903c SHA1 61a50baedfd041e663d6c2a41a28b57e22dbb6de SHA256 f0897b09e661dc603041dab249d73253034659189becf1a34cca37a7d51ef72f
diff --git a/sci-biology/paml/paml-3.15.ebuild b/sci-biology/paml/paml-3.15.ebuild
deleted file mode 100644
index 4c5ab262db60..000000000000
--- a/sci-biology/paml/paml-3.15.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/paml/paml-3.15.ebuild,v 1.2 2007/11/22 13:26:59 markusle Exp $
-
-inherit toolchain-funcs
-
-MY_P="${P/-}"
-DESCRIPTION="Phylogenetic Analysis by Maximum Likelihood"
-HOMEPAGE="http://abacus.gene.ucl.ac.uk/software/paml.html"
-SRC_URI="http://abacus.gene.ucl.ac.uk/software/${MY_P}.tar.gz"
-LICENSE="free-noncomm"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-RDEPEND=""
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	cd src
-	emake \
-		-f Makefile.UNIX \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		|| die "make failed"
-}
-
-src_install() {
-	pushd "${S}"/src
-	dobin baseml codeml basemlg mcmctree pamp evolver yn00 chi2
-	popd
-	dodoc README.txt doc/*
-}
diff --git a/sci-biology/paml/paml-4a.ebuild b/sci-biology/paml/paml-4.1.ebuild
index a47b92d6794e..f2ea1263ca95 100644
--- a/sci-biology/paml/paml-4a.ebuild
+++ b/sci-biology/paml/paml-4.1.ebuild
@@ -1,21 +1,20 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/paml/paml-4a.ebuild,v 1.2 2008/04/20 11:11:20 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/paml/paml-4.1.ebuild,v 1.1 2008/09/07 12:02:02 markusle Exp $
 
 inherit toolchain-funcs
 
-MY_PV="${PV:0:1}"
-MY_P="${PN}${MY_PV}"
+MY_PV="${PV/./}"
 DESCRIPTION="Phylogenetic Analysis by Maximum Likelihood"
 HOMEPAGE="http://abacus.gene.ucl.ac.uk/software/paml.html"
 SRC_URI="http://abacus.gene.ucl.ac.uk/software/${PN}${PV}.tar.gz"
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}"
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/${PN}${MY_PV}"
 
 src_compile() {
 	cd src
@@ -28,13 +27,18 @@ src_compile() {
 
 src_install() {
 	pushd "${S}"/src
-	dobin baseml codeml basemlg mcmctree pamp evolver yn00 chi2
+	dobin baseml codeml basemlg mcmctree pamp evolver yn00 chi2 \
+		|| die "Failed to install binaries"
 	popd
-	dodoc README.txt doc/*
+
+	dodoc README.txt doc/* || die "Failed to install docs"
+
 	insinto /usr/share/${PN}/control
 	doins *.ctl || die "Failed to install control files"
+
 	insinto /usr/share/${PN}/dat
 	doins stewart* *.dat dat/* || die "Failed to install data files"
+
 	insinto /usr/share/${PN}
 	doins -r examples/ || die "Failed to install examples"
 }