gentoo resync : 05.03.2021

3 files changed, 67 insertions, 3 deletions

diff --git a/dev-python/carbon/Manifest b/dev-python/carbon/Manifest
index a0b4b947ab71..07dc61ace26c 100644
--- a/dev-python/carbon/Manifest
+++ b/dev-python/carbon/Manifest
@@ -2,5 +2,7 @@ AUX carbon.confd 119 BLAKE2B 75505b3aedcc65306a1cd16645e349012652a268d838dc1fd32
 AUX carbon.initd 1259 BLAKE2B 06d75128329df6efe82b2d2ac2c35bb5f8726b760fc3e34335bea972a8c74070b6f892825b2b34144e15a41833cbbbb0e64d449f1c3326e7fae7b88349e62c48 SHA512 f6ccd3a3abdd8b8e1eff55aa6a0cd0b26e5cd6789ff6f8f795890e61adfac7369c101788a0db2e7d6fdaeace622cf8313a331aa6e0f54e9dda7ec8194351019a
 AUX carbon.initd2 1329 BLAKE2B 7990f8ee25f2554ce5997075c7fda4cfc69d73ae060657a917498bed4ef237a6e0b43b522ef15b0587d15c71fdb03a26f562d1147212c50f8d838f97522cc9cd SHA512 08d9a7ddc763bb49763b1c873504b0dfb45763ed871f22632885692f41d5d8c86616677c2669b0b8c2160170a7c507c2415571d300e2045675c7002556a4063e
 DIST carbon-1.1.5.tar.gz 72365 BLAKE2B 304e515fd3cae806e141d0a76983d13967885a7e57c310d86c0c83560aa306a573676fb0135fceccf14cc7ed42d8a9dcb7869ab0d6ac3b2fc00c2fb088011873 SHA512 1b3a0a0d4005e2ec8d5bca062b41f0e18329c1bc4d3a4b3eca5e8f7c94c20387281392eefceaca90294e51860eabecca242c487068433119f1f249f8659ed560
-EBUILD carbon-1.1.5.ebuild 1996 BLAKE2B ee98338e8c5d05f3119a93b3cd9aa3955a34b469ff791b76ea87743b7ac6ee957620711efe690e9cc063363404b7079cea1b5958412a4e8c91f6f8caf8cf73f2 SHA512 49e34839ca52b6f9545b6823cf99a08ef35f2cc79121de67c40732c351a2efc925d5ce9cf88c5762e1968ce16b946fd8a707ee1144673b7f3d2b32c57f4845b9
+DIST carbon-1.1.7.tar.gz 73380 BLAKE2B 8f9c807bc5e1c6fc020ae31179b6c0c11724b1110def323f92e158c5cf7c88291686bdc7f9078fb9234e5f2877fd745f7ec581533fa9a77e0307bf56f8ba60e0 SHA512 f0c5c64fa02cfd5940a7b23dbb3f2af27f67595e301ae719f4e2e9cdb48d4a5673d36a60adc8d338a55202f8e89873a7539c960cc16649903305191c6b0fc875
+EBUILD carbon-1.1.5.ebuild 1983 BLAKE2B 07c973b2eabdaa73b4968b8345a001b9aa78f9414b47a59315fa2572f200648e374bf3f8542db153868f7dbaaeb019f9d8e35cd3ff814afe9a954aa8bae316e5 SHA512 7c3fb474ecdd54342fc47861311253058d5876f5342cf17366c5ac2e69a59aec61645b0b657f7c2d5533e71c62728c8f93e5a374574d67e102bd719f3b988b27
+EBUILD carbon-1.1.7.ebuild 1976 BLAKE2B 17434aca43a27ee36177698f79d54be23dfeadcd3546f69a79a30143fd48a4ed00d76be114b61dfb6b24ad6dcc8cd5d9d01f525843be1629f0985f9fd1718d13 SHA512 0fc942a5a56ba0dd05311f28ad957602e6e0bc372a439b0e4d195298a2871d8807fec2a075f6f30b793188b29746c75a41b580cc5afe91e74ef991509922c4f0
 MISC metadata.xml 441 BLAKE2B d2e47e40cd430deb50428472c2a1aa280b888429892f59bf49a58b3ace4210005efd9489821c89ec59b72b398ef78510817a552dbbb65f2e64c9725ab0375507 SHA512 b6a65d642333fb19a34c4f1342b58ee9eadb9824f078a7cd9faac06d3d9e731ea67aa138a8e36db797b755dd382873583808aa6460375ebedf61443be962fc5d
diff --git a/dev-python/carbon/carbon-1.1.5.ebuild b/dev-python/carbon/carbon-1.1.5.ebuild
index e115171fb0a7..6fedf6f4cfea 100644
--- a/dev-python/carbon/carbon-1.1.5.ebuild
+++ b/dev-python/carbon/carbon-1.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~x64-solaris"
+KEYWORDS="~amd64 ~x86"
 
 # whisper appears to have been missed from listing in install_requires in setup.py
 RDEPEND="
diff --git a/dev-python/carbon/carbon-1.1.7.ebuild b/dev-python/carbon/carbon-1.1.7.ebuild
new file mode 100644
index 000000000000..906b0342f044
--- /dev/null
+++ b/dev-python/carbon/carbon-1.1.7.ebuild
@@ -0,0 +1,62 @@
+# 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'
+}