gentoo auto-resync : 26:02:2023 - 21:58:19

4 files changed, 8 insertions, 76 deletions

diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 9ceba929695b..64b5eb98f37c 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/urlwatch/Manifest b/www-misc/urlwatch/Manifest
index bf1d27b5b6f6..4feaf82246bb 100644
--- a/www-misc/urlwatch/Manifest
+++ b/www-misc/urlwatch/Manifest
@@ -1,7 +1,5 @@
-DIST urlwatch-2.22.tar.gz 136306 BLAKE2B e7f10872e5d7f42ec0ac1073783431c4b0e4fcdcf40884a9f7f52aee36705fbdbaaf5f9e671223715040c6f68cc580f531ba753c9326a2b1380d2fb707f66f1c SHA512 f2c1e0d279689d1e5761203ba139614b972c6266c30877262d59759b0ce63342a820a063f001039848427ea4af4325505c636762cdedb3dc60ebd09e859914f4
 DIST urlwatch-2.24.tar.gz 141175 BLAKE2B 7868ba757493c97ef65136d3da67ef3bb6b0d62e52ab150e169d66adea420872990527a622d305bd14923ff367041d615dcea1495871258040ec2cbb73ee7613 SHA512 ed84cb69ecd8894851c3be0165edfa1dfee92a0b49ea1383e4cfd7c31eb0604f99b1a90d9508753064b58bdd8fc4c0369d817303858d07562b37c3f2ac4cae52
 DIST urlwatch-2.25.tar.gz 168241 BLAKE2B 85f76e849495f5457f43ccd37035aae84c6ae4c8649005e617a6a585bf3b73d30914f8c7a89c0fb9bb04cc07a8797d77be07807e8d7c64976355749417b39e40 SHA512 af14c5b4e11345e56e6f326c114629f1e074215d6cc66d9c642424b2a689dc80339157f1b2547fdbe7b7a13d520e2b83bf23c7477da4ae4e43d108e6452624ca
-EBUILD urlwatch-2.22.ebuild 2022 BLAKE2B 07dd2715706b01f0b0fe702ab6384db247ec9c657f02ea6e10a16e00df1e566e8a07c59c125bbc3f0966ad4e8edc071459a9412ee81b1de99fa2c865e43f6c87 SHA512 1cb1e21ba3269d974d24cc77e4ca03ef1fc4a0b833b9bf6da7c7b063cd8f5a7698baa96002693da67f63bde6e1a227e0f458e5425e36e5abba22b5795b437228
 EBUILD urlwatch-2.24.ebuild 2436 BLAKE2B 39a408c3db13371bb4b4839ac8cd3c31f38a6b0da6d4c5d9a0e1e021eb4bf1bf610495763a7afa1c623378f35387798f5603d0954431857be2b096724ff0fbc5 SHA512 6514fe12bb3929ae65350c35ca3efe00119f91129a274e333a4876ce3a3ca3ef818658321c7bb5b0e41a940e4a785b7d055e14c9e301e707069282a7917217ea
-EBUILD urlwatch-2.25.ebuild 2460 BLAKE2B 6da6b0492981139a2d7024037b3398258e8231ba4405479e08347279b16e77fa104ffc3d02c1d27fa86238c07cd7f201124b2813ea04d8d161005d58180b3573 SHA512 6a11b70d571b6a4bf31649d01300468001873342fd708ea55f56a2e53ff44b640895a4cb2c9c704527a7343246ab641d5a32ae56b86d9150031be5eff2b72b4c
+EBUILD urlwatch-2.25.ebuild 2486 BLAKE2B cdb7233bd1a743a52d9a8e402be707eef53ffc44ac29e0c9b5885d2b7110638b09e3ed87aa9ce7b97e1c74c2c9b48a82109f94b1a8075826f7124aceca32de75 SHA512 9528fcd2c41ba47b1b27c7371fa8bea2ba99b6723d4966a60273515d0fb7bf47ee1eb215303b72306ceb656e4d1faa5456e5b1bbc5044d1a1a0257d27d2ef29a
 MISC metadata.xml 541 BLAKE2B f4518dac79cafa9a225d87e125b1fbb3e090c7d3ea1d90a307d8b881379b809112fdc0bd3da6a229daf228aa5660fd130a048fefc63c9a19743987a4c94e528d SHA512 86cf47f19a24fb11c4b1a02b1fe9490a5c171c77b4237a1d0557ce553b1b97ef05f1849f4d745aa0c86f27b2c74f646898f94484ecf75848379b3a02f4157170
diff --git a/www-misc/urlwatch/urlwatch-2.22.ebuild b/www-misc/urlwatch/urlwatch-2.22.ebuild
deleted file mode 100644
index 7a488bf29146..000000000000
--- a/www-misc/urlwatch/urlwatch-2.22.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_9 )
-
-inherit distutils-r1
-
-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"
-
-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[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/pycodestyle[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CHANGELOG.md README.md )
-
-distutils_enable_sphinx docs/source dev-python/alabaster
-distutils_enable_tests pytest
-
-python_test() {
-	local skipped_tests=(
-		# 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-job26]"
-	)
-	pytest -vv ${skipped_tests[@]/#/--deselect } \
-		|| die "Tests failed with ${EPYTHON}"
-}
-
-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/pushbullet-py; then
-			elog "Install 'dev-python/pushbullet-py' to enable" \
-				"Pushbullet notifications 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.25.ebuild b/www-misc/urlwatch/urlwatch-2.25.ebuild
index b8f55930bcc2..746a7b008c8f 100644
--- a/www-misc/urlwatch/urlwatch-2.25.ebuild
+++ b/www-misc/urlwatch/urlwatch-2.25.ebuild
@@ -4,13 +4,16 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
+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"