gentoo resync : 10.02.2020

4 files changed, 3 insertions, 163 deletions

diff --git a/app-admin/diamond/Manifest b/app-admin/diamond/Manifest
index f2eda2257887..e9644d84fb19 100644
--- a/app-admin/diamond/Manifest
+++ b/app-admin/diamond/Manifest
@@ -2,9 +2,5 @@ AUX diamond-4.0-psutil.patch 1842 BLAKE2B 21774c34c5557c84b5ae217acfe468b7d55a4e
 AUX diamond.confd 57 BLAKE2B 8a5e3f478d3eb948e262239a9a83026e067ed67f2a4878075c8ddb7d8d356a2482da0642e673b8b3f658de6c6f30a30c830bc68af3fe2d750b998dc896525942 SHA512 51b037902394b22f957a15ad1479ebdae5ac29384f2b7a5053ea8200bad05dc9c9060cc5c6c1a931e341e99b95327e55b06aaa9a828950533265f9c96a8dff55
 AUX diamond.initd 447 BLAKE2B 76354f66282325005f193d4ad51f3deb0358604a681cfe54a596037608bd794c3fd68a78a03659295ce2021b70809edc01340f5ee39348e35275cae0b00a5042 SHA512 004b305ba945fa313da4cd51226050cec955886405026baacb15f7ab586b7ba650492b0e2cd9621b3854ec83ee6192a7b86ad4fd8239008df3c6c8bb5c8c84f3
 DIST python-diamond-4.0.515.20170311.tar.gz 671963 BLAKE2B 9449f2d27b48c0e24727eb2c415a5095b20199d9315ef69df92a4aa6f8f3397743f3dc6cf2d8d91f79eca309926731b6b42da170a02987a20aeccd1e0980f4ac SHA512 d18a80540018975455b839a78fd55d13d167726b92914e3dc2de1c6f27f47319962361e05961c55047ba185e11ebf57831f3ab5cff9158a50d30a2ca635d53bd
-DIST python-diamond-4.0.515.tar.gz 620337 BLAKE2B 8df675f7e91086dc6e98166c3f6c25c7837bd53f720cd0dfdf05a1dd2954aaa190bfe8844d01acfcdf46d5be917c29c0e231f2b433a648d6dcc1f34e2c617d91 SHA512 8516e46f4f75400a55ca0127789344a897fc7cd6c10f0f8379d30db58de5a09ae676e340371cdf1a0c9ca894fd355699a1a0f430bfad148e32157d5eb97aaef5
-DIST python-diamond-4.0.tar.gz 491433 BLAKE2B ddf678b758b046b80fe347c2cd8ce2fec46f03e65415735d88969d66dc05466730e52df9e8efc27e3a3bff13862c4efcc393de6d05ec6d350e3912a706d298cb SHA512 c4a6e63bdc55f9e0ac2fbf3b644be91662635c08ecc864dfaaebf2fe62fb45609c099da63efd93ed498d2dc9e95bbcb64be09f715e21d59b30bce958a96dc56b
-EBUILD diamond-4.0-r1.ebuild 2034 BLAKE2B 4fe7f0b57cff859c7fb7a4a5bc33c0a136600baa192d580b46956552c2a53bf6b422a092a8ca0eb1fa88cfa7383e0f8fb8544e5997357d9b07168377dbd2de60 SHA512 d5475a2669aeaed077fdfc1c54195c7fc9640f0ec119c0fe02c13fa6dada9f46b4eacffb22102be1d52b3e493ef642ecbb16467953348d3014f1030edb7af462
-EBUILD diamond-4.0.515.20170311.ebuild 2932 BLAKE2B 728ed2e1d8f175c7369fbbe339d281f16ecf564322d06be916e81328637a1f3d96c51f2ba9f5df5931b6bddb4002c3d68c0d4df06bd8b58acca5aada92cab4bc SHA512 3b23a1e830f0f754713d791546746f11e92c463291182695a61ceb4242c59cce9aaefa2326008eb6c08793298e7fb39cbde56e67057c2b972577e7dc991d26e6
-EBUILD diamond-4.0.515.ebuild 2282 BLAKE2B 069e906711a12b0d98ce0ee05cceb8a860476e2ea8b9c63e79eb9c5051193352558c2ce962ee32e4ce1a6a67c719b330ec8374ac18fb3ab51873d4364d03275f SHA512 e0d101201e87a69dad691f1ce92777381ceb036dab594276f30c78e56348d91b9ae33aaa7d701d1b7506cf14b68392c73567f62e88ecf00f4711ed26b2871147
+EBUILD diamond-4.0.515.20170311.ebuild 2930 BLAKE2B 3a8275290d4e029ea67321ccbab6f2aa1473284d842cfe1502958eef2fbce828416140dc9ea00737ebf11b36c57e24af2732932c45484a29c382e3deccdf8ea9 SHA512 b7fa0bacb2951377905f84cc8cfa394e80e9a6ef6ca7b5f67d07c2d0d0f00274cce3b086d9328ec92334e84c06ebb0f114e05cac8d8dae63ee2ce7a549d59cab
 MISC metadata.xml 802 BLAKE2B d013e1b87c2f1d5f0f628766ed754a4ac50e9c9e710b7b2542081cd06988f7f577513a53165c54ff4d1d1de3bba92ec2089eaa15d16cbe946f7489d0345aeaaa SHA512 c455baa068661000d395e15f6952b3106cb3633f1a95395745c6a0d7cc5dbfb193d018af1341f27b250226bdc109e961bda4a612115d5805958f8e500108239a
diff --git a/app-admin/diamond/diamond-4.0-r1.ebuild b/app-admin/diamond/diamond-4.0-r1.ebuild
deleted file mode 100644
index f45a47bf45ba..000000000000
--- a/app-admin/diamond/diamond-4.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} = 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/python-diamond/Diamond.git"
-	S=${WORKDIR}/diamond-${PV}
-else
-	SRC_URI="https://github.com/python-diamond/Diamond/archive/v${PV}.tar.gz -> python-diamond-${PV}.tar.gz"
-	KEYWORDS="amd64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	S=${WORKDIR}/Diamond-${PV}
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils prefix
-
-DESCRIPTION="Python daemon that collects and publishes system metrics"
-HOMEPAGE="https://github.com/python-diamond/Diamond"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test mongo mysql snmp redis"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/configobj
-	dev-python/setproctitle
-	mongo? ( dev-python/pymongo )
-	mysql? ( dev-python/mysql-python )
-	snmp? ( dev-python/pysnmp )
-	redis? ( dev-python/redis-py )
-	!kernel_linux? ( >=dev-python/psutil-3 )"
-DEPEND="${RDEPEND}
-	test? ( dev-python/mock )"
-
-src_prepare() {
-	# adjust for Prefix
-	hprefixify bin/diamond*
-
-	# fix necessary to make handlers honour their config, simple sed
-	# doing the same as upstream
-	# https://github.com/python-diamond/Diamond/commit/3cb29eedd117d2e4146823a5c5811d16cc77206a.patch
-	sed -i \
-		-e '/cls_name =/s/\.__class__//' \
-		src/diamond/utils/classes.py \
-		|| die
-
-	epatch "${FILESDIR}"/${P}-psutil.patch
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${PYTHON}" ./test.py || die "Tests fail with ${PYTHON}"
-}
-
-python_install() {
-	export VIRTUAL_ENV=1
-	distutils-r1_python_install
-	mv "${ED}"/usr/etc "${ED}"/ || die
-	rm "${ED}"/etc/diamond/*.windows  # won't need these
-	sed -i \
-		-e '/pid_file =/s:/var/run:/run:' \
-		"${ED}"/etc/diamond/diamond.conf.example || die
-	hprefixify "${ED}"/etc/diamond/diamond.conf.example
-}
-
-src_install() {
-	distutils-r1_src_install
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	keepdir /var/log/diamond
-}
diff --git a/app-admin/diamond/diamond-4.0.515.20170311.ebuild b/app-admin/diamond/diamond-4.0.515.20170311.ebuild
index 347df5bcfc65..6cb19661490f 100644
--- a/app-admin/diamond/diamond-4.0.515.20170311.ebuild
+++ b/app-admin/diamond/diamond-4.0.515.20170311.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	GHASH=73207d04e0739a4ce92bc201b36681c42d9fa7e7  # python3 branch
 	SRC_URI="https://github.com/python-diamond/Diamond/archive/${GHASH}.tar.gz -> python-diamond-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 ~arm x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	S=${WORKDIR}/Diamond-${GHASH}
 fi
 
diff --git a/app-admin/diamond/diamond-4.0.515.ebuild b/app-admin/diamond/diamond-4.0.515.ebuild
deleted file mode 100644
index e7f3668ea8d0..000000000000
--- a/app-admin/diamond/diamond-4.0.515.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} = 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/python-diamond/Diamond.git"
-	S=${WORKDIR}/diamond-${PV}
-else
-	SRC_URI="https://github.com/python-diamond/Diamond/archive/v${PV}.tar.gz -> python-diamond-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	S=${WORKDIR}/Diamond-${PV}
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 prefix
-
-DESCRIPTION="Python daemon that collects and publishes system metrics"
-HOMEPAGE="https://github.com/python-diamond/Diamond"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test mongo mysql snmp redis"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/configobj
-	dev-python/setproctitle
-	mongo? ( dev-python/pymongo )
-	mysql? ( dev-python/mysql-python )
-	snmp? ( dev-python/pysnmp )
-	redis? ( dev-python/redis-py )
-	!kernel_linux? ( >=dev-python/psutil-3 )"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock
-		dev-python/pysnmp
-	)"
-
-src_prepare() {
-	# adjust for Prefix
-	hprefixify bin/diamond*
-
-	# fix the version (not set in GitHub archive)
-	sed -i -e "s/__VERSIONTOKENHERE__/${PV}/" src/diamond/version.py.tmpl || die
-	# fix psutil usage
-	sed -i -e 's/psutil\.network_io_counters/psutil.net_io_counters/' \
-		src/collectors/network/network.py || die
-	# fix symlink out of place
-	rm README.md || die
-	cp docs/index.md README.md || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# don't want to depend on docker for just this
-	mv src/collectors/docker_collector/test/{test,no}docker_collector.py || die
-	# fails on binding ports
-	mv src/collectors/portstat/tests/{test,no}_portstat.py || die
-	"${PYTHON}" ./test.py || die "Tests fail with ${PYTHON}"
-}
-
-python_install() {
-	export VIRTUAL_ENV=1
-	distutils-r1_python_install
-	mv "${ED}"/usr/etc "${ED}"/ || die
-	rm "${ED}"/etc/diamond/*.windows  # won't need these
-	sed -i \
-		-e '/pid_file =/s:/var/run:/run:' \
-		"${ED}"/etc/diamond/diamond.conf.example || die
-	hprefixify "${ED}"/etc/diamond/diamond.conf.example
-}
-
-src_install() {
-	distutils-r1_src_install
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	keepdir /var/log/diamond
-}