commit: 99f7062c54e3378f1fdb6485f486569d55f49648 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Sat Oct 26 10:33:14 2019 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Sat Oct 26 10:33:14 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99f7062c
app-misc/carbon-c-relay: version bump to v3.6 Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> app-misc/carbon-c-relay/Manifest | 2 +- ...arbon-c-relay-3.3.ebuild => carbon-c-relay-3.6.ebuild} | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest index 4d2acf9b694..2bb2d8ffb14 100644 --- a/app-misc/carbon-c-relay/Manifest +++ b/app-misc/carbon-c-relay/Manifest @@ -1,3 +1,3 @@ -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 +DIST carbon-c-relay-3.6.tar.gz 557612 BLAKE2B 9921a6488a0f04d6b8a7bbe54d13d23dcf979331103e1b862a8a504ead92afdc7530c665cd5a8973ac0cee952c7454ca8fcfb7b9e632ebf8c175083e83c10cc1 SHA512 7336e29890610d5248059c9de7653892d761005881897bff8279c0b12396a5d9aaedf4987121338f43951b8d322cddaaab43a2151b89e98eee9e4da8c7188cd4 diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.3.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.6.ebuild similarity index 81% rename from app-misc/carbon-c-relay/carbon-c-relay-3.3.ebuild rename to app-misc/carbon-c-relay/carbon-c-relay-3.6.ebuild index f5a67797fa2..731e22fc2b7 100644 --- a/app-misc/carbon-c-relay/carbon-c-relay-3.3.ebuild +++ b/app-misc/carbon-c-relay/carbon-c-relay-3.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ 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 pcre pcre2 +oniguruma" +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 @@ -21,8 +21,9 @@ REQUIRED_USE=" oniguruma? ( !pcre2 ) " RDEPEND="lz4? ( app-arch/lz4 ) - ssl? ( dev-libs/openssl:0 ) + snappy? ( app-arch/snappy ) zlib? ( app-arch/gzip ) + ssl? ( dev-libs/openssl:0 ) !oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) ) pcre2? ( dev-libs/libpcre2 ) oniguruma? ( dev-libs/oniguruma )" @@ -41,14 +42,20 @@ src_configure() { pcrecfg="--without-pcre" fi - econf $(use_with lz4) $(use_with ssl) $(use_with zlib gzip) \ + econf $(use_with lz4) $(use_with snappy) \ + $(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 + + # remove libfaketime, necessary for testing only + rm -f "${ED}"/usr/$(get_libdir)/libfaketime.* + dodoc ChangeLog.md newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
