gentoo resync : 28.04.2021

3 files changed, 12 insertions, 78 deletions

diff --git a/www-misc/urlwatch/Manifest b/www-misc/urlwatch/Manifest
index 88dd30df2c6f..047595bfa760 100644
--- a/www-misc/urlwatch/Manifest
+++ b/www-misc/urlwatch/Manifest
@@ -1,11 +1,9 @@
 AUX urlwatch-2.17-fix-yaml.load.patch 675 BLAKE2B 39198576b888d72ab9a21a99430cc32e22a113104e54008301f6caa4065d0c143116e46ed217fd5661489f0759c07399e9ca4ad06d27ac781da8f5a84ef93552 SHA512 300742195fdfed34a39b22b724ae53b9ccaa27857250c91fa431a8270eeeebbfa3ce81b72f0482a5fbea1636aa5ec78a202757fce45a3b71edae4129c6cb756c
 AUX urlwatch-2.18-pycodestyle-requirement.patch 766 BLAKE2B d30b074629d0547fcded426ce16cbc4cd3c829ccb817be4ea792273e5a00825e8fb6e332b9169cf7ce228ac592acf4d04f583acda75501f4d20886f9e13c6f55 SHA512 4fd8abdffa63438955ada5910b84548ab22ccba96dd63943a78ac72f17636e6a515b8a7aaef277099e575965bcf4a68fe01c7ee2226def85a2cc1e6a31bbbb8d
 DIST urlwatch-2.17.tar.gz 44178 BLAKE2B 46163b3305a50c3b5165da8f794c252aeb0a3581f16ba04cc1f0d920066accd02f7eba47718012e2ac0071f6bfa31019777a28840179a28a7fe365ae2e8f1d2c SHA512 635bca7e55641dd73447f5ec9ad429539decfaa8a1c19ab073c3bd46acfc518fa6012d855e0c37dd78654da28acf1446f580def611bcb85ae94fe13f567e3613
-DIST urlwatch-2.18.tar.gz 48268 BLAKE2B e595a6ed27637463f14f92ecafd123eb0c7cef7102cc35ebbc3334804f7e09cc5f933aa2d54e24acd74a1419d6a8683a0d5fb2456b35ae0797c3d8a12efc33de SHA512 4b44a78fe7f2be6f507487ad5de57d79aa55ee790b29b97f2a364c0f3b58828fea5eb2b08235c15cafd3839b9261a7f148ebc9bceb5bedd1ff8319f7f039bb23
-DIST urlwatch-2.21.tar.gz 126235 BLAKE2B 9e0f39e51e413355974ce886e019eb86dd07fb9a75c02c5c711ccdbba573c2e6b218cf11b42c714172ad00288ea0219a079fd9b8016d33c29f087537d160e80d SHA512 30d7312c72d839e8ef681a11065f82c2611b650ab1b9b9a33e718bb791712674afb31e4b2e6da97038379fb8cc4ae5bc58b4d0ee6a26c424cba01898b56566b7
 DIST urlwatch-2.22.tar.gz 136306 BLAKE2B e7f10872e5d7f42ec0ac1073783431c4b0e4fcdcf40884a9f7f52aee36705fbdbaaf5f9e671223715040c6f68cc580f531ba753c9326a2b1380d2fb707f66f1c SHA512 f2c1e0d279689d1e5761203ba139614b972c6266c30877262d59759b0ce63342a820a063f001039848427ea4af4325505c636762cdedb3dc60ebd09e859914f4
+DIST urlwatch-2.23.tar.gz 137917 BLAKE2B 330c52cad62985d24b2cc4c7345156abe9d5d369f8b3f4402856eb96a98f75422de49045bc10910e5cc81306744aad2dce7c05667a6f4eeb22b2bba47869f260 SHA512 e54f8fe2d8307ca9f2f222e6a2082d517a330db60e410b7c991283a2bf88aa861306965b23ca644811aa69425ec2281f7f48d5e34047b808c0897f45ffc7fcbc
 EBUILD urlwatch-2.17.ebuild 1648 BLAKE2B fa7da6e067cd28ab969cb15dd1b6b10e6beb4c2c362eb1c99f8f15cb616d5474055661d46e7c902692e5ba743dee22056f3fab3e0a4042191ec1e698e3d4b0dd SHA512 b879bd11ceb5b5677848b61b18b36c345a69f4ac74d42e3b507bcc09447e212116bce9d453c05fb224b5e3daa03d2f42f6e7f21f84604dca65027d15dc2c1333
-EBUILD urlwatch-2.18-r1.ebuild 1809 BLAKE2B 42291c4a90dc7a0da18440a6b966fd12965c00a0c4e884a4b711faa6c99b6b6a528b0aa0845cab43ec8918a2de18235b0bb449f2845f7909850ca52565b4e555 SHA512 c29cc2f42ef37db23f5d4e8f064005877277e5d6f6215c48c36addb78d127a2620f77fa36d81208b303d911c45cf5b6d83d2c4360216b2de4656abbdd0fd9329
-EBUILD urlwatch-2.21.ebuild 2091 BLAKE2B a81cdac833d9612f369e65dc2053e531c554b346ad6d3768b0936530884c56ae8c2187a26cc16e82cc256c8ecbf4baee06534b4ce20658a0f611b38cb672adb1 SHA512 a89899d5da8e43aa952299f4831af950a722b3edd883a95f6e68bc95355a49ecdc902b788a02817bbec0e5c47b77910bccf61d928219a385f93182db3e5f61ea
 EBUILD urlwatch-2.22.ebuild 2030 BLAKE2B af4cd474d1ec3e54fc4b775959148703efc28e1acb523f096a4fdba5f65453ec735b9b37eed4ecfdc0c150f1ac7f3199f5e921c74121879e875cd5e76b194539 SHA512 92c0a3057b60dd24d36cbfbfa3a0ee3e0b577e18540649c67e2314b2f66caf98f8a492c1c0e85239bdf673ef2db20e4b83f927ce63a1236b3d6648321b1a159b
+EBUILD urlwatch-2.23.ebuild 2259 BLAKE2B 8b0ab0f9a743c31bedd8fbbfbff4f910bdf73105cc8e7a58514b98288efb0c37c39151c050b83f233551e2fce4dad68703b413a2fadce882184d4dcf6886b0e6 SHA512 208d1772be17b1c38c6d2b7d6b954464baa40dc61955136d91a16228376e4499eb38a9832e2ca075797a93e2d04bdc40d94e264f51b4354d465325eade8f21bd
 MISC metadata.xml 540 BLAKE2B feb952d37175ef6a6ec17ae6ff1751d031cd14e3e8d98d5b6cdf44074c05068a1a6ce88b9447fdc0a8dec18f37f7d07232072ba81dd0ce6401a106e5e508cb92 SHA512 7c79bc952f7be46983f83c1f357f013df14d87f906df3a3e0f8690c32d296945729ebe9f95838d6a3c3c1e85b4fc8dde20b0ef12037d17967119e4cbaf652f2c
diff --git a/www-misc/urlwatch/urlwatch-2.18-r1.ebuild b/www-misc/urlwatch/urlwatch-2.18-r1.ebuild
deleted file mode 100644
index 5ebcaa4eaa2e..000000000000
--- a/www-misc/urlwatch/urlwatch-2.18-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-# The package uses entry points but setup.py is weird
-# so the eclass doesn't detect it
-DISTUTILS_USE_SETUPTOOLS=manual
-
-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}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pycodestyle[${PYTHON_USEDEP}]
-	)
-"
-
-# This will be in the next release
-# https://github.com/thp/urlwatch/commit/44e862282d39a6e23f67c3c0240a93cccbb41a55
-PATCHES=( "${FILESDIR}/${P}-pycodestyle-requirement.patch" )
-
-DOCS=( CHANGELOG.md README.md )
-
-distutils_enable_tests nose
-
-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/beautifulsoup:4"
-		elog "app-text/html2text"
-		elog "dev-python/html2text"
-		elog "www-client/lynx"
-	fi
-}
diff --git a/www-misc/urlwatch/urlwatch-2.21.ebuild b/www-misc/urlwatch/urlwatch-2.23.ebuild
index b626b18b954e..4f3817d27e8e 100644
--- a/www-misc/urlwatch/urlwatch-2.21.ebuild
+++ b/www-misc/urlwatch/urlwatch-2.23.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
@@ -15,8 +15,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
@@ -29,27 +27,29 @@ RDEPEND="
 "
 BDEPEND="
 	test? (
-		${RDEPEND}
 		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/pycodestyle[${PYTHON_USEDEP}]
-		dev-python/pytest[${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
+		# Require the pytesseract module
 		"lib/urlwatch/tests/test_filter_documentation.py::test_url[https://example.net/ocr-test.png-job26]"
+		"lib/urlwatch/tests/test_filter_documentation.py::test_url[https://example.net/ocr-test.png-job27]"
+		# Requires the jq module
+		"lib/urlwatch/tests/test_filter_documentation.py::test_url[https://example.net/jobs.json-job28]"
+		# Skip code quality check
+		"lib/urlwatch/tests/test_handler.py::test_pep8_conformance"
 	)
-	pytest -vv ${skipped_tests[@]/#/--deselect } \
-		|| die "Tests failed with ${EPYTHON}"
+	epytest ${skipped_tests[@]/#/--deselect }
 }
 
 pkg_postinst() {