From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-868001-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 6F98C59CA3
	for <garchives@archives.gentoo.org>; Sun,  6 Mar 2016 19:45:00 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id CCE6821C0C8;
	Sun,  6 Mar 2016 19:44:59 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 5A6BE21C0C8
	for <gentoo-commits@lists.gentoo.org>; Sun,  6 Mar 2016 19:44:59 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 5767F340A38
	for <gentoo-commits@lists.gentoo.org>; Sun,  6 Mar 2016 19:44:58 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 6D14F8F6
	for <gentoo-commits@lists.gentoo.org>; Sun,  6 Mar 2016 19:44:55 +0000 (UTC)
From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" <jlec@gentoo.org>
Message-ID: <1457293408.c5a275736294026002e61d4d3582c1c8e3e8ca51.jlec@gentoo>
Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/jellyfish/
X-VCS-Repository: proj/sci
X-VCS-Files: sci-biology/jellyfish/jellyfish-1.1.11.ebuild sci-biology/jellyfish/jellyfish-2.1.3.ebuild sci-biology/jellyfish/jellyfish-2.1.4.ebuild
X-VCS-Directories: sci-biology/jellyfish/
X-VCS-Committer: jlec
X-VCS-Committer-Name: Justin Lecher
X-VCS-Revision: c5a275736294026002e61d4d3582c1c8e3e8ca51
X-VCS-Branch: master
Date: Sun,  6 Mar 2016 19:44:55 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 118a6807-a79e-4e5a-9dcf-067747d21861
X-Archives-Hash: b5a2350abf35b6c2e74bc955444a1eeb

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
 }