commit: 03834c86a5048a4217d1f18b42a22d9dcb05e265 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Sat Jul 17 23:04:33 2021 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sat Jul 17 23:04:33 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03834c86
app-misc/carbon-c-relay: drop old version Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> app-misc/carbon-c-relay/Manifest | 2 - .../carbon-c-relay/carbon-c-relay-3.5-r1.ebuild | 58 ------------------ .../carbon-c-relay/carbon-c-relay-3.6-r1.ebuild | 63 ------------------- app-misc/carbon-c-relay/files/carbon-c-relay.confd | 15 ----- app-misc/carbon-c-relay/files/carbon-c-relay.initd | 70 ---------------------- 5 files changed, 208 deletions(-) diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest index 7697a2c0fd6..8753f8c7f5c 100644 --- a/app-misc/carbon-c-relay/Manifest +++ b/app-misc/carbon-c-relay/Manifest @@ -1,3 +1 @@ -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 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 4fd7b63ac24..00000000000 --- 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 9a577c441d5..00000000000 --- 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 d2824644d3c..00000000000 --- 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 8d39afe05d4..00000000000 --- 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" -}
