commit:     b9597bcf0d83a5e0e9d414414bef516ad292e325
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 17:25:03 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 17:25:12 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=b9597bcf

sci-biology/RADtools: Bump to EAPI=6

* Use git-r3.eclass

Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-biology/RADtools/RADtools-1.2.4.ebuild | 25 +++++++++----------------
 sci-biology/RADtools/RADtools-9999.ebuild  | 25 +++++++++----------------
 sci-biology/RADtools/metadata.xml          |  2 +-
 3 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/sci-biology/RADtools/RADtools-1.2.4.ebuild 
b/sci-biology/RADtools/RADtools-1.2.4.ebuild
index 967e6e3..84db02f 100644
--- a/sci-biology/RADtools/RADtools-1.2.4.ebuild
+++ b/sci-biology/RADtools/RADtools-1.2.4.ebuild
@@ -1,40 +1,33 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit perl-module
 
-[ "$PV" == "9999" ] && inherit git-2
-
 DESCRIPTION="Tools for processing RAD Sequencing Illumina reads"
 HOMEPAGE="https://www.wiki.ed.ac.uk/display/RADSequencing/Home";
-
-if [ "$PV" == "9999" ]; then
-       EGIT_REPO_URI="git://github.com/johnomics/RADtools.git"
-       KEYWORDS=""
-else
-       
SRC_URI="https://www.wiki.ed.ac.uk/download/attachments/68630442/RADtools_"${PV}".tar.gz
-               
https://www.wiki.ed.ac.uk/download/attachments/68630442/RADmanual.pdf";
-       KEYWORDS="~amd64"
-       S="${WORKDIR}"
-fi
+SRC_URI="
+       
https://www.wiki.ed.ac.uk/download/attachments/68630442/RADtools_${PV}.tar.gz
+       https://www.wiki.ed.ac.uk/download/attachments/68630442/RADmanual.pdf";
 
 LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS="~amd64"
 IUSE=""
 
 DEPEND=">=dev-lang/perl-5.10
        dev-perl/Parallel-ForkManager"
 RDEPEND="${DEPEND}"
 
+S="${WORKDIR}"
+
 src_install() {
        dobin RADMIDs RADmarkers RADpools RADtags
        mydoc="CHANGELOG RADmanual.pdf RADmanual.tex README"
-       eval `perl '-V:installvendorlib'`
+       eval `perl '-V:installvendorlib'` || die
        vendor_lib_install_dir="${installvendorlib}"
-       dodir ${vendor_lib_install_dir}
        insinto ${vendor_lib_install_dir}
        doins *.pm
 }

diff --git a/sci-biology/RADtools/RADtools-9999.ebuild 
b/sci-biology/RADtools/RADtools-9999.ebuild
index 257cbe9..6f705b1 100644
--- a/sci-biology/RADtools/RADtools-9999.ebuild
+++ b/sci-biology/RADtools/RADtools-9999.ebuild
@@ -1,38 +1,31 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-[ "$PV" == "9999" ] && inherit git-2
+inherit perl-module git-r3
 
 DESCRIPTION="Tools for processing RAD Sequencing Illumina reads"
 HOMEPAGE="https://www.wiki.ed.ac.uk/display/RADSequencing/Home";
-
-if [ "$PV" == "9999" ]; then
-       EGIT_REPO_URI="git://github.com/johnomics/RADtools.git"
-       KEYWORDS=""
-else
-       
SRC_URI="https://www.wiki.ed.ac.uk/download/attachments/68630442/RADtools_"${PV}".tar.gz
-               
https://www.wiki.ed.ac.uk/download/attachments/68630442/RADmanual.pdf";
-       KEYWORDS="~amd64"
-       S="${WORKDIR}"
-fi
+EGIT_REPO_URI="git://github.com/johnomics/RADtools.git"
 
 LICENSE="GPL-3"
 SLOT="0"
+KEYWORDS=""
 IUSE=""
 
-DEPEND=">=dev-lang/perl-5.10
+DEPEND="
+       >=dev-lang/perl-5.10
        dev-perl/Parallel-ForkManager"
 RDEPEND="${DEPEND}"
 
 src_install() {
        dobin RADMIDs RADmarkers RADpools RADtags
        mydoc="CHANGELOG RADmanual.pdf RADmanual.tex README"
-       eval `perl '-V:installvendorlib'`
+       eval `perl '-V:installvendorlib'` || die
        vendor_lib_install_dir="${installvendorlib}"
-       dodir ${vendor_lib_install_dir}
+
        insinto ${vendor_lib_install_dir}
        doins *.pm
 }

diff --git a/sci-biology/RADtools/metadata.xml 
b/sci-biology/RADtools/metadata.xml
index 1699e58..f68a1b6 100644
--- a/sci-biology/RADtools/metadata.xml
+++ b/sci-biology/RADtools/metadata.xml
@@ -5,7 +5,7 @@
     <email>[email protected]</email>
     <name>Martin Mokrejs</name>
   </maintainer>
-<maintainer type="project">
+  <maintainer type="project">
     <email>[email protected]</email>
     <name>Gentoo Biology Project</name>
   </maintainer>

Reply via email to