[gentoo-commits] proj/sci:master commit in: sci-biology/amos/

["Martin Mokrejs" <mmokrejs@fold.natur.cuni.cz>]

commit:     812a886bdcc45c891f93fb5caf73e5cee20c9aab
Author:     Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
AuthorDate: Fri Apr 17 22:22:17 2015 +0000
Commit:     Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
CommitDate: Fri Apr 17 22:22:17 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=812a886b

sci-biology/amos: fixed installation of perl-related files

Package-Manager: portage-2.2.18

 sci-biology/amos/ChangeLog            |  4 ++++
 sci-biology/amos/amos-3.1.0-r2.ebuild | 15 ++++++++-------
 sci-biology/amos/amos-9999.ebuild     | 15 ++++++++-------
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/sci-biology/amos/ChangeLog b/sci-biology/amos/ChangeLog
index 9bdce77..94d1ad5 100644
--- a/sci-biology/amos/ChangeLog
+++ b/sci-biology/amos/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  17 Apr 2015; Martin Mokrejs <mmokrejs@fold.natur.cuni.cz>
+  amos-3.1.0-r2.ebuild, amos-9999.ebuild:
+  sci-biology/amos: fixed installation of perl-related files
+
 *amos-3.1.0-r2 (31 Mar 2015)
 
   31 Mar 2015; Martin Mokrejs <mmokrejs@fold.natur.cuni.cz>

diff --git a/sci-biology/amos/amos-3.1.0-r2.ebuild b/sci-biology/amos/amos-3.1.0-r2.ebuild
index ab8a404..2b9473d 100644
--- a/sci-biology/amos/amos-3.1.0-r2.ebuild
+++ b/sci-biology/amos/amos-3.1.0-r2.ebuild
@@ -5,9 +5,11 @@
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
-
 inherit eutils python-r1
 
+PERL_EXPORT_PHASE_FUNCTIONS=no
+inherit perl-module eutils toolchain-funcs
+
 DESCRIPTION="A Modular, Open-Source whole genome assembler"
 HOMEPAGE="http://amos.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -55,12 +57,11 @@ src_install() {
 	python_replicate_script "${ED}"/usr/bin/goBambus2
 	# bambus needs TIGR::FASTAreader.pm and others
 	# configure --libdir sadly copies both *.a files and *.pm into /usr/lib64/AMOS/ and /usr/lib64/TIGR/, work around it
-	mkdir -p "${D}"/usr/share/"${PN}"/perl/AMOS || die
-	mv "${D}"/usr/lib64/AMOS/*.pm "${D}"/usr/share/"${PN}"/perl/AMOS || die
-	mkdir -p "${D}"/usr/share/"${PN}"/perl/TIGR || die
-	mv "${D}"/usr/lib64/TIGR/*.pm "${D}"/usr/share/"${PN}"/perl/TIGR || die
-	echo "PERL5LIB=/usr/share/${PN}/perl" > "${S}/99${PN}"
-	doenvd "${S}/99${PN}" || die
+	perl_set_version
+	insinto ${VENDOR_LIB}
+	dobin "${D}"/usr/lib64/AMOS/*.pm
+	insinto ${VENDOR_LIB}/TIGR
+	dobin "${D}"/usr/lib64/TIGR/*.pm
 	# move also /usr/lib64/AMOS/AMOS.py to /usr/bin
 	mv "${D}"/usr/lib64/AMOS/*.py "${D}"/usr/bin || die
 }

diff --git a/sci-biology/amos/amos-9999.ebuild b/sci-biology/amos/amos-9999.ebuild
index 610c3d6..71b247d 100644
--- a/sci-biology/amos/amos-9999.ebuild
+++ b/sci-biology/amos/amos-9999.ebuild
@@ -4,8 +4,10 @@
 
 EAPI=5
 
-AUTOTOOLS_AUTORECONF=true
+PERL_EXPORT_PHASE_FUNCTIONS=no
+inherit perl-module eutils toolchain-funcs
 
+AUTOTOOLS_AUTORECONF=true
 inherit autotools-utils git-r3
 
 DESCRIPTION="Genome assembly package live cvs sources"
@@ -36,12 +38,11 @@ src_install() {
 	python_replicate_script "${ED}"/usr/bin/goBambus2
 	# bambus needs TIGR::FASTAreader.pm and others
 	# configure --libdir sadly copies both *.a files and *.pm into /usr/lib64/AMOS/ and /usr/lib64/TIGR/, work around it
-	mkdir -p "${D}/usr/share/${PN}/perl/AMOS" || die
-	mv "${D}"/usr/lib64/AMOS/*.pm "${D}/usr/share/${PN}/perl/AMOS" || die
-	mkdir -p "${D}"/usr/share/"${PN}"/perl/TIGR || die
-	mv "${D}"/usr/lib64/TIGR/*.pm "${D}"/usr/share/"${PN}"/perl/TIGR || die
-	echo "PERL5LIB=/usr/share/${PN}/perl" > "${S}/99${PN}"
-	doenvd "${S}/99${PN}" || die
+	perl_set_version
+	insinto ${VENDOR_LIB}
+	dobin "${D}"/usr/lib64/AMOS/*.pm
+	insinto ${VENDOR_LIB}/TIGR
+	dobin "${D}"/usr/lib64/TIGR/*.pm
 	# move also /usr/lib64/AMOS/AMOS.py to /usr/bin
 	mv "${D}"/usr/lib64/AMOS/*.py "${D}"/usr/bin || die
 }