gentoo resync : 23.09.2020

5 files changed, 0 insertions, 182 deletions

diff --git a/dev-python/tappy/Manifest b/dev-python/tappy/Manifest
index e9a83c87f189..b6821d16a4c9 100644
--- a/dev-python/tappy/Manifest
+++ b/dev-python/tappy/Manifest
@@ -1,9 +1,3 @@
-AUX tappy-2.4-yaml.patch 2387 BLAKE2B 22e64a124a81f3459bad202cf22112a2749c752870a1d47e768e3df4ef087f7d20f8ab9ae40f4f08cb69f5be22b6d5a364d8408dca76268f2b91328420b464b6 SHA512 e2c94768a23e816c126fcd1c11d550492743682c0a347b3cb734adf741e51f693f46c81b9da0688976cc4f0bea153665e338aa50e95e6334182f075e10f811dc
-AUX tappy-2.6.2-yaml.patch 1317 BLAKE2B d9ccf6f7f082080a458576a4492a114c90e2b968e07730fb115263a0e8ff84d747ae81bc403677db3eeae635505ced3a36c5dd1b5a843d4cae8a9649e0bae128 SHA512 8829abb2c2c1ccef63867bbbd7add683615394ef46a6f78861f884dc2dcbd7d4c9556605476c039d6bd24150c0acfcd3f03654c4adb5ca192d735ed9dbce6074
-DIST tap.py-2.4.tar.gz 145440 BLAKE2B 1c6effe086c50cb8b11355db0439207330446a245c42420a948e1c3ff8caf917d9a76ea00f231199a5bd79e7396bcd2a904b764ffa1db611c57947274095a0b9 SHA512 7c843c40f0029bb122fdafec0f5416164b77fac69142c2308a6d815f2f409cddb33c5a08547409e278f06036e21cb2a53cbd3263c23f59c6618c12c201b8209c
-DIST tap.py-2.6.2.tar.gz 148974 BLAKE2B 5e33c7af37c2533b4fd5b45684cc93793027b50c09fde34a4a8ff80c58510a50f5f21295852c14bef506c783cae6293bae521c5fdd696752c221cc49c7d2713e SHA512 2cd0b1b69f155970cf2367766cca96bc8391e074edc754531f0511c3dd027a0a8e95bb8481b627b2610ec9b5f685ebff95f07f5f97eb31c321d96590286be803
 DIST tap.py-3.0.tar.gz 141764 BLAKE2B 0d65d9c0691deef31475cf6db172e41340e112cacda240d32a55338665632613f09c98d0c7dcfbf28be997079f789054d71f1059fb74228507041163df9710a1 SHA512 58b0928dd28ba525d9bb5edfab5606cb67af15e75a5f03d2648280d30377e2aa23b314ed41dba3b09b7dfa1aefead53674df43b6087e552b9aa937472838e7db
-EBUILD tappy-2.4-r1.ebuild 966 BLAKE2B 23e0bd2dc3e5d034163f0c6062423b2e6dba97368321d0c4a96230381f2a281d1efa26f7e051572e0c12be2268782d23bf1e70854774e173c9eca4992b7662c9 SHA512 7ef744f84331b3ecf541a3301f54a301aa87b229f3e801fd84cfef65de446deb4e343bbc9dda3c50f888d1bce3e2725331e43850c310cc4848592dd2ee15664c
-EBUILD tappy-2.6.2.ebuild 973 BLAKE2B 4cfca43a10f5c625293fe2d54765bf983f62148276cd7ae13efb0ad7e4428564ef1bfb2a5765e0ca5fe70a6daea1790a35ef77e6ecb650d331e5670b5fb8a4c9 SHA512 a349e8985b100286badf3282b63241d8d418767d5fd4694628371c5c94e386e59f21b85c2294baae004fbb7f769547c66da2988376f3b8ba5e1111c7a85247ff
 EBUILD tappy-3.0.ebuild 840 BLAKE2B dff0fc2703d6390de31e57103427a7c71a3549f51614e56e2060416a422c5cd26576f065e38412cbbd850667ada0a7f28d21cdfa573143638201e498fb6f99b4 SHA512 20fab45edb254d29ade70f57aa5e5f810c4b11ae188585831af78cfffc7170b078c2ee138dfe4e1488c5714d7c50421a45d9b5ac45c7aaf6d17b38ca7169e7e4
 MISC metadata.xml 490 BLAKE2B 153ff2aacd864fb1099440d2eb72f5bfcd21363d59f65cf14f5ce0ab8c77e7d3d5c83ad386173f20380fde707b704d8b16acfda67bd5949aaec9d5efba2c25f7 SHA512 5971f431b6f188cfdf8b4e3718e5f3ae85826e1a7d1c02bbb5b93475048a3ebecdca38840e082aa7fee18612a654192281db59f29dc66b47251407dc0dc5fa55
diff --git a/dev-python/tappy/files/tappy-2.4-yaml.patch b/dev-python/tappy/files/tappy-2.4-yaml.patch
deleted file mode 100644
index dee5055ec2f1..000000000000
--- a/dev-python/tappy/files/tappy-2.4-yaml.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 62205d0bb2427016938e00fe8e53aed7a947a20d Mon Sep 17 00:00:00 2001
-From: Matt Layman <matthewlayman@gmail.com>
-Date: Sat, 14 Dec 2019 21:20:22 -0500
-Subject: [PATCH] Use PyYAML safe loader and remove deprecation warning. (#103)
-
-Fixes #102
----
- tap/line.py              | 2 +-
- tap/tests/test_parser.py | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-(mgorny: rebased for 2.4 and included test fixes that are part
- of irrelevant commit upstream)
-
-diff --git a/tap/line.py b/tap/line.py
-index 352bc1b..c4d0ca6 100644
---- a/tap/line.py
-+++ b/tap/line.py
-@@ -88,7 +88,7 @@ class Result(Line):
-         """
-         if LOAD_YAML and self._yaml_block is not None:
-             try:
--                yaml_dict = yaml.load(self._yaml_block)
-+                yaml_dict = yaml.load(self._yaml_block, Loader=yaml.SafeLoader)
-                 return yaml_dict
-             except yaml.error.YAMLError:
-                 print('Error parsing yaml block. Check formatting.')
-diff --git a/tap/tests/test_parser.py b/tap/tests/test_parser.py
-index 4e919d1..1e78039 100644
---- a/tap/tests/test_parser.py
-+++ b/tap/tests/test_parser.py
-@@ -235,7 +235,7 @@ class TestParser(unittest.TestCase):
-         try:
-             import yaml
-             from more_itertools import peekable  # noqa
--            converted_yaml = yaml.load(u"""test: sample yaml""")
-+            converted_yaml = yaml.safe_load(u"""test: sample yaml""")
-             self.assertEqual(4, len(lines))
-             self.assertEqual(13, lines[0].version)
-             self.assertEqual(converted_yaml, lines[2].yaml_block)
-@@ -265,7 +265,7 @@ class TestParser(unittest.TestCase):
-         try:
-             import yaml
-             from more_itertools import peekable  # noqa
--            converted_yaml = yaml.load(u"""test: sample yaml""")
-+            converted_yaml = yaml.safe_load(u"""test: sample yaml""")
-             self.assertEqual(4, len(lines))
-             self.assertEqual(13, lines[0].version)
-             self.assertEqual(converted_yaml, lines[2].yaml_block)
-@@ -300,7 +300,7 @@ class TestParser(unittest.TestCase):
-         try:
-             import yaml
-             from more_itertools import peekable  # noqa
--            converted_yaml = yaml.load(u"""
-+            converted_yaml = yaml.safe_load(u"""
-                message: test
-                severity: fail
-                data:
--- 
-2.26.2
-
diff --git a/dev-python/tappy/files/tappy-2.6.2-yaml.patch b/dev-python/tappy/files/tappy-2.6.2-yaml.patch
deleted file mode 100644
index 791ac3bc7b92..000000000000
--- a/dev-python/tappy/files/tappy-2.6.2-yaml.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 116aa55f5d1ae1f82604ae377e07a751f61bb651 Mon Sep 17 00:00:00 2001
-From: Matt Layman <matthewlayman@gmail.com>
-Date: Sat, 14 Dec 2019 21:20:22 -0500
-Subject: [PATCH] Use PyYAML safe loader and remove deprecation warning. (#103)
-
-Fixes #102
----
- setup.py    | 2 +-
- tap/line.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 2d001da..4c59879 100644
---- a/setup.py
-+++ b/setup.py
-@@ -63,7 +63,7 @@ def run(self):
-         zip_safe=False,
-         platforms="any",
-         install_requires=[],
--        extras_require={"yaml": ["more-itertools", "PyYAML"]},
-+        extras_require={"yaml": ["more-itertools", "PyYAML>=5.1"]},
-         classifiers=[
-             "Development Status :: 5 - Production/Stable",
-             "Environment :: Console",
-diff --git a/tap/line.py b/tap/line.py
-index 0d44ff8..fc8f8e2 100644
---- a/tap/line.py
-+++ b/tap/line.py
-@@ -96,7 +96,7 @@ def yaml_block(self):
-         """
-         if LOAD_YAML and self._yaml_block is not None:
-             try:
--                yaml_dict = yaml.load(self._yaml_block)
-+                yaml_dict = yaml.load(self._yaml_block, Loader=yaml.SafeLoader)
-                 return yaml_dict
-             except yaml.error.YAMLError:
-                 print("Error parsing yaml block. Check formatting.")
diff --git a/dev-python/tappy/tappy-2.4-r1.ebuild b/dev-python/tappy/tappy-2.4-r1.ebuild
deleted file mode 100644
index eb3bd8d6e539..000000000000
--- a/dev-python/tappy/tappy-2.4-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
-inherit distutils-r1
-
-MY_PN=tap.py
-DESCRIPTION="Test Anything Protocol (TAP) tools"
-HOMEPAGE="https://github.com/python-tap/tappy https://pypi.org/project/tap.py/"
-SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S=${WORKDIR}/${MY_PN}-${PV}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="yaml"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	yaml? (
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-DEPEND="dev-python/Babel[${PYTHON_USEDEP}]
-	test? (
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/mock[${PYTHON_USEDEP}]
-		' -2)
-	)"
-
-distutils_enable_tests unittest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-yaml.patch
-)
diff --git a/dev-python/tappy/tappy-2.6.2.ebuild b/dev-python/tappy/tappy-2.6.2.ebuild
deleted file mode 100644
index de2c6cdf8f81..000000000000
--- a/dev-python/tappy/tappy-2.6.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
-inherit distutils-r1
-
-MY_PN=tap.py
-DESCRIPTION="Test Anything Protocol (TAP) tools"
-HOMEPAGE="https://github.com/python-tap/tappy https://pypi.org/project/tap.py/"
-SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S=${WORKDIR}/${MY_PN}-${PV}
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="yaml"
-
-RDEPEND="
-	yaml? (
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-BDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	test? (
-		dev-python/more-itertools[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep '
-			dev-python/mock[${PYTHON_USEDEP}]
-		' -2)
-	)"
-
-distutils_enable_tests unittest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-yaml.patch
-)