gentoo resync : 03.12.2017

3 files changed, 21 insertions, 7 deletions

diff --git a/app-admin/diamond/Manifest b/app-admin/diamond/Manifest
index 3253a06390cd..2a0572c7be40 100644
--- a/app-admin/diamond/Manifest
+++ b/app-admin/diamond/Manifest
@@ -1,9 +1,9 @@
 AUX diamond-4.0-psutil.patch 1842 BLAKE2B 21774c34c5557c84b5ae217acfe468b7d55a4e3b818f501ee72cec43cc01d24e7121f9fe302bdc317d60c39e39e7d4587a5caee4ddc73dcc1e87e1605499be40 SHA512 4f59e7811df1419dcf29d231f62844de6db9e5a3f6e7600b11432d1bda994b62973172cce98d257d6ce03e940645df76dee2c3cd4fced18e960527bb23b1f1ea
 AUX diamond.confd 57 BLAKE2B 8a5e3f478d3eb948e262239a9a83026e067ed67f2a4878075c8ddb7d8d356a2482da0642e673b8b3f658de6c6f30a30c830bc68af3fe2d750b998dc896525942 SHA512 51b037902394b22f957a15ad1479ebdae5ac29384f2b7a5053ea8200bad05dc9c9060cc5c6c1a931e341e99b95327e55b06aaa9a828950533265f9c96a8dff55
 AUX diamond.initd 447 BLAKE2B 76354f66282325005f193d4ad51f3deb0358604a681cfe54a596037608bd794c3fd68a78a03659295ce2021b70809edc01340f5ee39348e35275cae0b00a5042 SHA512 004b305ba945fa313da4cd51226050cec955886405026baacb15f7ab586b7ba650492b0e2cd9621b3854ec83ee6192a7b86ad4fd8239008df3c6c8bb5c8c84f3
-DIST python-diamond-4.0.515.tar.gz 620337 SHA256 3e8a1ff06b18d70a850d10689b3c8e041e91237aa8dee16db824ec368c04949f SHA512 8516e46f4f75400a55ca0127789344a897fc7cd6c10f0f8379d30db58de5a09ae676e340371cdf1a0c9ca894fd355699a1a0f430bfad148e32157d5eb97aaef5 WHIRLPOOL 39fe60e68b28e706a615c9b6068384b2ffac0710d06f26988341e1f032db4558d0018d7d746c7eef12ad0c0e04969decddd839f6cdc7fc1c01aca31c91e2591e
-DIST python-diamond-4.0.tar.gz 491433 SHA256 e84dd3c87b230d524306a07c3fc7c1db1d9796e3748025e8345a4fa18b162256 SHA512 c4a6e63bdc55f9e0ac2fbf3b644be91662635c08ecc864dfaaebf2fe62fb45609c099da63efd93ed498d2dc9e95bbcb64be09f715e21d59b30bce958a96dc56b WHIRLPOOL 2b1f6124001183058cf282d6e9c51bba0878f26308731266f2c31c549bb42db945c579b49b5a34666e0c05ccbda0163135662a11e59a482f8ef031c49c6005ba
+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 2007 BLAKE2B 25abec3a500ca23844dc17a7e987be99be9f2c5692c717269ee171de875850a665626cff0d2c17b990f90293adcd9da99b2e355a42328f8c7bbb22749a54236e SHA512 9385587aed2660c5872baa3a224e7a74be1b49c903b814fdf353a44401c79008e9f325b5b68eefc610b453dc91bee10730d87fca55397f1b94202441a73e6b4a
-EBUILD diamond-4.0.515.ebuild 1891 BLAKE2B dd072a19d3f824522f8bb49768edd664f3485d0559bde274a0a3327dabf8b3f99b9b9698d16379f04bfa0aa6428418c72675cf06a8eb9e792fac99b004b2c6d0 SHA512 344ad91933e15d9d93fd7bd796650f98dc7bfd1a57a38053346251f852b7b6e9fdb56bcd386cf7310c87a56c847724b6dd91a13116fa9010f80f4662008230e2
-EBUILD diamond-9999.ebuild 1663 BLAKE2B 9f43ba072c8129914dde03748b8e2eb041fe0f6dcd42983d09a7f1c6ee6e40a1730c397be401453d2a42b191269d084853f913e93337ab57f95e423a4c4effe7 SHA512 d2b16d9339b1c724eda84377fe78d8abfb1c31f37f5363ae6718662ae4d1d02d7af0edc52247802da8dd449928ad17ef34028933e0d8fa52f7d0310eef3a1c2f
+EBUILD diamond-4.0.515.ebuild 2128 BLAKE2B e19b1e5cf4f88e92bcc46c620f5284fbe97d4b2988b498957b7d306a2780255d8ed48e2dd7f794c90df49f9c202fe0cb5a5a5593117df4ff25d8b96b2572e4bd SHA512 a05a1a5a48584a90d2384543d88520f1759cab46923eb028914f68c7b1246440fb8a80c7927ba2cefe4f4945871247124c551b17b68db3101fb1c7c113744152
+EBUILD diamond-9999.ebuild 1900 BLAKE2B cdd17d24f9817cf9110aa198ca8f11d468deb5b162215fa2b5ecc2c82072f4ebdeb6751ba047b6392b69b9a90c438912dabd627ce54ad088bafb4ccf62fc4a3d SHA512 f595d59ab69d2deb704e6a1ea739540a7760a37c786ba3d0da509029bf367ebd855e131bf187c423443bd107ea5db30489b17053c959955bf242607b3f1dc59e
 MISC metadata.xml 802 BLAKE2B d013e1b87c2f1d5f0f628766ed754a4ac50e9c9e710b7b2542081cd06988f7f577513a53165c54ff4d1d1de3bba92ec2089eaa15d16cbe946f7489d0345aeaaa SHA512 c455baa068661000d395e15f6952b3106cb3633f1a95395745c6a0d7cc5dbfb193d018af1341f27b250226bdc109e961bda4a612115d5805958f8e500108239a
diff --git a/app-admin/diamond/diamond-4.0.515.ebuild b/app-admin/diamond/diamond-4.0.515.ebuild
index a10298e45b41..6c874d48ed22 100644
--- a/app-admin/diamond/diamond-4.0.515.ebuild
+++ b/app-admin/diamond/diamond-4.0.515.ebuild
@@ -32,7 +32,10 @@ RDEPEND="dev-python/configobj
 	redis? ( dev-python/redis-py )
 	!kernel_linux? ( >=dev-python/psutil-3 )"
 DEPEND="${RDEPEND}
-	test? ( dev-python/mock )"
+	test? (
+		dev-python/mock
+		dev-python/pysnmp
+	)"
 
 src_prepare() {
 	# adjust for Prefix
@@ -48,6 +51,10 @@ 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}"
 }
 
diff --git a/app-admin/diamond/diamond-9999.ebuild b/app-admin/diamond/diamond-9999.ebuild
index c37ee683c298..57df76bc0741 100644
--- a/app-admin/diamond/diamond-9999.ebuild
+++ b/app-admin/diamond/diamond-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -32,7 +32,10 @@ RDEPEND="dev-python/configobj
 	redis? ( dev-python/redis-py )
 	!kernel_linux? ( >=dev-python/psutil-3 )"
 DEPEND="${RDEPEND}
-	test? ( dev-python/mock )"
+	test? (
+		dev-python/mock
+		dev-python/pysnmp
+	)"
 
 src_prepare() {
 	# adjust for Prefix
@@ -42,6 +45,10 @@ 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}"
 }