gentoo auto-resync : 12:03:2024 - 00:45:59

5 files changed, 35 insertions, 76 deletions

diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 9d544c46d6d7..8e4ad73993e1 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/urlwatch/Manifest b/www-misc/urlwatch/Manifest
index 2ee6ea53e8f6..c1741c352faa 100644
--- a/www-misc/urlwatch/Manifest
+++ b/www-misc/urlwatch/Manifest
@@ -1,7 +1,6 @@
+AUX urlwatch-2.28-lxml-5.patch 1520 BLAKE2B ecbf31376f8cdd1d6a68d70ea1ef4d20985a4a79c22740e66c50edf0d7039261492544526c6ed41d1515eafe0325797653ca7da40b8e2a7ae85cbc822a2b04d7 SHA512 b5ebf699069833e3cf1d1bdbddd0307f705b0391571bbfe1f80a7c6b9464216facbe87c9b5a53141ed24c71b3d210aebcce8fed636b584e357d01086de5f2a35
 DIST urlwatch-2.25.tar.gz 168241 BLAKE2B 85f76e849495f5457f43ccd37035aae84c6ae4c8649005e617a6a585bf3b73d30914f8c7a89c0fb9bb04cc07a8797d77be07807e8d7c64976355749417b39e40 SHA512 af14c5b4e11345e56e6f326c114629f1e074215d6cc66d9c642424b2a689dc80339157f1b2547fdbe7b7a13d520e2b83bf23c7477da4ae4e43d108e6452624ca
-DIST urlwatch-2.26.tar.gz 174305 BLAKE2B c7990b0ecca8bb18632ba717dabfed3e3cdf147ff463e1221c4f7002fcb862d162421ac927bd6a570369a1833268cc08668e284e425e954a4eea8d41cb30eafd SHA512 df214e3576dcbc8f18338a17f890e53ce9142fb98ea5042567eb415e697ee1a19d40b00404a40c0cc4aaaaa35ff3d838d9e0273a6bfe5178059560723ef6e4ca
 DIST urlwatch-2.28.tar.gz 306929 BLAKE2B 73fcff8c153db472c944d0c9406e0e98bf64299d5532486a08cb024339544f17d716a22d6f0807ba55c79af9dc7fef41fa8dc5a7fe79c831f3e9958e3ea8958e SHA512 21a662006dc92c0c636ef0beebc4f2ec90b82182aa0ba94a3348026c2c001b6d74198a14c198f681c8e773b640b6030b63de1a081984ea4d1bbc1e2648bc4161
 EBUILD urlwatch-2.25.ebuild 2333 BLAKE2B 9bb008754b45501ec957b2da15c24e1de7e16a03249624d2bb820e3b0e275b565d77579f4d0067e5dfa77e44b2d0b8ec47530c3e9c52a72929040b2905fad0ff SHA512 4e3c4c44a1c5bf8de1a0351e8d37ba92717fa8304466fb0836c224869b338aeff68463f68deb8ad177246979f4a720dd0de8444a0ee036ac963ed5eb3fd7e159
-EBUILD urlwatch-2.26.ebuild 2023 BLAKE2B f6f4f4c28634472601a457a6da628e312f2e001ccbf04940aa60262223f8d3b5e110b6aae0d26f11ead94349f7185a68480c79916db4ce75c56fbb7801ebc206 SHA512 f1d94b58f27f89d27cd02d9fde829d5c5a5c6bbe3db48a6bf460f47558a58bd9425ad91f583120ad0937fb641d0a7d4ec5438d9053ea5b7dadcf6f5cfb08c9ea
-EBUILD urlwatch-2.28.ebuild 2024 BLAKE2B fdc17fa364fce6bbe97830a51e2f6b75160dfb09dad14c1a8f5ed870c0043a24c721b23ca8b43ed44aeb6cc39767925df62831070df96bab01c832fb351d7fd4 SHA512 642f4bc10f340aa9b7feccf2a0c12c73631fb9bfe9adbdfbc1892cb34bdaef2edf59c64237fa7a5e24a2c93a04d17d920bdb0ca9f05b07b8398f47eaf1347fb4
+EBUILD urlwatch-2.28-r1.ebuild 2070 BLAKE2B 3a76e8ba379bfcf23aa88e2dc67cff841baa478b7f7d628cb7a0c1e689abc6f0d49ffef55a3f47da82881ef3e3016f30ba9ce10c3b3d5678ba92c8262d1b10ad SHA512 65ab790f73ad958000bcd76e2b6050f3801c1de069c537660a1cbb5c6b6b3daae34bf666cb0064a1f833369ca2aee3c8bf65f968de24e10f93d2d626f639ff8c
 MISC metadata.xml 541 BLAKE2B f4518dac79cafa9a225d87e125b1fbb3e090c7d3ea1d90a307d8b881379b809112fdc0bd3da6a229daf228aa5660fd130a048fefc63c9a19743987a4c94e528d SHA512 86cf47f19a24fb11c4b1a02b1fe9490a5c171c77b4237a1d0557ce553b1b97ef05f1849f4d745aa0c86f27b2c74f646898f94484ecf75848379b3a02f4157170
diff --git a/www-misc/urlwatch/files/urlwatch-2.28-lxml-5.patch b/www-misc/urlwatch/files/urlwatch-2.28-lxml-5.patch
new file mode 100644
index 000000000000..d5f80410859f
--- /dev/null
+++ b/www-misc/urlwatch/files/urlwatch-2.28-lxml-5.patch
@@ -0,0 +1,28 @@
+https://github.com/thp/urlwatch/commit/123de66d019aef7fc18fab6d56cc2a54d81fea3f
+
+From: James Hewitt <james.hewitt@uk.ibm.com>
+Date: Wed, 17 Jan 2024 13:50:28 +0000
+Subject: [PATCH] Update CSS Selector to use new style
+
+New style of calling the CSSSelector directly instead of using the
+evaluate function. This has been supported since lxml 1.1 [1] and the
+evaluate method has been deprecated since lxml 2.1 [2].
+
+[1] https://github.com/lxml/lxml/blob/lxml-1.1/src/lxml/xpath.pxi#L66
+[2] https://github.com/lxml/lxml/blob/lxml-2.1/src/lxml/xpath.pxi#L143
+
+Signed-off-by: James Hewitt <james.hewitt@uk.ibm.com>
+--- a/lib/urlwatch/filters.py
++++ b/lib/urlwatch/filters.py
+@@ -761,9 +761,9 @@ def _get_filtered_elements(self):
+         excluded_elems = None
+         if self.filter_kind == 'css':
+             selected_elems = CSSSelector(self.expression,
+-                                         namespaces=self.namespaces).evaluate(root)
++                                         namespaces=self.namespaces)(root)
+             excluded_elems = CSSSelector(self.exclude,
+-                                         namespaces=self.namespaces).evaluate(root) if self.exclude else None
++                                         namespaces=self.namespaces)(root) if self.exclude else None
+         elif self.filter_kind == 'xpath':
+             selected_elems = root.xpath(self.expression, namespaces=self.namespaces)
+             excluded_elems = root.xpath(self.exclude, namespaces=self.namespaces) if self.exclude else None
diff --git a/www-misc/urlwatch/urlwatch-2.26.ebuild b/www-misc/urlwatch/urlwatch-2.26.ebuild
deleted file mode 100644
index 1b74b901e846..000000000000
--- a/www-misc/urlwatch/urlwatch-2.26.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A tool for monitoring webpages for updates"
-HOMEPAGE="
-	https://thp.io/2008/urlwatch/
-	https://github.com/thp/urlwatch/
-	https://pypi.org/project/urlwatch/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-python/cssselect[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	>=dev-python/minidb-2.0.6[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		app-text/tesseract[png]
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/jq[${PYTHON_USEDEP}]
-		dev-python/pytesseract[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CHANGELOG.md README.md )
-
-distutils_enable_sphinx docs/source dev-python/alabaster
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Require the pdftotext module
-	"lib/urlwatch/tests/test_filter_documentation.py::test_url[https://example.net/pdf-test.pdf]"
-	"lib/urlwatch/tests/test_filter_documentation.py::test_url[https://example.net/pdf-test-password.pdf]"
-	# Skip code quality check
-	"lib/urlwatch/tests/test_handler.py::test_pep8_conformance"
-)
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		if ! has_version dev-python/chump; then
-			elog "Install 'dev-python/chump' to enable Pushover" \
-				"notifications support"
-		fi
-		if ! has_version dev-python/jq; then
-			elog "Install 'dev-python/jq' to enable jq filtering support"
-		fi
-		if ! has_version dev-python/pytesseract; then
-			elog "Install 'dev-python/pytesseract' to enable OCR support"
-		fi
-		elog "HTML parsing can be improved by installing one of the following packages"
-		elog "and changing the html2text subfilter parameter:"
-		elog "dev-python/beautifulsoup4"
-		elog "app-text/html2text"
-		elog "dev-python/html2text"
-		elog "www-client/lynx"
-	fi
-}
diff --git a/www-misc/urlwatch/urlwatch-2.28.ebuild b/www-misc/urlwatch/urlwatch-2.28-r1.ebuild
index b0ae8628e0d6..ae6e35c21106 100644
--- a/www-misc/urlwatch/urlwatch-2.28.ebuild
+++ b/www-misc/urlwatch/urlwatch-2.28-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -37,6 +37,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-lxml-5.patch"
+)
+
 DOCS=( CHANGELOG.md README.md )
 
 distutils_enable_sphinx docs/source dev-python/alabaster