commit: 25a2403aaf207794ef3f15e378bfc3400a330f76 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Fri Feb 22 08:31:05 2019 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Fri Feb 22 08:31:33 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25a2403a
app-misc/carbon-c-relay: version bump Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 app-misc/carbon-c-relay/Manifest | 2 +- ...-relay-3.2.ebuild => carbon-c-relay-3.5.ebuild} | 29 ++++++++++++++++++---- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest index 046050c5e7b..4d2acf9b694 100644 --- a/app-misc/carbon-c-relay/Manifest +++ b/app-misc/carbon-c-relay/Manifest @@ -1,3 +1,3 @@ -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 DIST carbon-c-relay-3.4.tar.gz 297795 BLAKE2B 48e954af09db99fc6ab8a227be8742fadd268907c2dd203a9bd6b5417fbf77d604f13636416452108e9df77df6fe9350d5a3dba3f34b1f200b31aba5ebfb2d91 SHA512 12e5d952ac34d7ec33999946dc30c1c388fe5fba7d28355ead77377bca90228f003955353e8f92b743c1ccf5e55ffaf6c32188de3bfb0a1ad75a80cc418c5e00 +DIST carbon-c-relay-3.5.tar.gz 304570 BLAKE2B 4b2595eb3aecab7793e2f8a96a6f0a28b967d5e753ee25b175d70fcd2c9d6c492252b2ece5012fd446ba586da9f82e80cc10a9ed3f520bd6600f17e7137fd5ec SHA512 5461e9c32b2953e2c182f71bcaebde33f571dc9672d63231aedf88aca65b2576d0787ab24e871905d46fd0a4176b31f817f75aee09f93a66a280ca67caf74e66 diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.2.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.5.ebuild similarity index 52% rename from app-misc/carbon-c-relay/carbon-c-relay-3.2.ebuild rename to app-misc/carbon-c-relay/carbon-c-relay-3.5.ebuild index b90690b8cff..4c796fdadaa 100644 --- a/app-misc/carbon-c-relay/carbon-c-relay-3.2.ebuild +++ b/app-misc/carbon-c-relay/carbon-c-relay-3.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,11 +12,21 @@ SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P} LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~arm ~ppc64 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -IUSE="lz4 ssl zlib" - +IUSE="lz4 snappy zlib ssl 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 ) + snappy? ( app-arch/snappy ) + zlib? ( app-arch/gzip ) 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() { @@ -25,7 +35,16 @@ pkg_preinst() { } src_configure() { - econf $(use_with lz4) $(use_with ssl) $(use_with zlib gzip) + local pcrecfg + if use !pcre2 && use !oniguruma ; then + pcrecfg=$(use_with pcre) + else + pcrecfg="--without-pcre" + fi + + econf $(use_with lz4) $(use_with snappy) \ + $(use_with ssl) $(use_with zlib gzip) \ + "${pcrecfg}" $(use_with pcre2) $(use_with oniguruma) } src_install() {
