gentoo resync : 24.07.2021

5 files changed, 0 insertions, 212 deletions

diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest
index 5869dd4fd3bb..74694d232648 100644
--- a/app-misc/carbon-c-relay/Manifest
+++ b/app-misc/carbon-c-relay/Manifest
@@ -1,11 +1,5 @@
-AUX carbon-c-relay.confd 362 BLAKE2B 7d33b9087ab77f07606fef84c4ed3dcff41e56040027b5bdbdb2ab22b010fb78acc69a1532738d6e76d453eaefcef0e47d3a5cc6f123167ee6687ce8bc8dc923 SHA512 39c4838e39c494ac70573f1d7202d7bf359a01903877eabac60f5576c288372897c72393322a3d991ae6bfc75f8275c178ead912321836f570b6535b9c53fa8e
 AUX carbon-c-relay.confd-r1 365 BLAKE2B 10a531055296877bb027f5dc6546b054da7e5b84950bbcf8de8d4af552e61fcd9bbebeea3bc432a25f14103c4f2f30db4885259f855182e6923b79649e63fb60 SHA512 a432cf28c86ec45c807eeb5a7b506e7dcc6155c138aea5dc60eb8bcf5036ac0efc3a81fbc044af34dab5f05f250635892c5e706dfd69cc1087f0c283c3aa9393
-AUX carbon-c-relay.initd 1678 BLAKE2B f97d7390e0d03ffaa9cca658ac206eff4ea22336f100e860aa81c72e593440c79596af6c0245a8f8759fff2c24084f1019581b44f21e984820a616f10543d09a SHA512 5a3415395affe6c4e315c650733d8e335d5fa8e490ffeba8dc7c944976f3b68ca14e801175a2136499b00fa6adf403428ae509cb9c3596b6a3188ef20d09c575
 AUX carbon-c-relay.initd-r1 1801 BLAKE2B 4627b6e0d9a44d5c544ccff0c33557c73dd971929fbb442be79f3913752f39b1d534d4e4e936ebe94ebd5883d56e3f04314b9033c0a5ef7a3cbe7e05e1aeeb42 SHA512 5cf3c424a8be6bb55a80b58ce590838fec8ed26f8f407e8561c1e3ea094e80ad4021d153b3d816ab6d4e6589494d9ce621fe14196e223ef3a092d0aa26a63399
-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.2.tar.gz 561080 BLAKE2B 55674699b2afcffa911954a52e3c51b92380c81083db0330e7e6eab495e72938b7761a8c7bc17ac65ea56db1c11f4c360bab3b7442ca13f3466170d6bb3f6fd6 SHA512 dab2eaf2da07afd429012b93f0c826e2fe6e43371afa07d34793dd212820790af2487f5710524deac52c3ed18b874ce8ff54d90b3872e269dc570b7ad30c1826
-EBUILD carbon-c-relay-3.5-r1.ebuild 1514 BLAKE2B b785d81ddc95d3af346eab986d91a37bae33a10ff5d2376cc21117f75c857fc9ef71fb2ed78ec5a7ab66aa1b79938ea4d3d49cf9c5fbd49ae0ada636fed3707d SHA512 88cb663258a0d84dcf01300bee13181e517a6283ccd5305e2e85c24361b80d8d1152fdebd8da25d95e5df43a788e1fc74491ff0facd12595eccb1cc9b573e564
-EBUILD carbon-c-relay-3.6-r1.ebuild 1614 BLAKE2B d638ee7914142d9cb8d996dff745f75addcba95810e44288f6fd2cb0a0c8187af7a3729e45f5850a84092c88c40bdb3dc164073b0f7e1ee066a74ebf2ca6a3c1 SHA512 d1d20548e0a3997071e7a53c817a56b904661badc2d7aaf56cae00eea4536bb514d24578fd8a4d1cec99f25bff9c0a3926feffbc678743cd39ded3dc3f4dd1a0
 EBUILD carbon-c-relay-3.7.2-r1.ebuild 1567 BLAKE2B 13280b7bde34cd94b238fc0d95bdf78d5727c7535891a9b0382caeb4ced930dabcdef57a34de586b90b2c1c6b586e4120ebd2fbe7dbc4d53c34a4aceb46088e5 SHA512 73039e2207eb62431fc06ce0bd9216d8f0f337abe686d290ed3e3e84fb3130a45be437ca035d9fb35a4ac381ef1fef63d7e6eb409f735945631357e5e0ca2b95
 MISC metadata.xml 653 BLAKE2B 224540619f2aa5e40aeb57085a4d13640c7cc6381a7a26fea6a6854935f6705576b5ca5ea88b0b7647ff3c293c6bd83b4b170c66ab12521dc7e01811506a33da SHA512 91e5e7ea08dcac8edbbbe0ed7a6b8ccac8a6ea7c2ba89d33c4f188aabaa5a975ac1738c31b942c8db8c6a37f6b1dff67f757b60991143c13f821f63ffea5ca0a
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.5-r1.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.5-r1.ebuild
deleted file mode 100644
index 4fd7b63ac246..000000000000
--- a/app-misc/carbon-c-relay/carbon-c-relay-3.5-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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 ~x64-solaris ~x86-solaris"
-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= )
-	!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 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
-	dodoc ChangeLog.md
-
-	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
-}
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.6-r1.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.6-r1.ebuild
deleted file mode 100644
index 9a577c441d51..000000000000
--- a/app-misc/carbon-c-relay/carbon-c-relay-3.6-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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 ~x64-solaris ~x86-solaris"
-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= )
-	!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 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}
-	newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
-}
diff --git a/app-misc/carbon-c-relay/files/carbon-c-relay.confd b/app-misc/carbon-c-relay/files/carbon-c-relay.confd
deleted file mode 100644
index d2824644d3c0..000000000000
--- a/app-misc/carbon-c-relay/files/carbon-c-relay.confd
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# routing file to read
-#ROUTES_FILE=/etc/carbon-c-relay.conf
-
-# where to store the PID-file
-#PIDFILE=/run/carbon-c-relay.pid
-
-# user and group to run carbon-c-relay as
-#USER=carbon
-#GROUP=carbon
-
-# any options to use when starting the relay
-#EXTRA_OPTS=
diff --git a/app-misc/carbon-c-relay/files/carbon-c-relay.initd b/app-misc/carbon-c-relay/files/carbon-c-relay.initd
deleted file mode 100644
index 8d39afe05d49..000000000000
--- a/app-misc/carbon-c-relay/files/carbon-c-relay.initd
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="configtest"
-extra_started_commands="reload"
-
-description="Lightweight graphite metrics router and aggregator."
-description_configtest="Run carbon-c-relay's internal config check."
-description_reload="Reload the carbon-c-relay configuration without losing connections."
-
-routes_config=${ROUTES_FILE:-/etc/${SVCNAME}.conf}
-
-command="/usr/bin/carbon-c-relay"
-command_args="-f ${routes_config} ${EXTRA_OPTS}"
-pidfile=${PIDFILE:-/run/${SVCNAME}.pid}
-user=${USER:-carbon}
-group=${GROUP:-carbon}
-
-depend() {
-	need net
-	use dns
-}
-
-start_pre() {
-	if [ "${RC_CMD}" != "restart" ]; then
-		configtest || return 1
-	fi
-	touch /var/log/${SVCNAME}.log
-	chown ${user}:${group} /var/log/${SVCNAME}.log
-}
-
-stop_pre() {
-	if [ "${RC_CMD}" = "restart" ]; then
-		configtest || return 1
-	fi
-}
-
-stop_post() {
-	rm -f ${pidfile}
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --background --make-pidfile --pidfile ${pidfile} \
-		--stdout /var/log/${SVCNAME}.log \
-		--stderr /var/log/${SVCNAME}.log \
-		--user ${user} --group ${group} \
-		--exec ${command} -- ${command_args}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec ${command} --pidfile ${pidfile}
-	eend $?
-}
-
-reload() {
-	configtest || return 1
-	ebegin "Refreshing ${SVCNAME}'s configuration"
-	kill -HUP $(< ${pidfile}) &>/dev/null
-	eend $? "Failed to reload ${SVCNAME}"
-}
-
-configtest() {
-	ebegin "Checking ${SVCNAME}'s configuration"
-	${command} -f "${routes_config}" -t < /dev/null > /dev/null
-	eend $? "failed, please correct errors above"
-}