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

From:	Justin Lecher <jlec@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] proj/sci:master commit in: sci-biology/jellyfish/
Date:	Sun, 06 Mar 2016 19:45:00
Message-Id:	`1457293408.c5a275736294026002e61d4d3582c1c8e3e8ca51.jlec@gentoo`

1

commit:     c5a275736294026002e61d4d3582c1c8e3e8ca51

2

Author:     mschubert <mschu.dev <AT> gmail <DOT> com>

3

AuthorDate: Sat Jan 23 19:31:54 2016 +0000

4

Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>

5

CommitDate: Sun Mar  6 19:43:28 2016 +0000

6

URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=c5a27573

7

8

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

9

10

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

11

* add missing die

12

13

 sci-biology/jellyfish/jellyfish-1.1.11.ebuild | 12 ++++++------

14

 sci-biology/jellyfish/jellyfish-2.1.3.ebuild  | 13 ++++++-------

15

 sci-biology/jellyfish/jellyfish-2.1.4.ebuild  | 13 ++++++-------

16

 3 files changed, 18 insertions(+), 20 deletions(-)

17

18

diff --git a/sci-biology/jellyfish/jellyfish-1.1.11.ebuild b/sci-biology/jellyfish/jellyfish-1.1.11.ebuild

19

index 9d36444..acb7729 100644

20

--- a/sci-biology/jellyfish/jellyfish-1.1.11.ebuild

21

+++ b/sci-biology/jellyfish/jellyfish-1.1.11.ebuild

22

@@ -1,8 +1,8 @@

23

-# Copyright 1999-2015 Gentoo Foundation

24

+# Copyright 1999-2016 Gentoo Foundation

25

 # Distributed under the terms of the GNU General Public License v2

26

 # $Id$

27

28

-EAPI=5

29

+EAPI=6

30

31

 DESCRIPTION="k-mer counter within reads for assemblies"

32

 HOMEPAGE="http://www.cbcb.umd.edu/software/jellyfish"

33

@@ -24,8 +24,8 @@ DEPEND="${RDEPEND}

34

35

 src_install(){

36

 	default

37

-	sed -e "s#jellyfish-${PV}#jellyfish#" -i "${D}"/usr/lib64/pkgconfig/jellyfish-1.1.pc || die

38

-	mkdir -p "${D}/usr/include/${PN}" || die

39

-	mv "${D}"/usr/include/"${P}"/"${PN}"/* "${D}/usr/include/${PN}/" || die

40

-	rm -rf "${D}/usr/include/${P}"

41

+	sed -e "s#jellyfish-${PV}#jellyfish#" -i "${ED}/usr/$(get_libdir)"/pkgconfig/jellyfish-1.1.pc || die

42

+	mkdir -p "${ED}/usr/include/${PN}" || die

43

+	mv "${ED}"/usr/include/"${P}"/"${PN}"/* "${ED}/usr/include/${PN}/" || die

44

+	rm -r "${ED}/usr/include/${P}" || die

45

}

46

47

diff --git a/sci-biology/jellyfish/jellyfish-2.1.3.ebuild b/sci-biology/jellyfish/jellyfish-2.1.3.ebuild

48

index 226b260..d38d7bb 100644

49

--- a/sci-biology/jellyfish/jellyfish-2.1.3.ebuild

50

+++ b/sci-biology/jellyfish/jellyfish-2.1.3.ebuild

51

@@ -1,8 +1,8 @@

52

-# Copyright 1999-2015 Gentoo Foundation

53

+# Copyright 1999-2016 Gentoo Foundation

54

 # Distributed under the terms of the GNU General Public License v2

55

 # $Id$

56

57

-EAPI=5

58

+EAPI=6

59

60

 DESCRIPTION="k-mer counter within reads for assemblies"

61

 HOMEPAGE="http://www.genome.umd.edu/jellyfish.html"

62

@@ -22,9 +22,8 @@ DEPEND="${RDEPEND}

63

64

 src_install(){

65

 	default

66

-	# beware the filename say 2.0 instead of 2.1. does it matter?

67

-	sed -e "s#jellyfish-${PV}#jellyfish#" -i "${D}"/usr/lib64/pkgconfig/jellyfish-2.0.pc || die

68

-	mkdir -p "${D}/usr/include/${PN}" || die

69

-	mv "${D}"/usr/include/"${P}"/"${PN}"/* "${D}/usr/include/${PN}/" || die

70

-	rm -rf "${D}/usr/include/${P}"

71

+	sed -e "s#jellyfish-${PV}#jellyfish#" -i "${ED}/usr/$(get_libdir)"/pkgconfig/jellyfish-2.0.pc || die

72

+	mkdir -p "${ED}/usr/include/${PN}" || die

73

+	mv "${ED}"/usr/include/"${P}"/"${PN}"/* "${ED}/usr/include/${PN}/" || die

74

+	rm -r "${ED}/usr/include/${P}" || die

75

}

76

77

diff --git a/sci-biology/jellyfish/jellyfish-2.1.4.ebuild b/sci-biology/jellyfish/jellyfish-2.1.4.ebuild

78

index 226b260..d38d7bb 100644

79

--- a/sci-biology/jellyfish/jellyfish-2.1.4.ebuild

80

+++ b/sci-biology/jellyfish/jellyfish-2.1.4.ebuild

81

@@ -1,8 +1,8 @@

82

-# Copyright 1999-2015 Gentoo Foundation

83

+# Copyright 1999-2016 Gentoo Foundation

84

 # Distributed under the terms of the GNU General Public License v2

85

 # $Id$

86

87

-EAPI=5

88

+EAPI=6

89

90

 DESCRIPTION="k-mer counter within reads for assemblies"

91

 HOMEPAGE="http://www.genome.umd.edu/jellyfish.html"

92

@@ -22,9 +22,8 @@ DEPEND="${RDEPEND}

93

94

 src_install(){

95

 	default

96

-	# beware the filename say 2.0 instead of 2.1. does it matter?

97

-	sed -e "s#jellyfish-${PV}#jellyfish#" -i "${D}"/usr/lib64/pkgconfig/jellyfish-2.0.pc || die

98

-	mkdir -p "${D}/usr/include/${PN}" || die

99

-	mv "${D}"/usr/include/"${P}"/"${PN}"/* "${D}/usr/include/${PN}/" || die

100

-	rm -rf "${D}/usr/include/${P}"

101

+	sed -e "s#jellyfish-${PV}#jellyfish#" -i "${ED}/usr/$(get_libdir)"/pkgconfig/jellyfish-2.0.pc || die

102

+	mkdir -p "${ED}/usr/include/${PN}" || die

103

+	mv "${ED}"/usr/include/"${P}"/"${PN}"/* "${ED}/usr/include/${PN}/" || die

104

+	rm -r "${ED}/usr/include/${P}" || die

105

}

1	commit: c5a275736294026002e61d4d3582c1c8e3e8ca51
2	Author: mschubert <mschu.dev <AT> gmail <DOT> com>
3	AuthorDate: Sat Jan 23 19:31:54 2016 +0000
4	Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5	CommitDate: Sun Mar 6 19:43:28 2016 +0000
6	URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=c5a27573
7
8	sci-biology/jellyfish: bump EAPI=6 and QA
9
10	* respect ${EPREFIX}, fix pkg-config paths
11	* add missing die
12
13	sci-biology/jellyfish/jellyfish-1.1.11.ebuild \| 12 ++++++------
14	sci-biology/jellyfish/jellyfish-2.1.3.ebuild \| 13 ++++++-------
15	sci-biology/jellyfish/jellyfish-2.1.4.ebuild \| 13 ++++++-------
16	3 files changed, 18 insertions(+), 20 deletions(-)
17
18	diff --git a/sci-biology/jellyfish/jellyfish-1.1.11.ebuild b/sci-biology/jellyfish/jellyfish-1.1.11.ebuild
19	index 9d36444..acb7729 100644
20	--- a/sci-biology/jellyfish/jellyfish-1.1.11.ebuild
21	+++ b/sci-biology/jellyfish/jellyfish-1.1.11.ebuild
22	@@ -1,8 +1,8 @@
23	-# Copyright 1999-2015 Gentoo Foundation
24	+# Copyright 1999-2016 Gentoo Foundation
25	# Distributed under the terms of the GNU General Public License v2
26	# $Id$
27
28	-EAPI=5
29	+EAPI=6
30
31	DESCRIPTION="k-mer counter within reads for assemblies"
32	HOMEPAGE="http://www.cbcb.umd.edu/software/jellyfish"
33	@@ -24,8 +24,8 @@ DEPEND="${RDEPEND}
34
35	src_install(){
36	default
37	- sed -e "s#jellyfish-${PV}#jellyfish#" -i "${D}"/usr/lib64/pkgconfig/jellyfish-1.1.pc \|\| die
38	- mkdir -p "${D}/usr/include/${PN}" \|\| die
39	- mv "${D}"/usr/include/"${P}"/"${PN}"/* "${D}/usr/include/${PN}/" \|\| die
40	- rm -rf "${D}/usr/include/${P}"
41	+ sed -e "s#jellyfish-${PV}#jellyfish#" -i "${ED}/usr/$(get_libdir)"/pkgconfig/jellyfish-1.1.pc \|\| die
42	+ mkdir -p "${ED}/usr/include/${PN}" \|\| die
43	+ mv "${ED}"/usr/include/"${P}"/"${PN}"/* "${ED}/usr/include/${PN}/" \|\| die
44	+ rm -r "${ED}/usr/include/${P}" \|\| die
45	}
46
47	diff --git a/sci-biology/jellyfish/jellyfish-2.1.3.ebuild b/sci-biology/jellyfish/jellyfish-2.1.3.ebuild
48	index 226b260..d38d7bb 100644
49	--- a/sci-biology/jellyfish/jellyfish-2.1.3.ebuild
50	+++ b/sci-biology/jellyfish/jellyfish-2.1.3.ebuild
51	@@ -1,8 +1,8 @@
52	-# Copyright 1999-2015 Gentoo Foundation
53	+# Copyright 1999-2016 Gentoo Foundation
54	# Distributed under the terms of the GNU General Public License v2
55	# $Id$
56
57	-EAPI=5
58	+EAPI=6
59
60	DESCRIPTION="k-mer counter within reads for assemblies"
61	HOMEPAGE="http://www.genome.umd.edu/jellyfish.html"
62	@@ -22,9 +22,8 @@ DEPEND="${RDEPEND}
63
64	src_install(){
65	default
66	- # beware the filename say 2.0 instead of 2.1. does it matter?
67	- sed -e "s#jellyfish-${PV}#jellyfish#" -i "${D}"/usr/lib64/pkgconfig/jellyfish-2.0.pc \|\| die
68	- mkdir -p "${D}/usr/include/${PN}" \|\| die
69	- mv "${D}"/usr/include/"${P}"/"${PN}"/* "${D}/usr/include/${PN}/" \|\| die
70	- rm -rf "${D}/usr/include/${P}"
71	+ sed -e "s#jellyfish-${PV}#jellyfish#" -i "${ED}/usr/$(get_libdir)"/pkgconfig/jellyfish-2.0.pc \|\| die
72	+ mkdir -p "${ED}/usr/include/${PN}" \|\| die
73	+ mv "${ED}"/usr/include/"${P}"/"${PN}"/* "${ED}/usr/include/${PN}/" \|\| die
74	+ rm -r "${ED}/usr/include/${P}" \|\| die
75	}
76
77	diff --git a/sci-biology/jellyfish/jellyfish-2.1.4.ebuild b/sci-biology/jellyfish/jellyfish-2.1.4.ebuild
78	index 226b260..d38d7bb 100644
79	--- a/sci-biology/jellyfish/jellyfish-2.1.4.ebuild
80	+++ b/sci-biology/jellyfish/jellyfish-2.1.4.ebuild
81	@@ -1,8 +1,8 @@
82	-# Copyright 1999-2015 Gentoo Foundation
83	+# Copyright 1999-2016 Gentoo Foundation
84	# Distributed under the terms of the GNU General Public License v2
85	# $Id$
86
87	-EAPI=5
88	+EAPI=6
89
90	DESCRIPTION="k-mer counter within reads for assemblies"
91	HOMEPAGE="http://www.genome.umd.edu/jellyfish.html"
92	@@ -22,9 +22,8 @@ DEPEND="${RDEPEND}
93
94	src_install(){
95	default
96	- # beware the filename say 2.0 instead of 2.1. does it matter?
97	- sed -e "s#jellyfish-${PV}#jellyfish#" -i "${D}"/usr/lib64/pkgconfig/jellyfish-2.0.pc \|\| die
98	- mkdir -p "${D}/usr/include/${PN}" \|\| die
99	- mv "${D}"/usr/include/"${P}"/"${PN}"/* "${D}/usr/include/${PN}/" \|\| die
100	- rm -rf "${D}/usr/include/${P}"
101	+ sed -e "s#jellyfish-${PV}#jellyfish#" -i "${ED}/usr/$(get_libdir)"/pkgconfig/jellyfish-2.0.pc \|\| die
102	+ mkdir -p "${ED}/usr/include/${PN}" \|\| die
103	+ mv "${ED}"/usr/include/"${P}"/"${PN}"/* "${ED}/usr/include/${PN}/" \|\| die
104	+ rm -r "${ED}/usr/include/${P}" \|\| die
105	}

Gentoo Archives: gentoo-commits