Gentoo Archives: gentoo-commits

From: Martin Mokrejs <mmokrejs@×××××××××××××××.cz>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/jellyfish/
Date: Tue, 31 Mar 2015 22:34:29
Message-Id: 1427841231.3b210b2d6e82815216cd3c46bdec443ddbd49018.mmokrejs@gentoo
1 commit: 3b210b2d6e82815216cd3c46bdec443ddbd49018
2 Author: Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
3 AuthorDate: Tue Mar 31 22:33:51 2015 +0000
4 Commit: Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
5 CommitDate: Tue Mar 31 22:33:51 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=3b210b2d
7
8 sci-biology/jellyfish: fix /usr/lib64/pkgconfig/jellyfish-2.0.pc
9
10 Package-Manager: portage-2.2.18
11
12 sci-biology/jellyfish/ChangeLog | 4 ++++
13 sci-biology/jellyfish/jellyfish-2.1.3.ebuild | 7 ++++---
14 2 files changed, 8 insertions(+), 3 deletions(-)
15
16 diff --git a/sci-biology/jellyfish/ChangeLog b/sci-biology/jellyfish/ChangeLog
17 index 5a84c98..d3ea5cd 100644
18 --- a/sci-biology/jellyfish/ChangeLog
19 +++ b/sci-biology/jellyfish/ChangeLog
20 @@ -4,6 +4,10 @@
21
22 31 Mar 2015; Martin Mokrejs <mmokrejs@×××××××××××××××.cz>
23 jellyfish-2.1.3.ebuild:
24 + sci-biology/jellyfish: fix /usr/lib64/pkgconfig/jellyfish-2.0.pc
25 +
26 + 31 Mar 2015; Martin Mokrejs <mmokrejs@×××××××××××××××.cz>
27 + jellyfish-2.1.3.ebuild:
28 sci-biology/jellyfish: fix installation of header *.hpp files into
29 /usr/include/jellyfish-2.1.3/jellyfish/ broken somewhere in upstream's code
30
31
32 diff --git a/sci-biology/jellyfish/jellyfish-2.1.3.ebuild b/sci-biology/jellyfish/jellyfish-2.1.3.ebuild
33 index cceca4b..c217e42 100644
34 --- a/sci-biology/jellyfish/jellyfish-2.1.3.ebuild
35 +++ b/sci-biology/jellyfish/jellyfish-2.1.3.ebuild
36 @@ -21,7 +21,8 @@ RDEPEND="${DEPEND}"
37
38 src_install(){
39 default
40 - mkdir -p ${D}/usr/include/${PN} || die
41 - mv ${D}/usr/include/${P}/${PN}/* ${D}/usr/include/${PN}/ || die
42 - rm -rf ${D}/usr/include/${P}
43 + sed -e 's#jellyfish-2.1.3#jellyfish#' -i "${D}"/usr/lib64/pkgconfig/jellyfish-2.0.pc || die
44 + mkdir -p "${D}/usr/include/${PN}" || die
45 + mv "${D}"/usr/include/"${P}"/"${PN}"/* "${D}/usr/include/${PN}/" || die
46 + rm -rf "${D}/usr/include/${P}"
47 }