From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C4F1A138825 for ; Tue, 31 Mar 2015 22:34:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 45C95E0852; Tue, 31 Mar 2015 22:34:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EBC84E0852 for ; Tue, 31 Mar 2015 22:34:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C292F3407C6 for ; Tue, 31 Mar 2015 22:34:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7966E14F25 for ; Tue, 31 Mar 2015 22:34:23 +0000 (UTC) From: "Martin Mokrejs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Martin Mokrejs" Message-ID: <1427841231.3b210b2d6e82815216cd3c46bdec443ddbd49018.mmokrejs@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/jellyfish/ X-VCS-Repository: proj/sci X-VCS-Files: sci-biology/jellyfish/ChangeLog sci-biology/jellyfish/jellyfish-2.1.3.ebuild X-VCS-Directories: sci-biology/jellyfish/ X-VCS-Committer: mmokrejs X-VCS-Committer-Name: Martin Mokrejs X-VCS-Revision: 3b210b2d6e82815216cd3c46bdec443ddbd49018 X-VCS-Branch: master Date: Tue, 31 Mar 2015 22:34:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 141aebe7-f6f8-4ae7-8f9a-5949cf57f7f6 X-Archives-Hash: a21e5a6af83d28eed5eeaba54d7279ed commit: 3b210b2d6e82815216cd3c46bdec443ddbd49018 Author: Martin Mokrejš fold natur cuni cz> AuthorDate: Tue Mar 31 22:33:51 2015 +0000 Commit: Martin Mokrejs fold natur cuni cz> CommitDate: Tue Mar 31 22:33:51 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=3b210b2d sci-biology/jellyfish: fix /usr/lib64/pkgconfig/jellyfish-2.0.pc Package-Manager: portage-2.2.18 sci-biology/jellyfish/ChangeLog | 4 ++++ sci-biology/jellyfish/jellyfish-2.1.3.ebuild | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/sci-biology/jellyfish/ChangeLog b/sci-biology/jellyfish/ChangeLog index 5a84c98..d3ea5cd 100644 --- a/sci-biology/jellyfish/ChangeLog +++ b/sci-biology/jellyfish/ChangeLog @@ -4,6 +4,10 @@ 31 Mar 2015; Martin Mokrejs jellyfish-2.1.3.ebuild: + sci-biology/jellyfish: fix /usr/lib64/pkgconfig/jellyfish-2.0.pc + + 31 Mar 2015; Martin Mokrejs + jellyfish-2.1.3.ebuild: sci-biology/jellyfish: fix installation of header *.hpp files into /usr/include/jellyfish-2.1.3/jellyfish/ broken somewhere in upstream's code diff --git a/sci-biology/jellyfish/jellyfish-2.1.3.ebuild b/sci-biology/jellyfish/jellyfish-2.1.3.ebuild index cceca4b..c217e42 100644 --- a/sci-biology/jellyfish/jellyfish-2.1.3.ebuild +++ b/sci-biology/jellyfish/jellyfish-2.1.3.ebuild @@ -21,7 +21,8 @@ RDEPEND="${DEPEND}" src_install(){ default - 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-2.1.3#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}" }