Pull in fixes for psutil-3 usage, useful on non-Linux only

Package-Manager: portage-2.2.20-prefix/cvs/SunOS i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

5 files changed, 69 insertions, 12 deletions

diff --git a/app-admin/diamond/ChangeLog b/app-admin/diamond/ChangeLog
index 147e8ec317b4..304e1cb470d5 100644
--- a/app-admin/diamond/ChangeLog
+++ b/app-admin/diamond/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/diamond
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/diamond/ChangeLog,v 1.9 2015/07/29 19:18:33 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/diamond/ChangeLog,v 1.10 2015/08/03 17:59:54 grobian Exp $
+
+  03 Aug 2015; Fabian Groffen <grobian@gentoo.org>
+  +files/diamond-4.0-psutil.patch, diamond-4.0-r1.ebuild, diamond-9999.ebuild:
+  Pull in fixes for psutil-3 usage, useful on non-Linux only
 
   29 Jul 2015; Fabian Groffen <grobian@gentoo.org> diamond-4.0-r1.ebuild,
   diamond-9999.ebuild:
diff --git a/app-admin/diamond/Manifest b/app-admin/diamond/Manifest
index 85f1754fec94..7a75a837abef 100644
--- a/app-admin/diamond/Manifest
+++ b/app-admin/diamond/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX diamond-4.0-psutil.patch 1842 SHA256 8654e35bfffdc84dbde798bf283ffd6fffc626fd8b12ae98848dae08d7bdf241 SHA512 4f59e7811df1419dcf29d231f62844de6db9e5a3f6e7600b11432d1bda994b62973172cce98d257d6ce03e940645df76dee2c3cd4fced18e960527bb23b1f1ea WHIRLPOOL 2fbee860112dc44a77999bfc1df24d5464b4c515461d3879271aaf25453bfaa070b8d32c1b8a6dac1c089f55cf17d495711e4c31f65debc613d0b642fe0e00f8
 AUX diamond.confd 57 SHA256 41941d406f48b5eca55d9146928eee185820fe27a3708d3fcaa71c3f78bf4adc SHA512 51b037902394b22f957a15ad1479ebdae5ac29384f2b7a5053ea8200bad05dc9c9060cc5c6c1a931e341e99b95327e55b06aaa9a828950533265f9c96a8dff55 WHIRLPOOL 80165d5cf5347dd3abeeec53f4df64d51f7f78445363574b2bc1b8f2fec9f1a0798c4986319dabe6d6a4b6b499c577fc8679b2fc65554107e48e3e13dac4e68b
 AUX diamond.initd 568 SHA256 99184d76c9967c1edfe12b555e7759ca8b6106d7890359e5c1e0a1c3e7016777 SHA512 e7edb84928460bcfe4ab26218b1e367c05fac08f7c0dd13ef1ff33fc627b3684b0a1d0768601968c20fd43edbea8df8917a6aede76902bd3e6e71d23f8980ca1 WHIRLPOOL 7cc69ae79165dd91943a50c1bd56ebd0e07bb71212a35488e71e91041c577991e60c9c65d145894e49914897ab6e10ee9684d418d089f73bd42ae284b45f5dfc
 DIST python-diamond-4.0.tar.gz 491433 SHA256 e84dd3c87b230d524306a07c3fc7c1db1d9796e3748025e8345a4fa18b162256 SHA512 c4a6e63bdc55f9e0ac2fbf3b644be91662635c08ecc864dfaaebf2fe62fb45609c099da63efd93ed498d2dc9e95bbcb64be09f715e21d59b30bce958a96dc56b WHIRLPOOL 2b1f6124001183058cf282d6e9c51bba0878f26308731266f2c31c549bb42db945c579b49b5a34666e0c05ccbda0163135662a11e59a482f8ef031c49c6005ba
-EBUILD diamond-4.0-r1.ebuild 2044 SHA256 c54e61949578683706bfabb87038bcee815ebcfe4d3bef89255e4016e6ea6e5d SHA512 848e0a528647583058fc2868993283ab70698f474dd8fe48ea580b2db1331c346484c6bd2f50fe5869d107664c9174dd42f18b90bfb26fb688cbe9190205397b WHIRLPOOL c56330f1f94a00f46ecbc67afaf60e2ad2ce116d511ec90d578d7bbb51f5a858c134546c3275d786541f425e2f5a666678716d1ae8b8945877ed6f7a296282b4
-EBUILD diamond-9999.ebuild 1757 SHA256 e4ad52eb7f711f02c106ed7c9fe160369e9437c6b7cc81b4fc02c7278363f833 SHA512 b789727fa044590577c37b92207f7a5ecd2ffb1a6a183711103d9149731639a5fa8103498cb9c069a39205e8d9c0119ccda0d1bda4188a9683bcf640385fc52f WHIRLPOOL 21e7c637fca0353ee52b5194a1939107d952c4c8d727559d02b5a92dc173066ac7cecd7f64bdbea1225ccb032553c3a268d55b1ca1ef89a83f2e6574b6d42454
-MISC ChangeLog 1476 SHA256 41fad7c1426d9467a766d7f33098f7ce12c5c42cace014308c3ac019a3e54732 SHA512 2b2b505f4c2d3d78391b7c4ed9d243e9b9ffb3f18179bf93684a9e1b25f7417c02d4cbb59989b2f80d01326a25e4900c8e80332f685ef09423e4deac323f7d53 WHIRLPOOL 97b28aac928f1dd43952273c9b9085aea27bf66cfe3546a2b5a8aa59b9974c384c3f4ac5d95d88f582571882bea315ed633b3917f603a3239fe23663c4e694d3
+EBUILD diamond-4.0-r1.ebuild 2134 SHA256 4541b2610295b09df735f36f8647f0a10742f4fe2aacdb6adaabb43f2b3093f6 SHA512 9a9677e09e1f5e9f7f81915a79a13ab632da82812799a7d236bae1e711d29dd179f3e300ccaf7dc02c2fc2be22dc814fe5e287f6be075525f33d647cb2eefacd WHIRLPOOL 57d9a78cbf1a2bbccd783f9c3275160b823895f5c8b82bf34f60370244f416535c423e51df12e2944f0eac344f46c6a8dc38b0a89a8f49f2abfa72b72ca07c36
+EBUILD diamond-9999.ebuild 1799 SHA256 8574ecb851ddabd81c4cdd7218b65ab4b50c6073d4cbe2e458559095464c4e1f SHA512 be5e298930213f634829e22dc442cf4f9cae7402152665a46a308b1434c8bfe4863968b0cbeb14612070308dc794c327521ae99e177189ea3a68987da02878bf WHIRLPOOL 995107e7772e45abd63e6b01749bae0868dcfcb21015576193c58ea90f15f67d43793c26454ce645dcc0d8b9fb44473e9d59921efff1f111d0a305789a60d8d2
+MISC ChangeLog 1669 SHA256 c3c0f1c7e902586b2beb10dc5cc61c430b08249babe64a8737d198f48b24ad98 SHA512 fcbf84aeb38c15657663bebf3f5a07175d477e54a450fee3316bb6fecb8bbb1faa421c81aa2831d43a5751a9463fce7a4530501ccb1da755f8eaa639bd3f6386 WHIRLPOOL ebbb5b4294a45c170862c70a98e043f47b14a2d464ef0740396005387528aeb463e68904c34454fd76b761c1dc033c5fd3f2a51c2c11388fbd61ff122199c4d6
 MISC metadata.xml 805 SHA256 18d0feacc721859705a45aed6c5598502eb855c58190869d597d968d78d4b01f SHA512 338ff1721ce92287069d31c573b2f472ae40af4823dadab610a5e82c4c834b948066c8b2b8049d6215917246f7b79c9d8e43629a497a83f31872d4d938f5f983 WHIRLPOOL 2d91a9f082073792d6486f515a0ce6752f8573a6a3cd1cd138f8b129c6be52c0a15b641934305e2ce2eed91bf64734803a3337e90b24697f694a8beece0e7c5a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlW5JwoACgkQX3X2B8XHTolBTQCdG6Q5wvMa97j8dsuw4s+4J1u6
-uogAnAtQWjteh/ASw7LatNh+IGOW01fg
-=/J25
+iEYEAREIAAYFAlW/rBwACgkQX3X2B8XHTomM5gCeLDKlL1Vv5cOY3dyjbu/e56XW
+hFYAniutmYGK/9aQmic7bwta3CfhI+gD
+=nEyi
 -----END PGP SIGNATURE-----
diff --git a/app-admin/diamond/diamond-4.0-r1.ebuild b/app-admin/diamond/diamond-4.0-r1.ebuild
index 436b9fa24723..3365c1f02e8a 100644
--- a/app-admin/diamond/diamond-4.0-r1.ebuild
+++ b/app-admin/diamond/diamond-4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/diamond/diamond-4.0-r1.ebuild,v 1.3 2015/07/29 19:18:33 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/diamond/diamond-4.0-r1.ebuild,v 1.4 2015/08/03 17:59:54 grobian Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ fi
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit distutils-r1
+inherit distutils-r1 eutils
 
 DESCRIPTION="Python daemon that collects and publishes system metrics"
 HOMEPAGE="https://github.com/python-diamond/Diamond"
@@ -30,7 +30,8 @@ RDEPEND="dev-python/configobj
 	mongo? ( dev-python/pymongo )
 	mysql? ( dev-python/mysql-python )
 	snmp? ( dev-python/pysnmp )
-	redis? ( dev-python/redis-py )"
+	redis? ( dev-python/redis-py )
+	!kernel_linux? ( >=dev-python/psutil-3 )"
 DEPEND="${RDEPEND}
 	test? ( dev-python/mock )"
 
@@ -49,6 +50,8 @@ src_prepare() {
 		src/diamond/utils/classes.py \
 		|| die
 
+	epatch "${FILESDIR}"/${P}-psutil.patch
+
 	distutils-r1_src_prepare
 }
 
diff --git a/app-admin/diamond/diamond-9999.ebuild b/app-admin/diamond/diamond-9999.ebuild
index 59d4341759e3..cabebce0657d 100644
--- a/app-admin/diamond/diamond-9999.ebuild
+++ b/app-admin/diamond/diamond-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/diamond/diamond-9999.ebuild,v 1.5 2015/07/29 19:18:33 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/diamond/diamond-9999.ebuild,v 1.6 2015/08/03 17:59:54 grobian Exp $
 
 EAPI=5
 
@@ -30,7 +30,8 @@ RDEPEND="dev-python/configobj
 	mongo? ( dev-python/pymongo )
 	mysql? ( dev-python/mysql-python )
 	snmp? ( dev-python/pysnmp )
-	redis? ( dev-python/redis-py )"
+	redis? ( dev-python/redis-py )
+	!kernel_linux? ( >=dev-python/psutil-3 )"
 DEPEND="${RDEPEND}
 	test? ( dev-python/mock )"
 
diff --git a/app-admin/diamond/files/diamond-4.0-psutil.patch b/app-admin/diamond/files/diamond-4.0-psutil.patch
new file mode 100644
index 000000000000..e5f5d3bfb392
--- /dev/null
+++ b/app-admin/diamond/files/diamond-4.0-psutil.patch
@@ -0,0 +1,48 @@
+From 21ca284ffe6901b06e1136ce57dc07e0effd2a3e Mon Sep 17 00:00:00 2001
+From: Fabian Groffen <grobian@gentoo.org>
+Date: Mon, 3 Aug 2015 19:40:59 +0200
+Subject: [PATCH 1/2] NetworkCollector: psutil.network_io_counters was renamed
+
+---
+ src/collectors/network/network.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/collectors/network/network.py b/src/collectors/network/network.py
+index d835162..90c2f59 100644
+--- a/src/collectors/network/network.py
++++ b/src/collectors/network/network.py
+@@ -96,7 +96,7 @@ def collect(self):
+                 self.log.error('No network metrics retrieved')
+                 return None
+ 
+-            network_stats = psutil.network_io_counters(True)
++            network_stats = psutil.net_io_counters(True)
+             for device in network_stats.keys():
+                 network_stat = network_stats[device]
+                 results[device] = {}
+
+From 314d6057ca95bae6d3e6369556522574eb905c3f Mon Sep 17 00:00:00 2001
+From: Fabian Groffen <grobian@gentoo.org>
+Date: Mon, 3 Aug 2015 19:41:20 +0200
+Subject: [PATCH 2/2] MemoryCollector: psutil renamed phymem_usage and
+ virtmem_usage
+
+---
+ src/collectors/memory/memory.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/collectors/memory/memory.py b/src/collectors/memory/memory.py
+index 7c9b1fb..9057115 100644
+--- a/src/collectors/memory/memory.py
++++ b/src/collectors/memory/memory.py
+@@ -103,8 +103,8 @@ def collect(self):
+                 self.log.error('No memory metrics retrieved')
+                 return None
+ 
+-            phymem_usage = psutil.phymem_usage()
+-            virtmem_usage = psutil.virtmem_usage()
++            phymem_usage = psutil.virtual_memory()
++            virtmem_usage = psutil.swap_memory()
+             units = 'B'
+ 
+             for unit in self.config['byte_unit']: