gentoo resync : 05.12.2021

3 files changed, 0 insertions, 116 deletions

diff --git a/dev-python/carbon/Manifest b/dev-python/carbon/Manifest
index d5e222af7085..36cbe807c6f3 100644
--- a/dev-python/carbon/Manifest
+++ b/dev-python/carbon/Manifest
@@ -1,8 +1,5 @@
 AUX carbon.confd 119 BLAKE2B 75505b3aedcc65306a1cd16645e349012652a268d838dc1fd32d8a143d18dfca3c9e3233a0bfcdeee22a26592bb49408a3e4708d96796361219f73dc5e32adb4 SHA512 049d2e3c9e9ae9375f485568185b14fb326a85f13a5f40e19a5d26aaecd0b98a61f011dbe4335110b6e3314ec52d308fea8f577df8b29b5d675fd7763a02788f
-AUX carbon.initd 1259 BLAKE2B 06d75128329df6efe82b2d2ac2c35bb5f8726b760fc3e34335bea972a8c74070b6f892825b2b34144e15a41833cbbbb0e64d449f1c3326e7fae7b88349e62c48 SHA512 f6ccd3a3abdd8b8e1eff55aa6a0cd0b26e5cd6789ff6f8f795890e61adfac7369c101788a0db2e7d6fdaeace622cf8313a331aa6e0f54e9dda7ec8194351019a
 AUX carbon.initd2 1329 BLAKE2B 7990f8ee25f2554ce5997075c7fda4cfc69d73ae060657a917498bed4ef237a6e0b43b522ef15b0587d15c71fdb03a26f562d1147212c50f8d838f97522cc9cd SHA512 08d9a7ddc763bb49763b1c873504b0dfb45763ed871f22632885692f41d5d8c86616677c2669b0b8c2160170a7c507c2415571d300e2045675c7002556a4063e
-DIST carbon-1.1.7.tar.gz 73380 BLAKE2B 8f9c807bc5e1c6fc020ae31179b6c0c11724b1110def323f92e158c5cf7c88291686bdc7f9078fb9234e5f2877fd745f7ec581533fa9a77e0307bf56f8ba60e0 SHA512 f0c5c64fa02cfd5940a7b23dbb3f2af27f67595e301ae719f4e2e9cdb48d4a5673d36a60adc8d338a55202f8e89873a7539c960cc16649903305191c6b0fc875
 DIST carbon-1.1.8.tar.gz 72452 BLAKE2B d76a281925645ebf6f74ff83f8ea6a52016f29ae0e35143e48e9aa0f2fcc267ceee1b5040ad756bbab8b2c1ffde5040231b8e0b581bd177bfb31ddf33fab7933 SHA512 b679d0329a5c8701af8aad3bdc51d64fbab7d05214c09368a218f1c925593002596a04b50fd2aadf26bd21ea7ef4b8262ae7f8169ef0d6ee40dccbc933539161
-EBUILD carbon-1.1.7.ebuild 1976 BLAKE2B 17434aca43a27ee36177698f79d54be23dfeadcd3546f69a79a30143fd48a4ed00d76be114b61dfb6b24ad6dcc8cd5d9d01f525843be1629f0985f9fd1718d13 SHA512 0fc942a5a56ba0dd05311f28ad957602e6e0bc372a439b0e4d195298a2871d8807fec2a075f6f30b793188b29746c75a41b580cc5afe91e74ef991509922c4f0
 EBUILD carbon-1.1.8.ebuild 1976 BLAKE2B 572db2a871584dac7cfa542dfda82bcbc30d17ff82092d182057536934b788b1564565a2ef611abfaf6c700afa566f2ff54a85a8009c735961b28ef41b24e7a7 SHA512 4dc5e6b1d9567bdb56bd91a95dc8abcdd5ced0b5885dcf7d6f19b5f20dc882bc02c13dc82493caf0ad92aba01fae22d364170f3aea531053a0c21a85661b299b
 MISC metadata.xml 442 BLAKE2B e3ab8eb53738bdacc8fb73e7514c28290609200a34d6d6fc0111e30bd44d7806f91a4c3906cf473f8dc58b6d8012ecdaf320d943f770d05e26f3b0b44d99a57f SHA512 0deb6d56a05c7b0ee70787dad985a0f250d8328c1edd54690092dceeab8ba90e96ec2ddb326202f01eeb702776e448b746a5c92392ea02cba1892155d3eb60ec
diff --git a/dev-python/carbon/carbon-1.1.7.ebuild b/dev-python/carbon/carbon-1.1.7.ebuild
deleted file mode 100644
index 906b0342f044..000000000000
--- a/dev-python/carbon/carbon-1.1.7.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="Backend data caching and persistence daemon for Graphite"
-HOMEPAGE="https://graphiteapp.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-# whisper appears to have been missed from listing in install_requires in setup.py
-RDEPEND="
-	dev-python/twisted[${PYTHON_USEDEP}]
-	dev-python/cachetools[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	=dev-python/whisper-${PV}*[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# Do not install the configuration and data files. We install them
-	# somewhere sensible by hand.
-	sed -i -e '/data_files=install_files,/d' setup.py || die
-	# We want FHS-style paths instead of /opt/graphite
-	export GRAPHITE_NO_PREFIX=yes
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/carbon
-	doins conf/*
-
-	keepdir /var/log/carbon /var/lib/carbon/{whisper,lists,rrd}
-
-	newinitd "${FILESDIR}"/carbon.initd2 carbon-cache
-	newinitd "${FILESDIR}"/carbon.initd2 carbon-relay
-	newinitd "${FILESDIR}"/carbon.initd2 carbon-aggregator
-
-	newconfd "${FILESDIR}"/carbon.confd carbon-cache
-	newconfd "${FILESDIR}"/carbon.confd carbon-relay
-	newconfd "${FILESDIR}"/carbon.confd carbon-aggregator
-}
-
-pkg_postinst() {
-	einfo 'This ebuild installs carbon into FHS-style paths.'
-	einfo 'You will probably have to set GRAPHITE_CONF_DIR to /etc/carbon'
-	einfo 'and GRAPHITE_STORAGE_DIR to /var/lib/carbon to make use of this'
-	einfo '(see /etc/carbon/carbon.conf.example).'
-	einfo ' '
-	einfo 'OpenRC init script supports multiple instances !'
-	einfo 'Example to run an instance b of carbon-cache :'
-	einfo '    ln -s /etc/init.d/carbon-cache /etc/init.d/carbon-cache.b'
-	einfo '    cp /etc/conf.d/carbon-cache /etc/conf.d/carbon-cache.b'
-}
diff --git a/dev-python/carbon/files/carbon.initd b/dev-python/carbon/files/carbon.initd
deleted file mode 100644
index a33a70c60f93..000000000000
--- a/dev-python/carbon/files/carbon.initd
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-export GRAPHITE_CONF_DIR=/etc/carbon
-export GRAPHITE_STORAGE_DIR=/var/lib/carbon
-
-INSTANCE=${SVCNAME/#*.}
-if [ "${INSTANCE}" == "${SVCNAME}" ]; then
-	INSTANCE="a"
-fi
-
-PIDFILE="/var/run/${SVCNAME}.pid"
-PROGRAMNAME=${SVCNAME/.*}
-
-CARBON_CONFIG=${CARBON_CONFIG:-/etc/carbon/carbon.conf}
-
-depend() {
-	use net
-}
-
-
-start_pre() {
-	if [ ! -f ${CARBON_CONFIG} ] ; then
-		eend "Missing ${CARBON_CONFIG}"
-	fi
-	case "${PROGRAMNAME}" in
-		"carbon-relay" )
-			[ -f /etc/carbon/relay-rules.conf ] || eend "Missing relay-rules.conf"
-			;;
-		"carbon-aggregator" )
-			[ -f /etc/carbon/aggregation-rules.conf ] || eend "Missing missing aggregation-rules.conf"
-			;;
-	esac
-}
-
-start() {
-	ebegin "Starting ${PROGRAMNAME} instance ${INSTANCE}"
-	start-stop-daemon --start --exec /usr/bin/${PROGRAMNAME}.py \
-	    --pidfile ${PIDFILE} \
-	    -- --pidfile ${PIDFILE} --instance ${INSTANCE} \
-		--logdir /var/log/carbon/ --config ${CARBON_CONFIG} start >/dev/null
-	eend $? "Failed to start ${SVCNAME}"
-}
-
-stop() {
-	ebegin "Stopping ${PROGRAMNAME} instance ${INSTANCE}"
-	start-stop-daemon --stop \
-		--pidfile ${PIDFILE}
-	eend $? "Failed to stop ${SVCNAME}"
-}