gentoo Easter resync : 12.04.2020

4 files changed, 2 insertions, 69 deletions

diff --git a/dev-python/pyformance/Manifest b/dev-python/pyformance/Manifest
index c5e2007a1ffa..05eba16e7297 100644
--- a/dev-python/pyformance/Manifest
+++ b/dev-python/pyformance/Manifest
@@ -1,7 +1,4 @@
-DIST pyformance-0.3.4.tar.gz 19394 BLAKE2B 4bd141df5b3264ae8abb5b5314fcba93aeeab960e4d1d70631a3d5ac072f94a2da48b480f74c446124fb9fbd54a8ffad9c75b2352509aaf991025a02bf736648 SHA512 5dbc83da62bf66767eaaf316824cf5683488d8ee594b72baee327c4ef594f84b5aed07654da483aff29bee98605e5265425be88c165a4bb06e7bdddbbf28e440
 DIST pyformance-0.4-patches.tar.xz 3500 BLAKE2B 511001e9011db5ef25b802739dca51337d039193a9d3322bbf94bcb120bbbeff2e1a818217970a1a97d77cd8d7da462792248910acbb3ef586704596276b7056 SHA512 858cefd6c8b151db10c63e0d8117cd6c226bd153103993040909e8fd2ab7a41a7770a2ae6de0f395a4f9f6cce3213d7ecabc0bf647657ee04fc10d76f51e07e3
 DIST pyformance-0.4.tar.gz 20683 BLAKE2B d818832b7ff43a7e1db888bdb7dc333a532c7d3365dd472f9dbb3300f676cd3cc8f82f8d1c444aa277404ff8e72843eca35e3905542700ea37b1dad3e05c8b4c SHA512 a03324977b40f5097ae4608dd7c36bdbd2a20b261c9d3e32d1be19e5fca50e17fcc24df781b6c3ab60314534368c5e9cf08bc3863d4d2d7ecc59f9af26f8d20e
-EBUILD pyformance-0.3.4.ebuild 900 BLAKE2B a23428ba3bf54af7f9b86d82a70939c81c74ddb8582469dcffdbbc21404b8bcdd98e91e80b035b76434e7640ab60e13b7eb0395c64571130baf97f37457f3486 SHA512 c7493340143d6c92c0b88c3ba64a06f97bf6f2b0bc10de7ee8352cae147d59688f881e0bd8cdd10a9e80e8ae1498bf8f0ef797d42c584f3a742810d11934a274
-EBUILD pyformance-0.4-r1.ebuild 894 BLAKE2B 9edcacc0670ad000dce12e44eb97e5bc8691548d285aca8c6216832bc6b752ce1e25fe3374bbe534dd4640798b54a906e064dd6f5f3bd1eea37f3dca64f84546 SHA512 19ef560ef36bb6aae1b439e1d1650c4f18ab915534d6e5096d7fac722b1ee15651bd26c35514be63096c56ce4d581e97f741277b63574d6ea99a7542dbeb6feb
-EBUILD pyformance-0.4.ebuild 823 BLAKE2B c9004270922f265191e2e15ff1ae0a2b8001a59761cc3b7058eb01ea89684bf89e8de4f2d777dab025cada9f0b9a23b682c8dede039d2312a540bc94784f0059 SHA512 c68a801eb78a867c4be3edbd8655e5e7bcdff8c88d600b37c0b9f56c348d352b681afb949553beac490ad71f05bfa18a7bda334873c27c1670c8f2e43f6f52b0
+EBUILD pyformance-0.4-r1.ebuild 904 BLAKE2B da94cce475068f1b6f452c3c709b8caee0c024cf6019d2bfd7bc880b7a4654b2f93cd4c18d2c6704a4673f88c9115c6ed88be1c1f014d3e2a88b4597c82712aa SHA512 abf7b6a4e4ab7616ec15f8bdf8fccd7763a89f6bccdd9eb13c42914e388c38ae5494c6481732556f622dcc59ea4d260cfbfc07fb34f6502667978cfb2eb04fb6
 MISC metadata.xml 452 BLAKE2B c229f2c744aad33f55a3983a97780b9c0e361e8786a3c9b372f556656c7e1dec34dc30b1f9985747a8f917c8714e867b509143faffacb4242aeb1b61ecce54d1 SHA512 d1fb11333e19747774ae686b9c12f221c9b844be16ee6d2381f38d09d775118c4ffc3379d18217f83d2c0cf518de61a448680e78a1650e289c390d6437702240
diff --git a/dev-python/pyformance/pyformance-0.3.4.ebuild b/dev-python/pyformance/pyformance-0.3.4.ebuild
deleted file mode 100644
index 65e0604698fb..000000000000
--- a/dev-python/pyformance/pyformance-0.3.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Performance metrics, based on Coda Hale's Yammer metrics"
-HOMEPAGE="https://pyformance.readthedocs.org/ https://github.com/omergertel/pyformance/ https://pypi.org/project/pyformance/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}] )"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-python_prepare() {
-	sed -i -e "s/find_packages()/find_packages(exclude=['tests'])/" setup.py || die
-	sed -i -e "s/URLError, err/URLError as err/" ${PN}/reporters/influx.py || die
-}
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/pyformance/pyformance-0.4-r1.ebuild b/dev-python/pyformance/pyformance-0.4-r1.ebuild
index 92b43e1f1e9a..a071e4b9c063 100644
--- a/dev-python/pyformance/pyformance-0.4-r1.ebuild
+++ b/dev-python/pyformance/pyformance-0.4-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_6 python3_8 )
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyformance/pyformance-0.4.ebuild b/dev-python/pyformance/pyformance-0.4.ebuild
deleted file mode 100644
index 0092fe0ab5a3..000000000000
--- a/dev-python/pyformance/pyformance-0.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Performance metrics, based on Coda Hale's Yammer metrics"
-HOMEPAGE="https://pyformance.readthedocs.org/ https://github.com/omergertel/pyformance/ https://pypi.org/project/pyformance/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}] )"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-
-python_prepare() {
-	sed -i -e "s/find_packages()/find_packages(exclude=['tests'])/" setup.py || die
-}
-
-python_test() {
-	py.test || die
-}