Version bump and removed old ebuilds.

(Portage version: 2.2_rc8/cvs/Linux 2.6.26-SENTINEL-2 i686)

3 files changed, 18 insertions, 41 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/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"
 }