[gentoo-commits] repo/gentoo:master commit in: app-misc/carbon-c-relay/

["Fabian Groffen" <grobian@gentoo.org>]

commit:     77383e1186d3b26ad793ec678321c10c9bf167c3
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  5 09:24:16 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jul  5 09:24:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77383e11

app-misc/carbon-c-relay-3.7: version bump

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 app-misc/carbon-c-relay/Manifest                     |  2 +-
 ...-c-relay-3.4.ebuild => carbon-c-relay-3.7.ebuild} | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest
index 2bb2d8ffb14..2aa7d62f74d 100644
--- a/app-misc/carbon-c-relay/Manifest
+++ b/app-misc/carbon-c-relay/Manifest
@@ -1,3 +1,3 @@
-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
+DIST carbon-c-relay-3.7.tar.gz 560726 BLAKE2B 750cc3e5f56fc2e5b972985ed6f9dffe0b5c214736d4b9dd93233dfc78ae261cca40c8398dbd6c2f8a19ac6a6e39fdc466417b3c957be1376389cc23d8613cae SHA512 9ae47c6c073bf93c371c358cb865dc7f45b6a9fe91896cbfd8288ec8ed894e82d7c970efbb27b58db4fe0e63707ed7eb772eccb8d292b3ffe6fdfb55d3d6ddd4

diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.4.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.7.ebuild
similarity index 86%
rename from app-misc/carbon-c-relay/carbon-c-relay-3.4.ebuild
rename to app-misc/carbon-c-relay/carbon-c-relay-3.7.ebuild
index 7afbf976a68..c5e804d282e 100644
--- a/app-misc/carbon-c-relay/carbon-c-relay-3.4.ebuild
+++ b/app-misc/carbon-c-relay/carbon-c-relay-3.7.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit user
+EAPI=7
 
 DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter"
 HOMEPAGE="https://github.com/grobian/carbon-c-relay"
@@ -26,14 +24,11 @@ RDEPEND="lz4? ( app-arch/lz4 )
 	ssl? ( dev-libs/openssl:0 )
 	!oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) )
 	pcre2? ( dev-libs/libpcre2 )
-	oniguruma? ( dev-libs/oniguruma )"
+	oniguruma? ( dev-libs/oniguruma )
+	acct-group/carbon
+	acct-user/carbon"
 DEPEND="${RDEPEND}"
 
-pkg_preinst() {
-	enewgroup carbon
-	enewuser carbon -1 -1 -1 carbon
-}
-
 src_configure() {
 	local pcrecfg
 	if use !pcre2 && use !oniguruma ; then
@@ -49,8 +44,13 @@ src_configure() {
 
 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}