gentoo resync : 25.11.2020

4 files changed, 4 insertions, 57 deletions

diff --git a/dev-python/fqdn/Manifest b/dev-python/fqdn/Manifest
index 573f7330dc82..1e72fc87ed56 100644
--- a/dev-python/fqdn/Manifest
+++ b/dev-python/fqdn/Manifest
@@ -1,6 +1,3 @@
-AUX 1.4.0-tests.patch 782 BLAKE2B 255832295218f4119fa152246606f67a24bcb7e71fa31ec54e164d1d5b154c98559fe7081cda4d2a6eb85599e4ff73294d6bcf8f0fbda79bb58ad8e70927e43b SHA512 09c3fee689dde053f0fe10e7f97919b6a5990744bd50960434460f5266968c5ff6ef47f5a198ddef681755394a054d4a5d4cdc7c78eff9c8ffd1d07b516c5b61
-DIST fqdn-1.2.0.tar.gz 12275 BLAKE2B 0bc862863ee3b196ea08a1f4f50f98dca88e8b81f37d2cb97bd3fd74ef9844157ea7a9f38707047fad17b95fb95c2f0e7ace8ad2c2310171cba6ff43471ae63d SHA512 ddfcfd82860d597075fd2d989d4bb1cd8c1dc79b711da432732bf786032e78b9356e04851a491c5299b336dcde173a66ddae0e23aea59b67c758d997554b494e
-DIST fqdn-1.4.0.tar.gz 12962 BLAKE2B 76b7bd7f2ebfd77b2bba04f7e07cdab42f0ff6c7ad5967f52e4c108fc3c3345c88a220b9f0330d998dc5abc53909d5768b1b52e08e48bc1e16009fa39f3afa16 SHA512 e2a67e97bc832526e234bbf19600af2e7eda8f7ede13ba33ec8c736888d19693727eded4b895efd4c88ab2e232db768d42761f44a479e615e13da8ddbf6d03a3
-EBUILD fqdn-1.2.0.ebuild 625 BLAKE2B 3f3ff8c5a36dd5fdb0ed8cceb030432d2da6215fb132c4a887d84b9bd89175bdca6ccb68e06ee42408757d1730ddf78d29198e6d59087ba38a7dcbf6032b3334 SHA512 fa46d2d375ef21a13f25f6c66d25676f2ee2b689710e1d5270c966e1d853336dd9c7ebbcf1ff27f876697cf1aedf49e8b9731c60a3d645d5b209316e7ef98e69
-EBUILD fqdn-1.4.0.ebuild 590 BLAKE2B 3b03928434d87df6d037a249f3bb70fa6c76138645f9ee451f7e615901fcd0dc73a9d2fc25ba8379af0f64bb885b501c83ebaedb718aca9a3b16490ca3ab4da2 SHA512 ca0efe80191eb429379302eea156a6b1fda6407fbf4027b57873513e84b37e93f365ce97ae559f3e2c618238ee8747d1fa2abf7829216f86b0872e97e2a5bf02
+DIST fqdn-1.5.0.tar.gz 14630 BLAKE2B 021b4e53c42830a5523964961cde9857bea9eb700cd2030331b05006ec4a8b7e05a9f2330748b0d84531526e17d81ade73fb04e65db381417f2d7f618138f09a SHA512 3940955df50bcd0bbd5cae82f148e9a8ef64b6db84dc867fbfbfbdd661fcc42208a7506f931209347f9115722c00e330fc03c5bdd459cb4a98d0df59af48c492
+EBUILD fqdn-1.5.0.ebuild 549 BLAKE2B b0415d64bdd4f8e6d0d4ee8e730a0b61a7e83a9fc9e497430b3309686e36828ca359cb964920b9e6c82a1d0338d63aa8bb5c74f9212b2cb97fe4a96e5ea3b9d2 SHA512 31bde258d6ea380b75596a8029d0b02d627c43087067f8c90f908c6880db339f36cb227b27f551173d5bc5c11159ec5f5061d9cdf4fecabf0a776020894e06c8
 MISC metadata.xml 651 BLAKE2B 52e04a7e3de79067b3ef936ecc8bd0a2ad9db6157901992e45b4c96fd84cffe68a836fdfabd3e6b8350e53fbc88af9fc5534d0754ecaaa7f2df8e4c7af146951 SHA512 1f938747b18ee81777209bc80b6ffd66fb680f980feba5e7fd2fa13c2e96727be27be004a4e69b244629e00da851b2ad384691816ebf49cc81e73e9ca000f1bc
diff --git a/dev-python/fqdn/files/1.4.0-tests.patch b/dev-python/fqdn/files/1.4.0-tests.patch
deleted file mode 100644
index 0804be7d175b..000000000000
--- a/dev-python/fqdn/files/1.4.0-tests.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0d6a6191a49fac252a96f72bd3193f21ae56424f Mon Sep 17 00:00:00 2001
-From: ypcrts <32625281+ypcrts@users.noreply.github.com>
-Date: Sun, 26 Apr 2020 01:51:43 -0400
-Subject: [PATCH] test __str__ to be congruent with absolute
-
----
- tests/test_fqdn.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_fqdn.py b/tests/test_fqdn.py
-index 37fcf52..60c8607 100644
---- a/tests/test_fqdn.py
-+++ b/tests/test_fqdn.py
-@@ -21,8 +21,8 @@ def test_constructor_raises_on_bytes(self):
- 
-     def test_str(self):
-         d = "greatdomain.com"
--        assert d == str(FQDN(d))
--        assert d == str(FQDN(d + "."))
-+        f = FQDN(d)
-+        assert f.absolute == str(f)
- 
-     def test_rfc_1035_s_2_3_4__label_max_length(self):
-         self.__assert_valid(
diff --git a/dev-python/fqdn/fqdn-1.2.0.ebuild b/dev-python/fqdn/fqdn-1.2.0.ebuild
deleted file mode 100644
index 920e0b4567c6..000000000000
--- a/dev-python/fqdn/fqdn-1.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2018-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="RFC-compliant FQDN validation and manipulation for Python"
-HOMEPAGE="https://github.com/guyhughes/fqdn"
-SRC_URI="https://github.com/guyhughes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/cached-property[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests unittest
diff --git a/dev-python/fqdn/fqdn-1.4.0.ebuild b/dev-python/fqdn/fqdn-1.5.0.ebuild
index bec42af9f411..9e8e8158b783 100644
--- a/dev-python/fqdn/fqdn-1.4.0.ebuild
+++ b/dev-python/fqdn/fqdn-1.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -17,7 +17,5 @@ KEYWORDS="~amd64 ~ppc64 ~x86"
 
 RDEPEND="dev-python/cached-property[${PYTHON_USEDEP}]"
 
-PATCHES=( "${FILESDIR}/1.4.0-tests.patch" )
-
-distutils_enable_tests unittest
+distutils_enable_tests pytest
 distutils_enable_sphinx docs