commit: 6d9093cbb6766720e223fa80e84d121c65454e7c Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Mon Feb 10 10:01:17 2020 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Mon Feb 10 10:02:36 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d9093cb
app-admin/diamond: remove old Python 2 versions Closes: https://bugs.gentoo.org/708454 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> app-admin/diamond/Manifest | 2 - app-admin/diamond/diamond-4.0-r1.ebuild | 75 ----------------------------- app-admin/diamond/diamond-4.0.515.ebuild | 81 -------------------------------- 3 files changed, 158 deletions(-) diff --git a/app-admin/diamond/Manifest b/app-admin/diamond/Manifest index 19cd08fe4fa..a9335d45de4 100644 --- a/app-admin/diamond/Manifest +++ b/app-admin/diamond/Manifest @@ -1,3 +1 @@ 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-r1.ebuild b/app-admin/diamond/diamond-4.0-r1.ebuild deleted file mode 100644 index f45a47bf45b..00000000000 --- a/app-admin/diamond/diamond-4.0-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -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 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - S=${WORKDIR}/Diamond-${PV} -fi - -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 eutils 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" -RESTRICT="!test? ( test )" - -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 )" - -src_prepare() { - # adjust for Prefix - hprefixify bin/diamond* - - # fix necessary to make handlers honour their config, simple sed - # doing the same as upstream - # https://github.com/python-diamond/Diamond/commit/3cb29eedd117d2e4146823a5c5811d16cc77206a.patch - sed -i \ - -e '/cls_name =/s/\.__class__//' \ - src/diamond/utils/classes.py \ - || die - - epatch "${FILESDIR}"/${P}-psutil.patch - - distutils-r1_src_prepare -} - -python_test() { - "${PYTHON}" ./test.py || die "Tests fail with ${PYTHON}" -} - -python_install() { - export VIRTUAL_ENV=1 - distutils-r1_python_install - 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 -} diff --git a/app-admin/diamond/diamond-4.0.515.ebuild b/app-admin/diamond/diamond-4.0.515.ebuild deleted file mode 100644 index e7f3668ea8d..00000000000 --- a/app-admin/diamond/diamond-4.0.515.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -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 ~arm x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - S=${WORKDIR}/Diamond-${PV} -fi - -PYTHON_COMPAT=( python2_7 ) - -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" -RESTRICT="!test? ( test )" - -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* - - # 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 - - 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 - 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 -}
