gentoo resync : 25.01.2019

3 files changed, 16 insertions, 84 deletions

diff --git a/dev-python/carbon/Manifest b/dev-python/carbon/Manifest
index 61ac0e19567f..815d95feab4b 100644
--- a/dev-python/carbon/Manifest
+++ b/dev-python/carbon/Manifest
@@ -5,12 +5,10 @@ AUX carbon.initd 1259 BLAKE2B 06d75128329df6efe82b2d2ac2c35bb5f8726b760fc3e34335
 AUX carbon.initd2 1329 BLAKE2B 7990f8ee25f2554ce5997075c7fda4cfc69d73ae060657a917498bed4ef237a6e0b43b522ef15b0587d15c71fdb03a26f562d1147212c50f8d838f97522cc9cd SHA512 08d9a7ddc763bb49763b1c873504b0dfb45763ed871f22632885692f41d5d8c86616677c2669b0b8c2160170a7c507c2415571d300e2045675c7002556a4063e
 AUX no-data-files.patch 881 BLAKE2B 6e8709eebe73d3686ee401a7d5db45471ba1a53b894f733a211b62be5c5c1920dc732fffeaa771a57f03ca692a63d02c55d9efeae3ff393910245cbb15e2f1df SHA512 13c2e946c42bfabc643ec39a0d384b887fb1ceaee9791e0f7c2ed037069492aa80ff4f4b593dbba7253c6e5f553e0a7d1677333a896067219df4206f742d64d7
 DIST carbon-0.9.13.tar.gz 47509 BLAKE2B 0f967d81846139164278b99aa31237c8065b7d60a13c9a6153cf3904dae52bf0e8e502d156a178f1dfdbe098236d97f8982fc10e6442351270d103adef2bd74e SHA512 89c843ac67ed4b68c28273459e5a96594851e5d2694fdefdfb71cebcdc6555d4aac8c45c1c6d2ca61a15405bac7ba3d27836470fe152d5d7a4936bb2d00e6776
-DIST carbon-0.9.14.tar.gz 50285 BLAKE2B e7926bf81509b9f65ff31287c4149102c4e249896df5035f4e18cf791e50800dff4974c49ab663f0ea5fcdee27301696a026c57ba49c1cd9b113b55f3fe97480 SHA512 e70275c0acce17287b3036668e45c75b9da9b54523faca0f5bdceda4b6b98c71ebf773740e85063ee3ea4e0bc64adee913bb7f8eab1f7016eb504b06f0b589e3
-DIST carbon-0.9.15.tar.gz 50321 BLAKE2B c3cda5251bfab2c968c3538c25178cebcd4c98436c5b939d663d64f597e60236f69a01ad7f1427dda45db8c7c2e79fd625cb33513cf3e7c5dbc53b00fce2bb15 SHA512 e8ed8ac9b247d0f5bbe0331de50d929f918ee7968ad5053d2532f4d09e49215eaecae95a79f6b8360aa0f73fc7e68a73d86886e0329b3f5ccb569136658f6562
 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-0.9.13-r1.ebuild 1850 BLAKE2B 9bb0919ed111c51709c87cc1a67e83c7f622187d6a3295a3580fb3ea4426ac5a43fc325492b768282df912505fd6ad77af002d5c1c3de7901b8379b1a493f6f5 SHA512 4d3121f3c8a2d6c04a3b8cd5153ad9132e3e573ef9b8c621f015b3eb3b46833a8720e8f3f0c36af142eaca6cf8d950352949038cc3cf3a05e6f064281b69b673
 EBUILD carbon-0.9.13.ebuild 1845 BLAKE2B 3c63c6659740da27a9bb63137122503b1c54692afa994c8fd87369fdd5f96e9d9298f6aacdc26504b85467228331cc8a6ea0637b3fbc92adbcd1732c9f26ba66 SHA512 19be871a4fb56b058990eedce3bcb70eae0b913c0b6bdb4c46236aa9e65bcd8b9bce3b2790ee591fc9494ea36e008ea98f904a5c6dd99fe7e55cc6d63c3d5182
-EBUILD carbon-0.9.14-r1.ebuild 2039 BLAKE2B e00c9b09ebd02f8f8bab63381d9ba26c0831c617de35442fa747efaad693adea3d9a7aa3312648e76e2f14deeab662e81606605a213901922528a2f445394023 SHA512 0370b1b716adca976ca799f3968d52491eeb02a3ea0e5dbd384efc6360ef8d0f0fe708d24aaf53a1dc8923eb83dbfea6c7a40dfecaa15aed5f53877d48dd6163
-EBUILD carbon-0.9.15-r1.ebuild 2047 BLAKE2B da7ca2742cb7156ad4b94e996e582b8ce1fdbb37add1b9b6c0fba8a874aeb84db63804cf3b6768d9fffb1c69d9168c5f0f56ffbca62180f4a475b03e8a8441ad SHA512 64f1250fbcf3bfe024e3a6b9be3abcace36cd2ddf4b933ef6c132d7e78d1edfefa8b68d658a52f9139e6c35486ab59f4510d07ab4ebd13e217c118b9bb8969fc
 EBUILD carbon-1.1.3-r1.ebuild 2131 BLAKE2B 5cc8aa9e09019e2f53c1650a4082ec62654716fb9adb398afd06341ae8ff30bb0be464e8aba6ed628db74efbda20bcab2ad17f02eedfef0230a993956177944c SHA512 0ec927e875b4884ee13282c4aac212d5487a304dbf8b0c471dc14e046fab3bbee96a90f4611ca01bc23d14f129e60890036d83af80d86d164cd2b6716db8352f
+EBUILD carbon-1.1.5.ebuild 2039 BLAKE2B a4708cb6be0349273632f864b390bc638f3e9e0829f143f3b48211a73877a4970dcd2c23bcd5a344619e1d843bb3ca8172a21803035ebcbc7c3f71aa1516b050 SHA512 8cf1133762dbd033177a943217430f14287603541d758a773d4e7d2b171b769f10e22172eb139ce6d47cdf0fb1d87e84a6f3bfb07a73badb1a3a2448d007ffc9
 MISC metadata.xml 441 BLAKE2B d2e47e40cd430deb50428472c2a1aa280b888429892f59bf49a58b3ace4210005efd9489821c89ec59b72b398ef78510817a552dbbb65f2e64c9725ab0375507 SHA512 b6a65d642333fb19a34c4f1342b58ee9eadb9824f078a7cd9faac06d3d9e731ea67aa138a8e36db797b755dd382873583808aa6460375ebedf61443be962fc5d
diff --git a/dev-python/carbon/carbon-0.9.15-r1.ebuild b/dev-python/carbon/carbon-0.9.15-r1.ebuild
deleted file mode 100644
index faf2c6aefcb9..000000000000
--- a/dev-python/carbon/carbon-0.9.15-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Backend data caching and persistence daemon for Graphite"
-HOMEPAGE="http://graphite.wikidot.com/"
-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-core[${PYTHON_USEDEP}]
-	dev-python/whisper[${PYTHON_USEDEP}]
-	dev-python/txAMQP[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	# Do not install the configuration and data files. We install them
-	# somewhere sensible by hand. Patch for this vn. 0.9.14 has been extended
-	# due to redhat's init scripts set to install unconditionally in setup.py
-	"${FILESDIR}"/${PN}-0.9.14-no-data-files.patch
-	)
-
-python_prepare_all() {
-	# This sets prefix to /opt/graphite. We want FHS-style paths instead.
-	rm setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/carbon
-	doins conf/*
-
-	dodir /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/carbon-0.9.14-r1.ebuild b/dev-python/carbon/carbon-1.1.5.ebuild
index 5ef85c12f72d..08cf9a435f2f 100644
--- a/dev-python/carbon/carbon-0.9.14-r1.ebuild
+++ b/dev-python/carbon/carbon-1.1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )  # 3.7 dropped due to dep-hell
 
 inherit distutils-r1
 
@@ -17,20 +17,18 @@ KEYWORDS="~amd64 ~x86 ~x64-solaris"
 
 # whisper appears to have been missed from listing in install_requires in setup.py
 RDEPEND="
-	dev-python/twisted-core[${PYTHON_USEDEP}]
-	dev-python/whisper[${PYTHON_USEDEP}]
-	dev-python/txAMQP[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	# Do not install the configuration and data files. We install them
-	# somewhere sensible by hand. Patch for this vn. 0.9.14 has been extended
-	# due to redhat's init scripts set to install unconditionally in setup.py
-	"${FILESDIR}"/${P}-no-data-files.patch
-	)
+	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() {
-	# This sets prefix to /opt/graphite. We want FHS-style paths instead.
-	rm setup.cfg || 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
 }
 
@@ -40,7 +38,7 @@ python_install_all() {
 	insinto /etc/carbon
 	doins conf/*
 
-	dodir /var/log/carbon /var/lib/carbon/{whisper,lists,rrd}
+	keepdir /var/log/carbon /var/lib/carbon/{whisper,lists,rrd}
 
 	newinitd "${FILESDIR}"/carbon.initd2 carbon-cache
 	newinitd "${FILESDIR}"/carbon.initd2 carbon-relay