gentoo Easter resync : 12.04.2020

2 files changed, 0 insertions, 67 deletions

diff --git a/dev-python/carbon/Manifest b/dev-python/carbon/Manifest
index c8d4dd3c09a4..e687901ae4d8 100644
--- a/dev-python/carbon/Manifest
+++ b/dev-python/carbon/Manifest
@@ -1,8 +1,6 @@
 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.3.tar.gz 68824 BLAKE2B b5e532fa0d0d8dc8ab8c3c555dea6bb3b918cd5b516ea4c754f9b3cd37230f54b63d202cfead9ec4242ebf78031c2671050354dccccde2980c4101b9699b1393 SHA512 0cfa9260484de147660110b7d2cc7e41bcbd7751c80bd5c557534b2a52c2183fdba94d40f8654fe54f593b2ab34581b2480e96c8a6dde4d47de783153a2cbe65
 DIST carbon-1.1.5.tar.gz 72365 BLAKE2B 304e515fd3cae806e141d0a76983d13967885a7e57c310d86c0c83560aa306a573676fb0135fceccf14cc7ed42d8a9dcb7869ab0d6ac3b2fc00c2fb088011873 SHA512 1b3a0a0d4005e2ec8d5bca062b41f0e18329c1bc4d3a4b3eca5e8f7c94c20387281392eefceaca90294e51860eabecca242c487068433119f1f249f8659ed560
-EBUILD carbon-1.1.3-r1.ebuild 2112 BLAKE2B e6a02862ed86e29b81950c3e72817c41361206c46e53767aa6382f9beac45ba806668542d1de3268e8203172b9684989465706dd89259fdd0da8d58f71f08aa4 SHA512 efb25bc72744fd9c7133ffa4090ed25fa84d2262b6d9c418886b62ff1e958327d124b34e1d3dea298f6629fb289ed1fdc290b8e263c9a78aa48a9decb69a3050
 EBUILD carbon-1.1.5.ebuild 2023 BLAKE2B 2aaea9e8f1721ba82473ce1d801db5d3e2ddb2930841324abdceac2ca0b69dc0ab13b998b09917272a20064c5740b02543c4fe446d953ee619b365ea15fba858 SHA512 1e85755445b607f1048c1a790ee8a50df4db1c71af17471c4ea0c7ee7348492df0f86d72e6f3edf6e9d84ab1aa8c1d6d267e3bb7717cde986f5b54c85383728e
 MISC metadata.xml 441 BLAKE2B d2e47e40cd430deb50428472c2a1aa280b888429892f59bf49a58b3ace4210005efd9489821c89ec59b72b398ef78510817a552dbbb65f2e64c9725ab0375507 SHA512 b6a65d642333fb19a34c4f1342b58ee9eadb9824f078a7cd9faac06d3d9e731ea67aa138a8e36db797b755dd382873583808aa6460375ebedf61443be962fc5d
diff --git a/dev-python/carbon/carbon-1.1.3-r1.ebuild b/dev-python/carbon/carbon-1.1.3-r1.ebuild
deleted file mode 100644
index 9bad63510273..000000000000
--- a/dev-python/carbon/carbon-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-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 ~x64-solaris"
-
-# 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/txAMQP[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	=dev-python/whisper-${PV}*[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# bug #661340, excerpt from upstream, next release should have it
-	sed -i -e "s/'r+'/'rb+'/" lib/carbon/log.py || die
-
-	# 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'
-}