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 8943B138334 for ; Sun, 8 Dec 2019 10:31:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3540BE0874; Sun, 8 Dec 2019 10:31:55 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 6E7C5E0874 for ; Sun, 8 Dec 2019 10:31:54 +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 3137F34D862 for ; Sun, 8 Dec 2019 10:31:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 877978A7 for ; Sun, 8 Dec 2019 10:31:51 +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: <1575801097.545b62b32ebcf72c3163f4e6e9201867a0a47e87.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.20170311.ebuild 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: 545b62b32ebcf72c3163f4e6e9201867a0a47e87 X-VCS-Branch: master Date: Sun, 8 Dec 2019 10:31:51 +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: 26c8bc73-88ad-47f8-b734-78c68d260e69 X-Archives-Hash: e13b7df533693c4cf791d8f81a23a30c commit: 545b62b32ebcf72c3163f4e6e9201867a0a47e87 Author: Fabian Groffen gentoo org> AuthorDate: Sun Dec 8 10:27:16 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun Dec 8 10:31:37 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=545b62b3 app-admin/diamond-4.0.515.20170311: bump to python3 branch Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Fabian Groffen gentoo.org> app-admin/diamond/Manifest | 2 +- ...0315.ebuild => diamond-4.0.515.20170311.ebuild} | 17 ++++- app-admin/diamond/diamond-9999.ebuild | 72 ---------------------- 3 files changed, 17 insertions(+), 74 deletions(-) diff --git a/app-admin/diamond/Manifest b/app-admin/diamond/Manifest index d73e7280e28..19cd08fe4fa 100644 --- a/app-admin/diamond/Manifest +++ b/app-admin/diamond/Manifest @@ -1,3 +1,3 @@ -DIST python-diamond-4.0.515.20180315.tar.gz 673084 BLAKE2B a1903368fc1b540028038a401cf68c772fd04d5d19dc7e3773c9909c1b4ccb5eeba6e184fd46da83e9c0234675e51331a4097a810191ac1a18242cbf96b0456c SHA512 8497362659fa43e4c72bd28d03ff9d8b3ccaab3901cb5e0e1e252340b70a6ab0972db37863daad0d7dd8e92c83a82f9ec151af07ca5fdafee0d214a7061b5f9f +DIST python-diamond-4.0.515.20170311.tar.gz 671963 BLAKE2B 9449f2d27b48c0e24727eb2c415a5095b20199d9315ef69df92a4aa6f8f3397743f3dc6cf2d8d91f79eca309926731b6b42da170a02987a20aeccd1e0980f4ac SHA512 d18a80540018975455b839a78fd55d13d167726b92914e3dc2de1c6f27f47319962361e05961c55047ba185e11ebf57831f3ab5cff9158a50d30a2ca635d53bd 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-4.0.515.20180315.ebuild b/app-admin/diamond/diamond-4.0.515.20170311.ebuild similarity index 83% rename from app-admin/diamond/diamond-4.0.515.20180315.ebuild rename to app-admin/diamond/diamond-4.0.515.20170311.ebuild index 8882dd7f46c..a05de260f80 100644 --- a/app-admin/diamond/diamond-4.0.515.20180315.ebuild +++ b/app-admin/diamond/diamond-4.0.515.20170311.ebuild @@ -8,7 +8,7 @@ if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="https://github.com/python-diamond/Diamond.git" S=${WORKDIR}/diamond-${PV} else - GHASH=0f3eb04327d6d3ed5e53a9967d6c9d2c09714a47 + GHASH=73207d04e0739a4ce92bc201b36681c42d9fa7e7 # python3 branch 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} @@ -44,6 +44,7 @@ src_prepare() { # fix the version (not set in GitHub archive) sed -i -e "s/__VERSIONTOKENHERE__/${PV}/" src/diamond/version.py.tmpl || die + echo "${PV}" > version.txt || die # fix psutil usage sed -i -e 's/psutil\.network_io_counters/psutil.net_io_counters/' \ src/collectors/network/network.py || die @@ -55,6 +56,20 @@ src_prepare() { # fix, let me know rm src/diamond/handler/rrdtool.py || die + # forgotten conversion + sed -i \ + -e 's/import Queue/import queue/' \ + -e 's/Queue\.Full/queue.Full/' \ + src/diamond/handler/queue.py || die + # fix usage of map as list + sed -i \ + -e '/paths = map(str.strip, paths)/d' \ + src/diamond/utils/classes.py || die + # send data as bytes + sed -i \ + -e '/self.socket.sendall/s/data/str.encode(data)/' \ + src/diamond/handler/graphite.py || die + distutils-r1_src_prepare } diff --git a/app-admin/diamond/diamond-9999.ebuild b/app-admin/diamond/diamond-9999.ebuild deleted file mode 100644 index 73f30e45464..00000000000 --- a/app-admin/diamond/diamond-9999.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -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} -fi - -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 prefix - -DESCRIPTION="Python daemon that collects and publishes system metrics" -HOMEPAGE="https://github.com/python-diamond/Diamond" - -LICENSE="MIT" -SLOT="0" -IUSE="test mongo mysql snmp redis" - -RDEPEND="dev-python/configobj - dev-python/setproctitle - mongo? ( dev-python/pymongo ) - mysql? ( dev-python/mysql-python ) - snmp? ( dev-python/pysnmp ) - redis? ( dev-python/redis-py ) - !kernel_linux? ( >=dev-python/psutil-3 )" -DEPEND="${RDEPEND} - test? ( - dev-python/mock - dev-python/pysnmp - )" - -src_prepare() { - # adjust for Prefix - hprefixify bin/diamond* - - distutils-r1_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}" -} - -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 \ - -e '/pid_file =/s:/var/run:/run:' \ - "${ED}"/etc/diamond/diamond.conf.example || die - hprefixify "${ED}"/etc/diamond/diamond.conf.example -} - -src_install() { - distutils-r1_src_install - newinitd "${FILESDIR}"/${PN}.initd ${PN} - newconfd "${FILESDIR}"/${PN}.confd ${PN} - keepdir /var/log/diamond -}