From 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 3 Mar 2019 13:42:34 +0000 Subject: gentoo resync : 03.03.2019 --- app-admin/diamond/Manifest | 2 +- app-admin/diamond/diamond-4.0.515.ebuild | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'app-admin/diamond') diff --git a/app-admin/diamond/Manifest b/app-admin/diamond/Manifest index 2a0572c7be40..bbe9b31801e7 100644 --- a/app-admin/diamond/Manifest +++ b/app-admin/diamond/Manifest @@ -4,6 +4,6 @@ AUX diamond.initd 447 BLAKE2B 76354f66282325005f193d4ad51f3deb0358604a681cfe54a5 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 2128 BLAKE2B e19b1e5cf4f88e92bcc46c620f5284fbe97d4b2988b498957b7d306a2780255d8ed48e2dd7f794c90df49f9c202fe0cb5a5a5593117df4ff25d8b96b2572e4bd SHA512 a05a1a5a48584a90d2384543d88520f1759cab46923eb028914f68c7b1246440fb8a80c7927ba2cefe4f4945871247124c551b17b68db3101fb1c7c113744152 +EBUILD diamond-4.0.515.ebuild 2257 BLAKE2B ce7c4d128c96d1e9891f031427491c88dd13ad88917510b0538d7b6d9f9109c2285a33f21575b2db488b00ed363516dee734db94e3b43916bddf3b7efaaaf973 SHA512 b7ecc662b9e2f9acf682ad1ec5ee96b66776b1d3dc004740dfe600e2530cbbc8b8893cc3738dfde9c5422a5268995e0174a653deb8ed53862995ba8a4e300540 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 6c874d48ed22..4477513e976e 100644 --- a/app-admin/diamond/diamond-4.0.515.ebuild +++ b/app-admin/diamond/diamond-4.0.515.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -43,6 +43,9 @@ src_prepare() { # 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 -- cgit v1.2.3