From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DF64D138334 for ; Thu, 21 Feb 2019 18:37:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C8BB4E0830; Thu, 21 Feb 2019 18:37:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9D50BE0830 for ; Thu, 21 Feb 2019 18:37:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C7248335C94 for ; Thu, 21 Feb 2019 18:37:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E12AC546 for ; Thu, 21 Feb 2019 18:37:33 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1550774144.8ffd36140a186c7e55768b215ddf58f1d04f8765.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/diamond/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/diamond/diamond-4.0.515.ebuild X-VCS-Directories: app-admin/diamond/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 8ffd36140a186c7e55768b215ddf58f1d04f8765 X-VCS-Branch: master Date: Thu, 21 Feb 2019 18:37:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d54cacda-bfbc-466a-8ccb-4cddb1a66583 X-Archives-Hash: 8ee5143f7785473873e701975b2ae49a commit: 8ffd36140a186c7e55768b215ddf58f1d04f8765 Author: Fabian Groffen gentoo org> AuthorDate: Thu Feb 21 18:35:44 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Feb 21 18:35:44 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ffd3614 app-admin/diamond: fix psutil interaction Signed-off-by: Fabian Groffen gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 app-admin/diamond/diamond-4.0.515.ebuild | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app-admin/diamond/diamond-4.0.515.ebuild b/app-admin/diamond/diamond-4.0.515.ebuild index 6c874d48ed2..4477513e976 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