[gentoo-commits] repo/gentoo:master commit in: sci-biology/njplot/

[gentoo-commits] repo/gentoo:master commit in: sci-biology/njplot/

[David Seifert]

commit:     c458c83d9effcae240895c51e968764221f2e7dd
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 25 21:38:40 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 25 21:39:23 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c458c83d

sci-biology/njplot: Remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-biology/njplot/njplot-2.3-r1.ebuild | 35 ---------------------------------
 sci-biology/njplot/njplot-2.3.ebuild    | 34 --------------------------------
 2 files changed, 69 deletions(-)

diff --git a/sci-biology/njplot/njplot-2.3-r1.ebuild b/sci-biology/njplot/njplot-2.3-r1.ebuild
deleted file mode 100644
index f766af55ea..0000000000
--- a/sci-biology/njplot/njplot-2.3-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A phylogenetic tree drawing program which supports tree rooting"
-HOMEPAGE="http://pbil.univ-lyon1.fr/software/njplot.html"
-SRC_URI="ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/njplot/archive/njplot-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	sci-biology/ncbi-tools[X,static-libs]
-	x11-libs/libXmu"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i -e "s%njplot.help%${EPREFIX}/usr/share/doc/${PF}/njplot.help%" njplot-vib.c || die
-	epatch \
-		"${FILESDIR}"/${P}-format-security.patch \
-		"${FILESDIR}"/${P}-buildsystem.patch
-	tc-export CC
-}
-
-src_install() {
-	dobin newicktops newicktotxt njplot unrooted
-	doman *.1
-	dodoc README njplot.help
-}

diff --git a/sci-biology/njplot/njplot-2.3.ebuild b/sci-biology/njplot/njplot-2.3.ebuild
deleted file mode 100644
index 03bcad0099..0000000000
--- a/sci-biology/njplot/njplot-2.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit toolchain-funcs
-
-DESCRIPTION="A phylogenetic tree drawing program which supports tree rooting"
-HOMEPAGE="http://pbil.univ-lyon1.fr/software/njplot.html"
-SRC_URI="ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/njplot/archive/njplot-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	sci-biology/ncbi-tools[X,static-libs]
-	x11-libs/libXmu"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i -e 's|/banques0/ncbiJun04|/usr/include/ncbi|' \
-		-e 's/CC = gcc/CC='$(tc-getCC)'/' -e 's/CFLAGS  =/CFLAGS +=/' \
-		makefile || die
-	sed -i -e "s%njplot.help%/usr/share/doc/${PF}/njplot.help%" njplot-vib.c || die
-}
-
-src_install() {
-	dobin newicktops newicktotxt njplot unrooted || die
-	doman *.1 || die
-	dodoc README njplot.help
-}

[gentoo-commits] repo/gentoo:master commit in: sci-biology/njplot/

[David Seifert]

commit:     670461840c80b391afef997e0f0e94000894584d
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 25 21:32:53 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 25 21:39:15 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67046184

sci-biology/njplot: Modernise to EAPI 6

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-biology/njplot/njplot-2.3-r2.ebuild | 39 +++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/sci-biology/njplot/njplot-2.3-r2.ebuild b/sci-biology/njplot/njplot-2.3-r2.ebuild
new file mode 100644
index 0000000000..ac857840c1
--- /dev/null
+++ b/sci-biology/njplot/njplot-2.3-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A phylogenetic tree drawing program which supports tree rooting"
+HOMEPAGE="http://pbil.univ-lyon1.fr/software/njplot.html"
+SRC_URI="ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/njplot/archive/njplot-${PV}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	sci-biology/ncbi-tools[X,static-libs]
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-format-security.patch
+	"${FILESDIR}"/${P}-buildsystem.patch
+)
+
+src_prepare() {
+	default
+	sed -i -e "s:njplot.help:${EPREFIX}/usr/share/doc/${PF}/njplot.help:" njplot-vib.c || die
+
+	tc-export CC
+}
+
+src_install() {
+	dobin newicktops newicktotxt njplot unrooted
+	doman *.1
+	dodoc README njplot.help
+}