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 EA4DD138334 for ; Sat, 7 Dec 2019 14:38:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4AE9AE0858; Sat, 7 Dec 2019 14:38:09 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 05B18E0858 for ; Sat, 7 Dec 2019 14:38:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 0AA0634D870 for ; Sat, 7 Dec 2019 14:38:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8EE6126C for ; Sat, 7 Dec 2019 14:38:06 +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: <1575729481.6b7cf0af64a5bdcd3e98b0e89e4202cd3f35ebdf.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/diamond/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/diamond/Manifest app-admin/diamond/diamond-4.0.515.20180315.ebuild app-admin/diamond/diamond-9999.ebuild X-VCS-Directories: app-admin/diamond/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 6b7cf0af64a5bdcd3e98b0e89e4202cd3f35ebdf X-VCS-Branch: master Date: Sat, 7 Dec 2019 14:38:06 +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: bd9e57b1-4350-4ebd-8dbb-298e6f934977 X-Archives-Hash: 4abf0c2c753228f1bc3a232d9b93389a commit: 6b7cf0af64a5bdcd3e98b0e89e4202cd3f35ebdf Author: Fabian Groffen gentoo org> AuthorDate: Sat Dec 7 14:36:57 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sat Dec 7 14:38:01 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b7cf0af app-admin/diamond-4.0.515.20180315: bump for py3 support Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Fabian Groffen gentoo.org> app-admin/diamond/Manifest | 1 + ...9999.ebuild => diamond-4.0.515.20180315.ebuild} | 27 +++++++++++++++++----- app-admin/diamond/diamond-9999.ebuild | 7 +++--- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/app-admin/diamond/Manifest b/app-admin/diamond/Manifest index 3cfe85f452f..d73e7280e28 100644 --- a/app-admin/diamond/Manifest +++ b/app-admin/diamond/Manifest @@ -1,2 +1,3 @@ +DIST python-diamond-4.0.515.20180315.tar.gz 673084 BLAKE2B a1903368fc1b540028038a401cf68c772fd04d5d19dc7e3773c9909c1b4ccb5eeba6e184fd46da83e9c0234675e51331a4097a810191ac1a18242cbf96b0456c SHA512 8497362659fa43e4c72bd28d03ff9d8b3ccaab3901cb5e0e1e252340b70a6ab0972db37863daad0d7dd8e92c83a82f9ec151af07ca5fdafee0d214a7061b5f9f 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 diff --git a/app-admin/diamond/diamond-9999.ebuild b/app-admin/diamond/diamond-4.0.515.20180315.ebuild similarity index 64% copy from app-admin/diamond/diamond-9999.ebuild copy to app-admin/diamond/diamond-4.0.515.20180315.ebuild index 57df76bc074..8882dd7f46c 100644 --- a/app-admin/diamond/diamond-9999.ebuild +++ b/app-admin/diamond/diamond-4.0.515.20180315.ebuild @@ -1,19 +1,20 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - S=${WORKDIR}/Diamond-${PV} + GHASH=0f3eb04327d6d3ed5e53a9967d6c9d2c09714a47 + 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" + S=${WORKDIR}/Diamond-${GHASH} fi -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python3_6 ) inherit distutils-r1 prefix @@ -41,6 +42,19 @@ 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 + + # this module isn't Python3 yet (lambda), if you use this and have a + # fix, let me know + rm src/diamond/handler/rrdtool.py || die + distutils-r1_src_prepare } @@ -55,6 +69,7 @@ python_test() { python_install() { export VIRTUAL_ENV=1 distutils-r1_python_install + python_optimize mv "${ED}"/usr/etc "${ED}"/ || die rm "${ED}"/etc/diamond/*.windows # won't need these sed -i \ diff --git a/app-admin/diamond/diamond-9999.ebuild b/app-admin/diamond/diamond-9999.ebuild index 57df76bc074..73f30e45464 100644 --- a/app-admin/diamond/diamond-9999.ebuild +++ b/app-admin/diamond/diamond-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 if [[ ${PV} = 9999* ]]; then inherit git-r3 @@ -13,7 +13,7 @@ else S=${WORKDIR}/Diamond-${PV} fi -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python3_6 ) inherit distutils-r1 prefix @@ -55,6 +55,7 @@ python_test() { python_install() { export VIRTUAL_ENV=1 distutils-r1_python_install + python_optimize mv "${ED}"/usr/etc "${ED}"/ || die rm "${ED}"/etc/diamond/*.windows # won't need these sed -i \