commit: 2c45209ea55916687f74ec521961b892d5db2a1b Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Fri Mar 23 09:03:36 2018 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Fri Mar 23 09:04:36 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c45209e
app-misc/carbon-c-relay: version bump to 3.3 Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-misc/carbon-c-relay/Manifest | 2 +- app-misc/carbon-c-relay/carbon-c-relay-3.0.ebuild | 36 --------------- app-misc/carbon-c-relay/carbon-c-relay-3.3.ebuild | 56 +++++++++++++++++++++++ app-misc/carbon-c-relay/metadata.xml | 2 + 4 files changed, 59 insertions(+), 37 deletions(-) diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest index 2c16656c7ea..3eb87ac6c90 100644 --- a/app-misc/carbon-c-relay/Manifest +++ b/app-misc/carbon-c-relay/Manifest @@ -1,3 +1,3 @@ -DIST carbon-c-relay-3.0.tar.gz 153479 BLAKE2B 6b3f4baf1f6323eeb6747a06ce82682a72a7284df4235cdcbd50c765a6f890de46385bf3eab4f919bc11070bc63cafd4975654e9f16e399aa793dc03406d6da5 SHA512 046dd19be1791eaf2b50bd7029f0bbe8ad0805113faf9a80b37571c42d76c0f7661a9273876de8cd5bf1d13fdc8133a8eaf9def28dd8077bf667225726797fdc DIST carbon-c-relay-3.1.tar.gz 271011 BLAKE2B 62d97ba268f121db466a761001f0c5f49e2571edc26c90ee4f40d311cc3f9abb55178ea375c6663407d5fce78c5162a8460a260c9baa7faed3908fc2e4bb9870 SHA512 8c8062e4fa9ec22281b1848923dc73b39c4617b0c6297f57f69080a7aedf07ef8d5c6e0bebbd5ef0faf3a1255ab155475bc40aeee582838d604da1cc2e43ca4e DIST carbon-c-relay-3.2.tar.gz 291396 BLAKE2B 6a7ba4f30498c217505098b3cafa69a481a0bb78776b207cb4120d686a896156a39a0c87795b2766d39c3b0e69d4ed17943bee43e3218bf079931ad2b8360116 SHA512 11065303e18e9e2660150a7ba2137abe48b514abcdba93632a5fa46c8412bfb3472bfebb93584c629e5978be210237fad77f975eb1abb1e07b9cdba119c7eef4 +DIST carbon-c-relay-3.3.tar.gz 293055 BLAKE2B 96d4d230e233f20ce02d519804f36787fc30238ba4fb173600e18a52af6a28bb954c476baffefcb229e42f3c2e6ff1d97196c188c527fc72fd5b98982f74451f SHA512 285f5d90c31644543a674b60e017c4d65f39762fe211b14a99583473e6d80313c3f907e4432750e6f25851e4a693457d1609a9bc176744b217f6cf0533ab4879 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 deleted file mode 100644 index 963456421ce..00000000000 --- a/app-misc/carbon-c-relay/carbon-c-relay-3.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs user - -DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter" -HOMEPAGE="https://github.com/grobian/carbon-c-relay"; -SRC_URI="https://github.com/grobian/carbon-c-relay/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND}" - -pkg_preinst() { - enewgroup carbon - enewuser carbon -1 -1 -1 carbon -} - -src_configure() { - tc-export CC -} - -src_install() { - newbin relay ${PN} - dodoc ChangeLog.md - doman ${PN}.1 - - newinitd "${FILESDIR}"/${PN}.initd ${PN} - newconfd "${FILESDIR}"/${PN}.confd ${PN} -} 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 new file mode 100644 index 00000000000..f5a67797fa2 --- /dev/null +++ b/app-misc/carbon-c-relay/carbon-c-relay-3.3.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit user + +DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter" +HOMEPAGE="https://github.com/grobian/carbon-c-relay"; +SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P}.tar.gz"; + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc64 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +IUSE="lz4 ssl zlib pcre pcre2 +oniguruma" + +# ensure only one of pcre, pcre2 and oniguruma is set, or none (libc) +# unforunately pcre is in global USE, so we have to exclude that here +REQUIRED_USE=" + pcre2? ( !oniguruma ) + oniguruma? ( !pcre2 ) +" +RDEPEND="lz4? ( app-arch/lz4 ) + ssl? ( dev-libs/openssl:0 ) + zlib? ( app-arch/gzip ) + !oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) ) + pcre2? ( dev-libs/libpcre2 ) + oniguruma? ( dev-libs/oniguruma )" +DEPEND="${RDEPEND}" + +pkg_preinst() { + enewgroup carbon + enewuser carbon -1 -1 -1 carbon +} + +src_configure() { + local pcrecfg + if use !pcre2 && use !oniguruma ; then + pcrecfg=$(use_with pcre) + else + pcrecfg="--without-pcre" + fi + + econf $(use_with lz4) $(use_with ssl) $(use_with zlib gzip) \ + "${pcrecfg}" $(use_with pcre2) $(use_with oniguruma) +} + +src_install() { + default + # rename too generic name + mv "${ED}"/usr/bin/{relay,${PN}} || die + dodoc ChangeLog.md + + newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} + newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN} +} diff --git a/app-misc/carbon-c-relay/metadata.xml b/app-misc/carbon-c-relay/metadata.xml index a9d0c9cb929..5695b7a6de7 100644 --- a/app-misc/carbon-c-relay/metadata.xml +++ b/app-misc/carbon-c-relay/metadata.xml @@ -6,6 +6,8 @@ </maintainer> <use> <flag name="lz4">add support for LZ4 compressed transport</flag> + <flag name="pcre2">use <pkg>dev-libs/libpcre2</pkg> as regex implementation</flag> + <flag name="oniguruma">use <pkg>dev-libs/oniguruma</pkg> as regex implementation</flag> </use> <upstream> <remote-id type="github">grobian/carbon-c-relay</remote-id>
