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

["Justin Lecher" <jlec@gentoo.org>]

commit:     c5a275736294026002e61d4d3582c1c8e3e8ca51
Author:     mschubert <mschu.dev <AT> gmail <DOT> com>
AuthorDate: Sat Jan 23 19:31:54 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Mar  6 19:43:28 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=c5a27573

sci-biology/jellyfish: bump EAPI=6 and QA

* respect ${EPREFIX}, fix pkg-config paths
* add missing die

 sci-biology/jellyfish/jellyfish-1.1.11.ebuild | 12 ++++++------
 sci-biology/jellyfish/jellyfish-2.1.3.ebuild  | 13 ++++++-------
 sci-biology/jellyfish/jellyfish-2.1.4.ebuild  | 13 ++++++-------
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/sci-biology/jellyfish/jellyfish-1.1.11.ebuild b/sci-biology/jellyfish/jellyfish-1.1.11.ebuild
index 9d36444..acb7729 100644
--- a/sci-biology/jellyfish/jellyfish-1.1.11.ebuild
+++ b/sci-biology/jellyfish/jellyfish-1.1.11.ebuild
@@ -1,8 +1,8 @@
-# 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
 
 DESCRIPTION="k-mer counter within reads for assemblies"
 HOMEPAGE="http://www.cbcb.umd.edu/software/jellyfish"
@@ -24,8 +24,8 @@ DEPEND="${RDEPEND}
 
 src_install(){
 	default
-	sed -e "s#jellyfish-${PV}#jellyfish#" -i "${D}"/usr/lib64/pkgconfig/jellyfish-1.1.pc || die
-	mkdir -p "${D}/usr/include/${PN}" || die
-	mv "${D}"/usr/include/"${P}"/"${PN}"/* "${D}/usr/include/${PN}/" || die
-	rm -rf "${D}/usr/include/${P}"
+	sed -e "s#jellyfish-${PV}#jellyfish#" -i "${ED}/usr/$(get_libdir)"/pkgconfig/jellyfish-1.1.pc || die
+	mkdir -p "${ED}/usr/include/${PN}" || die
+	mv "${ED}"/usr/include/"${P}"/"${PN}"/* "${ED}/usr/include/${PN}/" || die
+	rm -r "${ED}/usr/include/${P}" || die
 }

diff --git a/sci-biology/jellyfish/jellyfish-2.1.3.ebuild b/sci-biology/jellyfish/jellyfish-2.1.3.ebuild
index 226b260..d38d7bb 100644
--- a/sci-biology/jellyfish/jellyfish-2.1.3.ebuild
+++ b/sci-biology/jellyfish/jellyfish-2.1.3.ebuild
@@ -1,8 +1,8 @@
-# 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
 
 DESCRIPTION="k-mer counter within reads for assemblies"
 HOMEPAGE="http://www.genome.umd.edu/jellyfish.html"
@@ -22,9 +22,8 @@ DEPEND="${RDEPEND}
 
 src_install(){
 	default
-	# beware the filename say 2.0 instead of 2.1. does it matter?
-	sed -e "s#jellyfish-${PV}#jellyfish#" -i "${D}"/usr/lib64/pkgconfig/jellyfish-2.0.pc || die
-	mkdir -p "${D}/usr/include/${PN}" || die
-	mv "${D}"/usr/include/"${P}"/"${PN}"/* "${D}/usr/include/${PN}/" || die
-	rm -rf "${D}/usr/include/${P}"
+	sed -e "s#jellyfish-${PV}#jellyfish#" -i "${ED}/usr/$(get_libdir)"/pkgconfig/jellyfish-2.0.pc || die
+	mkdir -p "${ED}/usr/include/${PN}" || die
+	mv "${ED}"/usr/include/"${P}"/"${PN}"/* "${ED}/usr/include/${PN}/" || die
+	rm -r "${ED}/usr/include/${P}" || die
 }

diff --git a/sci-biology/jellyfish/jellyfish-2.1.4.ebuild b/sci-biology/jellyfish/jellyfish-2.1.4.ebuild
index 226b260..d38d7bb 100644
--- a/sci-biology/jellyfish/jellyfish-2.1.4.ebuild
+++ b/sci-biology/jellyfish/jellyfish-2.1.4.ebuild
@@ -1,8 +1,8 @@
-# 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
 
 DESCRIPTION="k-mer counter within reads for assemblies"
 HOMEPAGE="http://www.genome.umd.edu/jellyfish.html"
@@ -22,9 +22,8 @@ DEPEND="${RDEPEND}
 
 src_install(){
 	default
-	# beware the filename say 2.0 instead of 2.1. does it matter?
-	sed -e "s#jellyfish-${PV}#jellyfish#" -i "${D}"/usr/lib64/pkgconfig/jellyfish-2.0.pc || die
-	mkdir -p "${D}/usr/include/${PN}" || die
-	mv "${D}"/usr/include/"${P}"/"${PN}"/* "${D}/usr/include/${PN}/" || die
-	rm -rf "${D}/usr/include/${P}"
+	sed -e "s#jellyfish-${PV}#jellyfish#" -i "${ED}/usr/$(get_libdir)"/pkgconfig/jellyfish-2.0.pc || die
+	mkdir -p "${ED}/usr/include/${PN}" || die
+	mv "${ED}"/usr/include/"${P}"/"${PN}"/* "${ED}/usr/include/${PN}/" || die
+	rm -r "${ED}/usr/include/${P}" || die
 }