1 |
commit: 2c45209ea55916687f74ec521961b892d5db2a1b |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Mar 23 09:03:36 2018 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Mar 23 09:04:36 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c45209e |
7 |
|
8 |
app-misc/carbon-c-relay: version bump to 3.3 |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
app-misc/carbon-c-relay/Manifest | 2 +- |
13 |
app-misc/carbon-c-relay/carbon-c-relay-3.0.ebuild | 36 --------------- |
14 |
app-misc/carbon-c-relay/carbon-c-relay-3.3.ebuild | 56 +++++++++++++++++++++++ |
15 |
app-misc/carbon-c-relay/metadata.xml | 2 + |
16 |
4 files changed, 59 insertions(+), 37 deletions(-) |
17 |
|
18 |
diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest |
19 |
index 2c16656c7ea..3eb87ac6c90 100644 |
20 |
--- a/app-misc/carbon-c-relay/Manifest |
21 |
+++ b/app-misc/carbon-c-relay/Manifest |
22 |
@@ -1,3 +1,3 @@ |
23 |
-DIST carbon-c-relay-3.0.tar.gz 153479 BLAKE2B 6b3f4baf1f6323eeb6747a06ce82682a72a7284df4235cdcbd50c765a6f890de46385bf3eab4f919bc11070bc63cafd4975654e9f16e399aa793dc03406d6da5 SHA512 046dd19be1791eaf2b50bd7029f0bbe8ad0805113faf9a80b37571c42d76c0f7661a9273876de8cd5bf1d13fdc8133a8eaf9def28dd8077bf667225726797fdc |
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 |
|
28 |
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.0.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.0.ebuild |
29 |
deleted file mode 100644 |
30 |
index 963456421ce..00000000000 |
31 |
--- a/app-misc/carbon-c-relay/carbon-c-relay-3.0.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,36 +0,0 @@ |
34 |
-# Copyright 1999-2017 Gentoo Foundation |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=6 |
38 |
- |
39 |
-inherit toolchain-funcs user |
40 |
- |
41 |
-DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter" |
42 |
-HOMEPAGE="https://github.com/grobian/carbon-c-relay" |
43 |
-SRC_URI="https://github.com/grobian/carbon-c-relay/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
44 |
- |
45 |
-LICENSE="Apache-2.0" |
46 |
-SLOT="0" |
47 |
-KEYWORDS="~amd64 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
48 |
-IUSE="" |
49 |
- |
50 |
-RDEPEND="" |
51 |
-DEPEND="${RDEPEND}" |
52 |
- |
53 |
-pkg_preinst() { |
54 |
- enewgroup carbon |
55 |
- enewuser carbon -1 -1 -1 carbon |
56 |
-} |
57 |
- |
58 |
-src_configure() { |
59 |
- tc-export CC |
60 |
-} |
61 |
- |
62 |
-src_install() { |
63 |
- newbin relay ${PN} |
64 |
- dodoc ChangeLog.md |
65 |
- doman ${PN}.1 |
66 |
- |
67 |
- newinitd "${FILESDIR}"/${PN}.initd ${PN} |
68 |
- newconfd "${FILESDIR}"/${PN}.confd ${PN} |
69 |
-} |
70 |
|
71 |
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.3.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.3.ebuild |
72 |
new file mode 100644 |
73 |
index 00000000000..f5a67797fa2 |
74 |
--- /dev/null |
75 |
+++ b/app-misc/carbon-c-relay/carbon-c-relay-3.3.ebuild |
76 |
@@ -0,0 +1,56 @@ |
77 |
+# Copyright 1999-2018 Gentoo Foundation |
78 |
+# Distributed under the terms of the GNU General Public License v2 |
79 |
+ |
80 |
+EAPI=6 |
81 |
+ |
82 |
+inherit user |
83 |
+ |
84 |
+DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter" |
85 |
+HOMEPAGE="https://github.com/grobian/carbon-c-relay" |
86 |
+SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P}.tar.gz" |
87 |
+ |
88 |
+LICENSE="Apache-2.0" |
89 |
+SLOT="0" |
90 |
+KEYWORDS="~amd64 ~arm ~ppc64 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
91 |
+IUSE="lz4 ssl zlib pcre pcre2 +oniguruma" |
92 |
+ |
93 |
+# ensure only one of pcre, pcre2 and oniguruma is set, or none (libc) |
94 |
+# unforunately pcre is in global USE, so we have to exclude that here |
95 |
+REQUIRED_USE=" |
96 |
+ pcre2? ( !oniguruma ) |
97 |
+ oniguruma? ( !pcre2 ) |
98 |
+" |
99 |
+RDEPEND="lz4? ( app-arch/lz4 ) |
100 |
+ ssl? ( dev-libs/openssl:0 ) |
101 |
+ zlib? ( app-arch/gzip ) |
102 |
+ !oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) ) |
103 |
+ pcre2? ( dev-libs/libpcre2 ) |
104 |
+ oniguruma? ( dev-libs/oniguruma )" |
105 |
+DEPEND="${RDEPEND}" |
106 |
+ |
107 |
+pkg_preinst() { |
108 |
+ enewgroup carbon |
109 |
+ enewuser carbon -1 -1 -1 carbon |
110 |
+} |
111 |
+ |
112 |
+src_configure() { |
113 |
+ local pcrecfg |
114 |
+ if use !pcre2 && use !oniguruma ; then |
115 |
+ pcrecfg=$(use_with pcre) |
116 |
+ else |
117 |
+ pcrecfg="--without-pcre" |
118 |
+ fi |
119 |
+ |
120 |
+ econf $(use_with lz4) $(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 a9d0c9cb929..5695b7a6de7 100644 |
136 |
--- a/app-misc/carbon-c-relay/metadata.xml |
137 |
+++ b/app-misc/carbon-c-relay/metadata.xml |
138 |
@@ -6,6 +6,8 @@ |
139 |
</maintainer> |
140 |
<use> |
141 |
<flag name="lz4">add support for LZ4 compressed transport</flag> |
142 |
+ <flag name="pcre2">use <pkg>dev-libs/libpcre2</pkg> as regex implementation</flag> |
143 |
+ <flag name="oniguruma">use <pkg>dev-libs/oniguruma</pkg> as regex implementation</flag> |
144 |
</use> |
145 |
<upstream> |
146 |
<remote-id type="github">grobian/carbon-c-relay</remote-id> |