gentoo auto-resync : 03:05:2023 - 17:26:08

3 files changed, 19 insertions, 17 deletions

diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 40da8e4f55e8..cacc39a2a3a8 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/urlwatch/Manifest b/www-misc/urlwatch/Manifest
index d2a2a5c4bb17..6496e217ab70 100644
--- a/www-misc/urlwatch/Manifest
+++ b/www-misc/urlwatch/Manifest
@@ -1,7 +1,7 @@
-DIST urlwatch-2.24.tar.gz 141175 BLAKE2B 7868ba757493c97ef65136d3da67ef3bb6b0d62e52ab150e169d66adea420872990527a622d305bd14923ff367041d615dcea1495871258040ec2cbb73ee7613 SHA512 ed84cb69ecd8894851c3be0165edfa1dfee92a0b49ea1383e4cfd7c31eb0604f99b1a90d9508753064b58bdd8fc4c0369d817303858d07562b37c3f2ac4cae52
 DIST urlwatch-2.25.tar.gz 168241 BLAKE2B 85f76e849495f5457f43ccd37035aae84c6ae4c8649005e617a6a585bf3b73d30914f8c7a89c0fb9bb04cc07a8797d77be07807e8d7c64976355749417b39e40 SHA512 af14c5b4e11345e56e6f326c114629f1e074215d6cc66d9c642424b2a689dc80339157f1b2547fdbe7b7a13d520e2b83bf23c7477da4ae4e43d108e6452624ca
 DIST urlwatch-2.26.tar.gz 174305 BLAKE2B c7990b0ecca8bb18632ba717dabfed3e3cdf147ff463e1221c4f7002fcb862d162421ac927bd6a570369a1833268cc08668e284e425e954a4eea8d41cb30eafd SHA512 df214e3576dcbc8f18338a17f890e53ce9142fb98ea5042567eb415e697ee1a19d40b00404a40c0cc4aaaaa35ff3d838d9e0273a6bfe5178059560723ef6e4ca
-EBUILD urlwatch-2.24.ebuild 2436 BLAKE2B 39a408c3db13371bb4b4839ac8cd3c31f38a6b0da6d4c5d9a0e1e021eb4bf1bf610495763a7afa1c623378f35387798f5603d0954431857be2b096724ff0fbc5 SHA512 6514fe12bb3929ae65350c35ca3efe00119f91129a274e333a4876ce3a3ca3ef818658321c7bb5b0e41a940e4a785b7d055e14c9e301e707069282a7917217ea
+DIST urlwatch-2.28.tar.gz 306929 BLAKE2B 73fcff8c153db472c944d0c9406e0e98bf64299d5532486a08cb024339544f17d716a22d6f0807ba55c79af9dc7fef41fa8dc5a7fe79c831f3e9958e3ea8958e SHA512 21a662006dc92c0c636ef0beebc4f2ec90b82182aa0ba94a3348026c2c001b6d74198a14c198f681c8e773b640b6030b63de1a081984ea4d1bbc1e2648bc4161
 EBUILD urlwatch-2.25.ebuild 2484 BLAKE2B 55945b5deecf90622a2badf6089156fe01a41b0a1ed02efe00d5c157311ba9ae0b9598fb21ae6eb233127b01104d4dc9e10f1b3d4a3152b3ad9f466214bf822b SHA512 c7d3120838f310bbc49bc4d83ba26ab18a7e299a009873b107c082c014f47bab366e67e8590a7dd2ba73cc5f5f939017acb2b44e9d85a872ffdabaf23d5f343b
 EBUILD urlwatch-2.26.ebuild 2174 BLAKE2B 753d34a8363518ad47ef0b8bd6e959185d05ebf937b7438d79528e398da8aad0b52f0bf61219bd28c54747e84d8d1540f365af98a491a1f3d49208fc291d9739 SHA512 fc5ea386a43ca7df4cac59f6347917926e06a60f0cbb97ddaf8eef231adebff06f9b425a8d1bf573e85e648149b94c11704fc06ad67a83fc2c9f5872d312ba71
+EBUILD urlwatch-2.28.ebuild 2174 BLAKE2B 753d34a8363518ad47ef0b8bd6e959185d05ebf937b7438d79528e398da8aad0b52f0bf61219bd28c54747e84d8d1540f365af98a491a1f3d49208fc291d9739 SHA512 fc5ea386a43ca7df4cac59f6347917926e06a60f0cbb97ddaf8eef231adebff06f9b425a8d1bf573e85e648149b94c11704fc06ad67a83fc2c9f5872d312ba71
 MISC metadata.xml 541 BLAKE2B f4518dac79cafa9a225d87e125b1fbb3e090c7d3ea1d90a307d8b881379b809112fdc0bd3da6a229daf228aa5660fd130a048fefc63c9a19743987a4c94e528d SHA512 86cf47f19a24fb11c4b1a02b1fe9490a5c171c77b4237a1d0557ce553b1b97ef05f1849f4d745aa0c86f27b2c74f646898f94484ecf75848379b3a02f4157170
diff --git a/www-misc/urlwatch/urlwatch-2.24.ebuild b/www-misc/urlwatch/urlwatch-2.28.ebuild
index 96d6a5cbd808..02b7d52bcb99 100644
--- a/www-misc/urlwatch/urlwatch-2.24.ebuild
+++ b/www-misc/urlwatch/urlwatch-2.28.ebuild
@@ -3,31 +3,37 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="A tool for monitoring webpages for updates"
-HOMEPAGE="https://thp.io/2008/urlwatch/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="
+	https://thp.io/2008/urlwatch/
+	https://github.com/thp/urlwatch/
+	https://pypi.org/project/urlwatch/
+"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+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[${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}]
 	)
 "
 
@@ -38,15 +44,8 @@ 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-job12]"
-	"lib/urlwatch/tests/test_filter_documentation.py::test_url[https://example.net/pdf-test-password.pdf-job13]"
-	# Requires the pytesseract module
-	"lib/urlwatch/tests/test_filter_documentation.py::test_url[https://example.net/ocr-test.png-job28]"
-	# Fail because of argv parsing: https://github.com/thp/urlwatch/issues/677
-	"lib/urlwatch/tests/test_handler.py::test_run_watcher"
-	"lib/urlwatch/tests/test_handler.py::test_number_of_tries_in_cache_is_increased"
-	"lib/urlwatch/tests/test_handler.py::test_report_error_when_out_of_tries"
-	"lib/urlwatch/tests/test_handler.py::test_reset_tries_to_zero_when_successful"
+	"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"
 )
@@ -64,6 +63,9 @@ pkg_postinst() {
 			elog "Install 'dev-python/pushbullet-py' to enable" \
 				"Pushbullet notifications 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"