gentoo Easter resync : 12.04.2020

5 files changed, 2 insertions, 83 deletions

diff --git a/dev-python/prometheus_client/Manifest b/dev-python/prometheus_client/Manifest
index cc0e19022acf..463f4284779e 100644
--- a/dev-python/prometheus_client/Manifest
+++ b/dev-python/prometheus_client/Manifest
@@ -1,7 +1,3 @@
-DIST prometheus_client-0.6.0.tar.gz 60790 BLAKE2B fa8eaddfedb9598394fec0c6464499ed5bcace9969e843126422414e397d31985a44a626be0257a235f6d5f685fd8d6bb55fc0d92928f0b9729ab9f097f1958b SHA512 a2b92683f939961c567c266a54699de6f37088cd4e61c9d9a5f4451228b4c3bfa4c517e4a5187867f5463d726a8dc6e7fdae30973c1e9aa9aa1a03247b2e99cd
 DIST prometheus_client-0.7.1.tar.gz 62880 BLAKE2B 8878a6e6a20f96443f1f14ffbb74eda7dc6f1f48151901da047ade6342ddd7858b4dcd808d80af64a3eff449c1c7425f9eb9f3d1283b65e8e6067c6b5fe2f9c4 SHA512 84b145ed191c9903d390b152c72de4f2afcb4c500b8debba59ded081f00cc76109b336ed2d7783d59e9922ea2927632f7ef730f336974294b20048c51e9d58a4
-EBUILD prometheus_client-0.6.0-r1.ebuild 592 BLAKE2B f10253f880091ff5b46763fae431678e60e2e88543fa5332aca40799988bdbb4a93538cfd0614b89f512cd85bd61876c331a24a61599043da825b109ce40dfd9 SHA512 3a72c1c58a07598d8e0aa66074f14df082238c51a2c8d67b0000794928c491ce3e1cfe88612581c258682a1da9e19f5b9e9831dfe73dc3c5e18e0fc22c6da560
-EBUILD prometheus_client-0.6.0.ebuild 743 BLAKE2B 2abb84ac0a30254e93e976408a5d71740c6ba9f15abf06cb205bb896922495074e1ecea313fde3559202b1dd80eb9856be12f0dd0bed457a550da6fc5dcefd67 SHA512 55d1292a40621fd9c38d5f716c21934c77c54b8816a7ed9771c8a940b349c55619bfd3741502e79c668a97551ab6dc822f4b5389b66106eb9cc5ee1422b22cfb
-EBUILD prometheus_client-0.7.1-r1.ebuild 592 BLAKE2B f10253f880091ff5b46763fae431678e60e2e88543fa5332aca40799988bdbb4a93538cfd0614b89f512cd85bd61876c331a24a61599043da825b109ce40dfd9 SHA512 3a72c1c58a07598d8e0aa66074f14df082238c51a2c8d67b0000794928c491ce3e1cfe88612581c258682a1da9e19f5b9e9831dfe73dc3c5e18e0fc22c6da560
-EBUILD prometheus_client-0.7.1.ebuild 748 BLAKE2B d4bee3300b69527363cd0e1c3e8d9b9a5af8e3b2d55fa785123e8cc04efac09968fdab2ee7d5d3f6fc5daac75dd573f5d3a22e7325ad97e72e2e9e365c771013 SHA512 67fa4377ff4ca128010b517cd36a57003ce7b3f5e9ef395fa11d24e80b65944f8ee3926a7bdfdccd3019d08ae7b20ad3a05031d48ba629cc4bed2aa80022527b
+EBUILD prometheus_client-0.7.1-r1.ebuild 591 BLAKE2B 1d401370aecba4fbe25b110d9683db237969a9e522153bc3c4bf22b5302f1db274677cbaec1b6f3ab8d62b52e06e2de792342bec13f30e280f20dab2d64a9dda SHA512 1f81e4a27a8b523a914b170732bc953c397d4f9daab23ab895a699af3d9c3389613159a86bfb0234b78476d003771f8d046743912a9b657823a7e528c09f7f36
 MISC metadata.xml 339 BLAKE2B 19175465b43ef0c7b56a6241f5e857392bbffcdd12de70833ca0c7c0fb2815dfdf529553721cab2afda053a63caad1621c06508dd1f776511adf5be84cfd010a SHA512 887ce6ef1c7181d5c87e69085c6d58c324260aa7dede8259115131b367b2d60219537fe8b3366ce10ec8904c15fb36626e34e28e6dde2db120c8e20f80fc9d74
diff --git a/dev-python/prometheus_client/prometheus_client-0.6.0-r1.ebuild b/dev-python/prometheus_client/prometheus_client-0.6.0-r1.ebuild
deleted file mode 100644
index 55559cf445e0..000000000000
--- a/dev-python/prometheus_client/prometheus_client-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-inherit distutils-r1
-
-DESCRIPTION="Python client for the Prometheus monitoring system"
-HOMEPAGE="https://pypi.org/project/prometheus_client/
-	https://github.com/prometheus/client_python"
-SRC_URI="https://github.com/prometheus/client_python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/client_python-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/twisted[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prometheus_client/prometheus_client-0.6.0.ebuild b/dev-python/prometheus_client/prometheus_client-0.6.0.ebuild
deleted file mode 100644
index 011f982f00f3..000000000000
--- a/dev-python/prometheus_client/prometheus_client-0.6.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-inherit distutils-r1
-
-DESCRIPTION="Python client for the Prometheus monitoring system"
-HOMEPAGE="https://pypi.org/project/prometheus_client/"
-SRC_URI="https://github.com/prometheus/client_python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/client_python-${PV}
-
-RDEPEND="|| ( dev-python/twisted[${PYTHON_USEDEP}] dev-python/twisted-web[${PYTHON_USEDEP}] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	pytest -v || die
-}
diff --git a/dev-python/prometheus_client/prometheus_client-0.7.1-r1.ebuild b/dev-python/prometheus_client/prometheus_client-0.7.1-r1.ebuild
index 55559cf445e0..1462bdee06bd 100644
--- a/dev-python/prometheus_client/prometheus_client-0.7.1-r1.ebuild
+++ b/dev-python/prometheus_client/prometheus_client-0.7.1-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/client_python-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="dev-python/twisted[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/prometheus_client/prometheus_client-0.7.1.ebuild b/dev-python/prometheus_client/prometheus_client-0.7.1.ebuild
deleted file mode 100644
index acdeb3934576..000000000000
--- a/dev-python/prometheus_client/prometheus_client-0.7.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-inherit distutils-r1
-
-DESCRIPTION="Python client for the Prometheus monitoring system"
-HOMEPAGE="https://pypi.org/project/prometheus_client/"
-SRC_URI="https://github.com/prometheus/client_python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/client_python-${PV}
-
-RDEPEND="|| ( dev-python/twisted[${PYTHON_USEDEP}] dev-python/twisted-web[${PYTHON_USEDEP}] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	pytest -v || die
-}