1 |
commit: 869a19b2f6ff39a4bbd981dffccbb79d6cb26c19 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 18 16:16:31 2018 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 18 16:16:31 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=869a19b2 |
7 |
|
8 |
app-misc/carbon-c-relay: version bump to v3.4 |
9 |
|
10 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.49, Repoman-2.3.11 |
12 |
|
13 |
app-misc/carbon-c-relay/Manifest | 2 +- |
14 |
.../carbon-c-relay/carbon-c-relay-3.1-r1.ebuild | 33 ------------ |
15 |
app-misc/carbon-c-relay/carbon-c-relay-3.4.ebuild | 58 ++++++++++++++++++++++ |
16 |
app-misc/carbon-c-relay/metadata.xml | 1 + |
17 |
4 files changed, 60 insertions(+), 34 deletions(-) |
18 |
|
19 |
diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest |
20 |
index 3eb87ac6c90..046050c5e7b 100644 |
21 |
--- a/app-misc/carbon-c-relay/Manifest |
22 |
+++ b/app-misc/carbon-c-relay/Manifest |
23 |
@@ -1,3 +1,3 @@ |
24 |
-DIST carbon-c-relay-3.1.tar.gz 271011 BLAKE2B 62d97ba268f121db466a761001f0c5f49e2571edc26c90ee4f40d311cc3f9abb55178ea375c6663407d5fce78c5162a8460a260c9baa7faed3908fc2e4bb9870 SHA512 8c8062e4fa9ec22281b1848923dc73b39c4617b0c6297f57f69080a7aedf07ef8d5c6e0bebbd5ef0faf3a1255ab155475bc40aeee582838d604da1cc2e43ca4e |
25 |
DIST carbon-c-relay-3.2.tar.gz 291396 BLAKE2B 6a7ba4f30498c217505098b3cafa69a481a0bb78776b207cb4120d686a896156a39a0c87795b2766d39c3b0e69d4ed17943bee43e3218bf079931ad2b8360116 SHA512 11065303e18e9e2660150a7ba2137abe48b514abcdba93632a5fa46c8412bfb3472bfebb93584c629e5978be210237fad77f975eb1abb1e07b9cdba119c7eef4 |
26 |
DIST carbon-c-relay-3.3.tar.gz 293055 BLAKE2B 96d4d230e233f20ce02d519804f36787fc30238ba4fb173600e18a52af6a28bb954c476baffefcb229e42f3c2e6ff1d97196c188c527fc72fd5b98982f74451f SHA512 285f5d90c31644543a674b60e017c4d65f39762fe211b14a99583473e6d80313c3f907e4432750e6f25851e4a693457d1609a9bc176744b217f6cf0533ab4879 |
27 |
+DIST carbon-c-relay-3.4.tar.gz 297795 BLAKE2B 48e954af09db99fc6ab8a227be8742fadd268907c2dd203a9bd6b5417fbf77d604f13636416452108e9df77df6fe9350d5a3dba3f34b1f200b31aba5ebfb2d91 SHA512 12e5d952ac34d7ec33999946dc30c1c388fe5fba7d28355ead77377bca90228f003955353e8f92b743c1ccf5e55ffaf6c32188de3bfb0a1ad75a80cc418c5e00 |
28 |
|
29 |
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.1-r1.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.1-r1.ebuild |
30 |
deleted file mode 100644 |
31 |
index b8caef32bf9..00000000000 |
32 |
--- a/app-misc/carbon-c-relay/carbon-c-relay-3.1-r1.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,33 +0,0 @@ |
35 |
-# Copyright 1999-2017 Gentoo Foundation |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=6 |
39 |
- |
40 |
-inherit user |
41 |
- |
42 |
-DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter" |
43 |
-HOMEPAGE="https://github.com/grobian/carbon-c-relay" |
44 |
-SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P}.tar.gz" |
45 |
- |
46 |
-LICENSE="Apache-2.0" |
47 |
-SLOT="0" |
48 |
-KEYWORDS="~amd64 ~arm ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
49 |
-IUSE="" |
50 |
- |
51 |
-RDEPEND="" |
52 |
-DEPEND="${RDEPEND}" |
53 |
- |
54 |
-pkg_preinst() { |
55 |
- enewgroup carbon |
56 |
- enewuser carbon -1 -1 -1 carbon |
57 |
-} |
58 |
- |
59 |
-src_install() { |
60 |
- default |
61 |
- # rename too generic name |
62 |
- mv "${ED}"/usr/bin/{relay,${PN}} || die |
63 |
- dodoc ChangeLog.md |
64 |
- |
65 |
- newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} |
66 |
- newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN} |
67 |
-} |
68 |
|
69 |
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.4.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.4.ebuild |
70 |
new file mode 100644 |
71 |
index 00000000000..7afbf976a68 |
72 |
--- /dev/null |
73 |
+++ b/app-misc/carbon-c-relay/carbon-c-relay-3.4.ebuild |
74 |
@@ -0,0 +1,58 @@ |
75 |
+# Copyright 1999-2018 Gentoo Authors |
76 |
+# Distributed under the terms of the GNU General Public License v2 |
77 |
+ |
78 |
+EAPI=6 |
79 |
+ |
80 |
+inherit user |
81 |
+ |
82 |
+DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter" |
83 |
+HOMEPAGE="https://github.com/grobian/carbon-c-relay" |
84 |
+SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P}.tar.gz" |
85 |
+ |
86 |
+LICENSE="Apache-2.0" |
87 |
+SLOT="0" |
88 |
+KEYWORDS="~amd64 ~arm ~ppc64 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
89 |
+IUSE="lz4 snappy zlib ssl pcre pcre2 +oniguruma" |
90 |
+ |
91 |
+# ensure only one of pcre, pcre2 and oniguruma is set, or none (libc) |
92 |
+# unforunately pcre is in global USE, so we have to exclude that here |
93 |
+REQUIRED_USE=" |
94 |
+ pcre2? ( !oniguruma ) |
95 |
+ oniguruma? ( !pcre2 ) |
96 |
+" |
97 |
+RDEPEND="lz4? ( app-arch/lz4 ) |
98 |
+ snappy? ( app-arch/snappy ) |
99 |
+ zlib? ( app-arch/gzip ) |
100 |
+ ssl? ( dev-libs/openssl:0 ) |
101 |
+ !oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) ) |
102 |
+ pcre2? ( dev-libs/libpcre2 ) |
103 |
+ oniguruma? ( dev-libs/oniguruma )" |
104 |
+DEPEND="${RDEPEND}" |
105 |
+ |
106 |
+pkg_preinst() { |
107 |
+ enewgroup carbon |
108 |
+ enewuser carbon -1 -1 -1 carbon |
109 |
+} |
110 |
+ |
111 |
+src_configure() { |
112 |
+ local pcrecfg |
113 |
+ if use !pcre2 && use !oniguruma ; then |
114 |
+ pcrecfg=$(use_with pcre) |
115 |
+ else |
116 |
+ pcrecfg="--without-pcre" |
117 |
+ fi |
118 |
+ |
119 |
+ econf $(use_with lz4) $(use_with snappy) \ |
120 |
+ $(use_with ssl) $(use_with zlib gzip) \ |
121 |
+ "${pcrecfg}" $(use_with pcre2) $(use_with oniguruma) |
122 |
+} |
123 |
+ |
124 |
+src_install() { |
125 |
+ default |
126 |
+ # rename too generic name |
127 |
+ mv "${ED}"/usr/bin/{relay,${PN}} || die |
128 |
+ dodoc ChangeLog.md |
129 |
+ |
130 |
+ newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} |
131 |
+ newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN} |
132 |
+} |
133 |
|
134 |
diff --git a/app-misc/carbon-c-relay/metadata.xml b/app-misc/carbon-c-relay/metadata.xml |
135 |
index c023cb5be2a..e59bce50e43 100644 |
136 |
--- a/app-misc/carbon-c-relay/metadata.xml |
137 |
+++ b/app-misc/carbon-c-relay/metadata.xml |
138 |
@@ -6,6 +6,7 @@ |
139 |
</maintainer> |
140 |
<use> |
141 |
<flag name="lz4">add support for LZ4 compressed transport</flag> |
142 |
+ <flag name="snappy">add support for Snappy compressed transport</flag> |
143 |
<flag name="pcre2">use <pkg>dev-libs/libpcre2</pkg> as regex implementation</flag> |
144 |
<flag name="oniguruma">use <pkg>dev-libs/oniguruma</pkg> as regex implementation</flag> |
145 |
</use> |