gentoo resync : 29.12.2022

5 files changed, 39 insertions, 102 deletions

diff --git a/dev-python/soupsieve/Manifest b/dev-python/soupsieve/Manifest
index 82564a431e33..39a7723ddbb2 100644
--- a/dev-python/soupsieve/Manifest
+++ b/dev-python/soupsieve/Manifest
@@ -1,6 +1,5 @@
-AUX soupsieve-2.2.1-lxml-libxml2-tests.patch 2208 BLAKE2B 3948099554c06afe5b57b68bdaa52157311b15941f62f02256131a8b4f7189347b5754d3ea5c73372503362f3444dc3b6c63c04c52f0fbdad8506920b9f2557c SHA512 5725d0425e64b7150bef62ef81c2de06cb452554b18f4191a056f0c776f5955ddb572d939bc1a2f5e9d265a0e8a8d9eab17953896d9dfe288c59464cee66d9d9
-DIST soupsieve-2.3.1.tar.gz 104251 BLAKE2B c395b8dc0944457d6c5f217a03c6fc5f3895868a629eb72d86733fb0d9c6b1d1c41a2e035d5118c9c6fcc6a22e9ff79b9de8417131d30bbc6e1ba02c813ced56 SHA512 3f1245b27d67e8b37bce4cb0b21b2b3f4d6b7ae112cc66672e5406c0701b28e605ed12db1e111bfeccea15625b17042e398b075b7f026d3f3e15069f0cafccac
+DIST soupsieve-2.3.2.post1.gh.tar.gz 104120 BLAKE2B ddeeb357753981a55676a59285161a03759fd548a11950e87ff53df9433b7cb054084afe6dd4de01c316dc0a013e6f429e6e0868c140ec11a19627b0e1cb0177 SHA512 80eae1e7256cbcf2f2b8520779a5bdb68798e9813ed738ee933204ff1c23ad52553e21f3aa89ad61b900b906dcaa7a1eebd819300417304df782cda9e2d79c4a
 DIST soupsieve-2.3.2.tar.gz 103869 BLAKE2B 0820f3935aaf0bda436abf10ddb0d64d6b2de99d116fdc84518879ca468688918a0995f4666e04d4892fee4d221b2d6a843f200c4bf05c3bf5755004a3fbb7ec SHA512 a91c453098697d0b6120e80dd2cf56ec0359d9d3d98ef54e348e8f9832b3b70626fcdc7c21bc3abe0fba32a83cc62d05b750f2d2fa79261479bf89c0aa782caa
-EBUILD soupsieve-2.3.1.ebuild 935 BLAKE2B a2721ca329a16a28820a28088c5a4adbe5da4447f24cfba852c87e21d1d0e1d817baa3a50612a751005e4505b7257f1659f96fcbf6c3c3fae142bc9101b682f7 SHA512 703ec2d93c45a89e3129eb9f4436af7c054f5746b556840323e5262d244b0f6ceb10f7001d77445b9097c62358cc8a26d3db330f1ad338ac246605ef7b18fd4d
-EBUILD soupsieve-2.3.2.ebuild 759 BLAKE2B 9b3f1775d08e2ffdd8a366a92bc6ee6f13931aa6d58dd67a850dfd2f7e4926836b7587cda1c6454cb689408a429f859bfbccb6aaf0e704cd806374c6bc6ccdda SHA512 8d5bcbbadcde9f4d5456916f2f0e3ed968c6bf5246c392d12a399a5c38accd9f33396849eda4b88031bd5fdb2d191cfff9f06cdf23a66e0d201789505eaf5d0e
+EBUILD soupsieve-2.3.2.ebuild 751 BLAKE2B 0d9992d50bc86c6afd38c7f8b137d13403ff3e601cdabd06df0ee37c01dd7f96d0953150be9e817b4aff6514f82f8d254552f8360902b01b14bba6af6c760ce9 SHA512 85713d071d27f03640311a6938f57f4b3846f0d592e9dff799291b531d9ebaacff230de10a58d8c83e4274531394ee0f085f1299276e04bbca408af8078f9f50
+EBUILD soupsieve-2.3.2_p1.ebuild 814 BLAKE2B 256d6f610afd3f67e94627dd0295cdc8d3645e9f5207b4e9fdcd3e12843b5218b8204dddcaf629167ab75b0779a0d50e36a2d3995a1952edf82c0d578fa0ef8c SHA512 a3a35f45cc389aa1b90d50856829cc8d9ec8f13a29d237f21b2b0b5f723bf0214ff4554ff0728cc8b14d2234de0439822a52dc2c266fb8e5972bb7bf544993cd
 MISC metadata.xml 399 BLAKE2B de09909e906d138c664a0926eca614abf7953e16d5fb0bb0babed691906360cdb8c87b9a79ea5ddd2492b4e8cee561e5433d02ba47be5cf670fbde9e70dfed9f SHA512 0ca6cbc294f232ae9d0f5f0de3cb1c133f5742435d523a0481bd7449dd9a75aa950f08a668b4e1900e520461410e0eb864dc913361204909524805f1cb9e0a2c
diff --git a/dev-python/soupsieve/files/soupsieve-2.2.1-lxml-libxml2-tests.patch b/dev-python/soupsieve/files/soupsieve-2.2.1-lxml-libxml2-tests.patch
deleted file mode 100644
index a7075fa6fb6d..000000000000
--- a/dev-python/soupsieve/files/soupsieve-2.2.1-lxml-libxml2-tests.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-https://sources.debian.org/data/main/s/soupsieve/2.2.1-2/debian/patches/libxml2-2.9.11
-https://github.com/facelessuser/soupsieve/issues/220
-
-Apply Debian patch to skip tests which expose a lxml bug that's
-already being handled elsewhere.
-
-From: Stefano Rivera <stefanor@debian.org>
-Date: Sat, 2 Oct 2021 12:05:17 -0700
-Subject: Mark test_contains_cdata_html tests XFAIL for libxml2 >= 2.9.11
-
-libxml2 changed CDATA handling in 2.9.11.
-Beautifulsoup supports this change, but lxml upstream has pinned on an
-older version so the behaviour change isn't standardised upstream, yet.
-
-Bug-upstream: https://github.com/facelessuser/soupsieve/issues/220
-Bug-lxml: https://bugs.launchpad.net/lxml/+bug/1928795
-Bug-beautifulsoup: https://bugs.launchpad.net/beautifulsoup/+bug/1930164
-Bug-Debian: https://bugs.debian.org/995459
-
-Forwarded: no
---- a/tests/test_extra/test_soup_contains.py
-+++ b/tests/test_extra/test_soup_contains.py
-@@ -3,6 +3,9 @@ from .. import util
- import warnings
- import soupsieve as sv
- 
-+import pytest
-+from lxml.etree import LIBXML_VERSION
-+
- 
- class TestSoupContains(util.TestCase):
-     """Test soup-contains selectors."""
-@@ -144,6 +147,9 @@ class TestSoupContains(util.TestCase):
-             flags=util.HTML
-         )
- 
-+    @pytest.mark.xfail(LIBXML_VERSION >= (2, 9, 11),
-+        reason='lxml parser changed CDATA handling, see '
-+               'https://github.com/facelessuser/soupsieve/issues/220')
-     def test_contains_cdata_html(self):
-         """Test contains CDATA in HTML5."""
- 
---- a/tests/test_extra/test_soup_contains_own.py
-+++ b/tests/test_extra/test_soup_contains_own.py
-@@ -1,6 +1,9 @@
- """Test contains selectors."""
- from .. import util
- 
-+import pytest
-+from lxml.etree import LIBXML_VERSION
-+
- 
- class TestSoupContainsOwn(util.TestCase):
-     """Test soup-contains-own selectors."""
-@@ -35,6 +38,9 @@ class TestSoupContainsOwn(util.TestCase):
-             flags=util.HTML
-         )
- 
-+    @pytest.mark.xfail(LIBXML_VERSION >= (2, 9, 11),
-+        reason='lxml parser changed CDATA handling, see '
-+               'https://github.com/facelessuser/soupsieve/issues/220')
-     def test_contains_own_cdata_html(self):
-         """Test contains CDATA in HTML5."""
- 
diff --git a/dev-python/soupsieve/soupsieve-2.3.1.ebuild b/dev-python/soupsieve/soupsieve-2.3.1.ebuild
deleted file mode 100644
index 442fbed6d41c..000000000000
--- a/dev-python/soupsieve/soupsieve-2.3.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="A modern CSS selector implementation for BeautifulSoup"
-HOMEPAGE="https://github.com/facelessuser/soupsieve/
-	https://pypi.org/project/soupsieve/"
-SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# Needed for now until something is figured out either at lxml
-	# upstream or libxml2?
-	# See https://github.com/facelessuser/soupsieve/issues/220
-	"${FILESDIR}"/${PN}-2.2.1-lxml-libxml2-tests.patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/soupsieve/soupsieve-2.3.2.ebuild b/dev-python/soupsieve/soupsieve-2.3.2.ebuild
index 2561589e4627..f62d0d1e340f 100644
--- a/dev-python/soupsieve/soupsieve-2.3.2.ebuild
+++ b/dev-python/soupsieve/soupsieve-2.3.2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/soupsieve/soupsieve-2.3.2_p1.ebuild b/dev-python/soupsieve/soupsieve-2.3.2_p1.ebuild
new file mode 100644
index 000000000000..f28204ec807c
--- /dev/null
+++ b/dev-python/soupsieve/soupsieve-2.3.2_p1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+MY_P=${P/_p/.post}
+DESCRIPTION="A modern CSS selector implementation for BeautifulSoup"
+HOMEPAGE="
+	https://github.com/facelessuser/soupsieve/
+	https://pypi.org/project/soupsieve/
+"
+SRC_URI="
+	https://github.com/facelessuser/${PN}/archive/${PV/_p/.post}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest