gentoo resync : 20.03.2022

5 files changed, 2 insertions, 98 deletions

diff --git a/dev-python/quantities/Manifest b/dev-python/quantities/Manifest
index 7fb02cc73f6d..803feac400d2 100644
--- a/dev-python/quantities/Manifest
+++ b/dev-python/quantities/Manifest
@@ -1,7 +1,3 @@
-AUX quantities-0.12.5-numpy-1.21.patch 1081 BLAKE2B cad600d3961359dcfe3ae0534510e03300a81d0d7e8911c037abe556ae8d81e2cf813712c042c6663624103af1eb08fca144ff34c8c16680ff0450d8b340f3da SHA512 b0b027a80c121d9f9fe453f3663b46e1ef4f38781a107025a201ae18f6bee9b1d3473fe25eb74a2e79e10097f93cb06f34493cfafb7c2a35bd64704f3fb6a351
-DIST python-quantities-0.12.5.tar.gz 105130 BLAKE2B db1cf09fa2efc249bc722abe34ed71d0f59d85595f70baf44203785c32179a3598be8aac225adadfd7d5f09c44ec077dcef310ee2fe7ce4d49a1533b04cb9de6 SHA512 db81e45d464e65d6b144d05e1b990fccc5c17ab7fdd47c7bb0c0094ebcacd6af52a3692492561af3a694741810ddac03e4c887d7c6effed833f196493da5f156
 DIST python-quantities-0.13.0.tar.gz 107187 BLAKE2B ead5c223892f65c68ced2265356f8c1e5374f80a1507ec561370e56e28e8965217a7b99f5c46cb83a5f6a1b1f12eb9f501844650488871d48794f13a4383df38 SHA512 ec0a61d8df8e48e7ee08cab5c899a8c8ad96b964ee0132ab130f272f062436d91e6370aac9d85453eeb3d95e17e79e8dfb80412397eada1f0a4310c0494fa217
-EBUILD quantities-0.12.5.ebuild 768 BLAKE2B 1d4392e23350526440d3e07289496f8ccc2c4a31feb235c6242904738a9171e3287f89f928658d2f83062560332c02f4205f99f3f075ebf026efc25c556d9c26 SHA512 2944d20b6adceb9303cccb45ad6ef1f3754f0cd03b5af74ed2ebcd1c3ee42346c1e300af039c1dec83fc93ee70d336e5ff8e460a693e26cce1632f0630277d47
-EBUILD quantities-0.13.0-r1.ebuild 634 BLAKE2B 86b05ee2cf2bd112e714b03c9ec5334e72618f7d196616ff7b2d1d03885eaffd43e0f3355f6f1aec31008fcc464621cca00e522ed95d08ce472bfb605d3736d8 SHA512 f52aaba288ca967e164cb2a9cc4fb704959694e82de8f17a0c3ae0d2aa9621850af4a88f79947e726ed2afe70e2045fa57d5f7e2daa52a56a37de3dace345e73
-EBUILD quantities-0.13.0.ebuild 630 BLAKE2B a8f58f7e927d1c29ca5acab53604fa070a03d4441d4c3842440f82047cb163fbb761867086c1a745d722380209207c9a179c909ee940d969c971f48efe9912aa SHA512 d62d10caab82f76021e5038f3038e8297149d009233d6dbeb81aca2ec55915b061e17540ebdefb907a06741844a3f548ca897215d32a68b375a81f6657aebfbd
+EBUILD quantities-0.13.0-r1.ebuild 632 BLAKE2B 6a823c5c7faccc7ac41a2834ab7bc43d5d75902e6d32f21635b9f2e9a2e3c96fa57ac4015e6e426a494033760fc0896530dbba4a37c607fbf12bdb72f926bb2e SHA512 63be71d109e57394cc57f45b84328af5d85bbc23a13dc39fd827dd10075f78cc66f419a5914fc4941996665941df8e4dcb8b85fd656d99ba066189deb28e04a2
 MISC metadata.xml 646 BLAKE2B df1d2cf46f590a90d168f7024d52942531f8b570418aeb9e5ba82882b8b8be86f57a15e3c652246ce08e42ddcaa2813ea594a45ba15e9db9bb80795736e0eff3 SHA512 0ba5443c1554361cf079ae651ffd70b979bb70f6f22049470bccd07537aa967a7e3c1d46b7c580319c4941aae984906a40216c5eb108a9f1aa95fa0680c75248
diff --git a/dev-python/quantities/files/quantities-0.12.5-numpy-1.21.patch b/dev-python/quantities/files/quantities-0.12.5-numpy-1.21.patch
deleted file mode 100644
index 34dd5a075412..000000000000
--- a/dev-python/quantities/files/quantities-0.12.5-numpy-1.21.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From f32e0ce2feeb588eb8b7236700c8c1176e2bc499 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 17 Aug 2021 08:24:07 +0200
-Subject: [PATCH] fix expected np.arctan2() exception for numpy 1.21
-
-NumPy 1.21 has changed the exception type for incorrect np.arctan2()
-arguments from ValueError to TypeError.  Adjust the test appropriately.
-
-Fixes #190
----
- quantities/tests/test_umath.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/quantities/tests/test_umath.py b/quantities/tests/test_umath.py
-index f5aeb78..a7ebb18 100644
---- a/quantities/tests/test_umath.py
-+++ b/quantities/tests/test_umath.py
-@@ -226,7 +226,7 @@ class TestUmath(TestCase):
-             np.arctan2(3*pq.V, 3*pq.V),
-             np.radians(45)*pq.dimensionless
-             )
--        self.assertRaises(ValueError, np.arctan2, (1*pq.m, 1*pq.m))
-+        self.assertRaises((TypeError, ValueError), np.arctan2, (1*pq.m, 1*pq.m))
- 
-     def test_hypot(self):
-         self.assertQuantityEqual(np.hypot(3 * pq.m, 4 * pq.m),  5 * pq.m)
--- 
-2.32.0
-
diff --git a/dev-python/quantities/quantities-0.12.5.ebuild b/dev-python/quantities/quantities-0.12.5.ebuild
deleted file mode 100644
index 2697e7840c36..000000000000
--- a/dev-python/quantities/quantities-0.12.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-MY_P="python-quantities-${PV}"
-DESCRIPTION="Support for physical quantities with units, based on numpy"
-HOMEPAGE="https://github.com/python-quantities/python-quantities"
-SRC_URI="
-	https://github.com/python-quantities/python-quantities/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/numpy[$PYTHON_USEDEP]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-numpy-1.21.patch
-)
-
-EPYTEST_DESELECT=(
-	# unexpected success
-	quantities/tests/test_umath.py::TestUmath::test_fix
-)
diff --git a/dev-python/quantities/quantities-0.13.0-r1.ebuild b/dev-python/quantities/quantities-0.13.0-r1.ebuild
index d0c84615b029..2959af19f0d8 100644
--- a/dev-python/quantities/quantities-0.13.0-r1.ebuild
+++ b/dev-python/quantities/quantities-0.13.0-r1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/numpy-1.16[$PYTHON_USEDEP]
diff --git a/dev-python/quantities/quantities-0.13.0.ebuild b/dev-python/quantities/quantities-0.13.0.ebuild
deleted file mode 100644
index 29b2720ff0ff..000000000000
--- a/dev-python/quantities/quantities-0.13.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-MY_P="python-quantities-${PV}"
-DESCRIPTION="Support for physical quantities with units, based on numpy"
-HOMEPAGE="https://github.com/python-quantities/python-quantities"
-SRC_URI="
-	https://github.com/python-quantities/python-quantities/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/numpy-1.16[$PYTHON_USEDEP]
-"
-
-distutils_enable_tests pytest