gentoo resync : 20.03.2022

9 files changed, 30 insertions, 281 deletions

diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index d9db8bab85ae..dea8322090a5 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/fcgiwrap/Manifest b/www-misc/fcgiwrap/Manifest
index a929c1c0c151..996934fb5bcf 100644
--- a/www-misc/fcgiwrap/Manifest
+++ b/www-misc/fcgiwrap/Manifest
@@ -1,4 +1,3 @@
 DIST fcgiwrap-1.1.0.tar.gz 9924 BLAKE2B a96a87bfd1e4845be3a5018e5574edd40a800926ac531a041fae07f6810da509eecf97a19b2debe0ea318f2968f30184f4f6c1c02495777492d32826a0f759a1 SHA512 b8d35762d1d3c94a67602290b0092f0c38cffbbcd3dbc16597abf8b92172909b04450c238de2e430e841a17dd47fdd48d6a001f77539966980ef1af61e447ddc
-EBUILD fcgiwrap-1.1.0-r1.ebuild 1313 BLAKE2B b87272e5158a3ea56b573e34c31eebb75a900ac3f799a5533be65685260b4c02955fc58aa78e29b8e48f64512358646c99faffd8bb8ce3377254d9b132792dea SHA512 82c1d923eaf31578f7bd53beb1e342773dcb0d6d151f892c1e0281944c4bb91b5a9f65075b23045844f7374ac8ceb4948dfc92577060e0645355f1a7f520ae31
 EBUILD fcgiwrap-1.1.0-r2.ebuild 1203 BLAKE2B f484e95935ba1b82cb2048235cb150559aab3a6ec70fb223b122759c74044508f4309192c475485cd0efb94cb77dc6774c5460fe58008d65dbb023dab4e6a167 SHA512 ffdf5b0ac8a10d92674e7546be7872d9c4fb6b210ff28b8cf381a83b58e032fa2480b2981d956bb34b35ddaf1290c700dbbda4490f0d6ed7ad9351b2f6f5ab77
 MISC metadata.xml 459 BLAKE2B b5e849549c0e7318e9e1fc39cc89358b5372f64a4c300c343a07d928f3eee4658593720146132cab9dbf9caf5e8aaed80c4d71a64eba449e7108bf048c68268f SHA512 fbdb6a797983a71a11a92cbef40df7745b1a2e96c102c1f41562a861547918bf290b175ec7d41d186a9972375f571afe5e24a7b99fdc086d58b9c892d68fc9b1
diff --git a/www-misc/fcgiwrap/fcgiwrap-1.1.0-r1.ebuild b/www-misc/fcgiwrap/fcgiwrap-1.1.0-r1.ebuild
deleted file mode 100644
index e30a45f61524..000000000000
--- a/www-misc/fcgiwrap/fcgiwrap-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-[[ ${PV} = *9999* ]] && VCS_ECLASS="git-r3" || VCS_ECLASS=""
-inherit autotools systemd toolchain-funcs ${VCS_ECLASS}
-
-DESCRIPTION="Simple FastCGI wrapper for CGI scripts (CGI support for nginx)"
-HOMEPAGE="https://github.com/gnosek/fcgiwrap"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="systemd"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/gnosek/${PN}.git"
-else
-	SRC_URI="https://github.com/gnosek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-RDEPEND="
-	dev-libs/fcgi
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( README.rst )
-
-src_prepare() {
-	sed -e "s/-Werror//" \
-		-i configure.ac || die "sed failed"
-
-	sed -e '/man8dir = $(DESTDIR)/s/@prefix@//' \
-		-i Makefile.in || die "sed failed"
-
-	sed -e "s/libsystemd-daemon/libsystemd/" \
-		-i configure.ac || die "sed failed"
-	tc-export CC
-
-	# Fix systemd units for Gentoo
-	sed -i -e '/User/d' systemd/fcgiwrap.service || die
-	sed -i -e '/Group/d' systemd/fcgiwrap.service || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with systemd) \
-		"$(systemd_with_unitdir)"
-}
-
-pkg_postinst() {
-	einfo 'You may want to install www-servers/spawn-fcgi to use with fcgiwrap.'
-}
diff --git a/www-misc/monitorix/Manifest b/www-misc/monitorix/Manifest
index 670c9c726ed2..986c70c16020 100644
--- a/www-misc/monitorix/Manifest
+++ b/www-misc/monitorix/Manifest
@@ -1,7 +1,4 @@
 AUX monitorix 794 BLAKE2B f0e4eb70ff867711b749fbdda5150ef0733f9622fceaf8499600bcae15bea3e6a987d7c5635987e0913a1bd28adc6be5e5273438c59ee434a80e2cb72d8e6bd1 SHA512 92f16de3398673046cb9aa27f70923f35d6f61a5a861bed37a61650371ad714aa6ad2be2eb9f770e4cb734db109a222182ba22eb4a6f9c5b228a8b96c1ef893c
-DIST monitorix-3.12.0.tar.gz 348117 BLAKE2B 65f6e5a8ef4acba2e5dd015e3acab1c927a8964de6cf0bb56a426e6e2dc5843083177591f26db639ed36df798db9659cd6345ca38df4f25fc9a4759e84f0d553 SHA512 7cbdb27df1d84e87f0b99d310d3b3a7c27e369adc82c88e297966e36de82c2f800474447dd628041f2feb89817ee496cbae65a4b0e4942a2f75c900f16ccfcf1
-DIST monitorix-3.13.1.tar.gz 364091 BLAKE2B 0e11d1df2d5cbc4a7ec7b448b24409411903370b5fc0f35f7395439b017d0ce27e3d86fe19db70939942165a9e4bf72583030fdcd1b9c0b5be484c1c71af021e SHA512 224ccedd608cda609ea161f62e11266c13f26536d7e3c50a3690ace693ed52c71422f2ef0acabb4e8d69551458a6af2c33e6b776b1dec73cbf621a7f40339573
-EBUILD monitorix-3.12.0.ebuild 2790 BLAKE2B be1f972e47615d7fcc9f225da6efea482e8390e5a5cf45bdbf3a1607b0aa7d64f0e04bd4c8fe1b774d910880b7dc51afa781d03aa573277670764e80ff06474f SHA512 786b7608dfe1ce3a0802461316ec64f64b46a9f72f067d1767446fd9f075e861c1e66c5b6a6c1a6fed0b2a37bddfe279e870a3785c5d0297d0f05c9636afc483
-EBUILD monitorix-3.13.1-r1.ebuild 2330 BLAKE2B 7e43faace1937967fbd0651583128e603413563ca5be529291acd315dec125d9eb63f72ea1c1cfb5baa2c1081b23da1c8fd308a363fd524233223f644ebc4e8f SHA512 d2c685a571d954e4294ded480f3cdfd10619bc99f7674a63e553048f21c2efe367c590634338bbe89fd4598610997397ea22cf75f7a2f316f3488e64739ac357
-EBUILD monitorix-3.13.1.ebuild 2278 BLAKE2B 856a1cfbd421ad3fc7ed497350d6f50b668655a6b7d49aa88085fc14721d3a50b49f64608ce15c193bec436e1e6bed5ec4dd4103d743afd074822c838d9583bb SHA512 ba4a38a51c01f4e9b3a8afb764e4360169e8afcba21fdec16fb9b5a319710840da9f77ec2b8a8f2023b5e2ec0b1dd52d79c5928f8301da38e3994f95f23ee75c
+DIST monitorix-3.14.0.tar.gz 393803 BLAKE2B 84a2b0a8417a405757e43c752b8e4aa0faf4c750895e5425801c3682f25671b8b4858ee4fdf94e4da181250c0ddbdc9237624af0d1dcbec4a29a8076f35a9fc6 SHA512 c7b11b2144b9cdcc5fdb33cfe208d5d5c7c8e27dfdacd51148a4077748632e592cf07dbecd5992c34ff4aea982e62a03a20d1920fe142da7f6ed5367729bfd2e
+EBUILD monitorix-3.14.0.ebuild 2320 BLAKE2B d95355985a92de4f72e08a2335a9973c6bff50fa92ae6b7be31cce999e537b993e11ae831c6690090d65dd3ec26ba2a666f2a71afbe9587a2ad59014bb234615 SHA512 a410ab6cc50413c805961a93aecf6eb9a9ef2b69159286841f58e598a38d573d6a2d465f4e37f31487ecf4f8b5daaef3727b75a01818a7517be7bf3fefc552d5
 MISC metadata.xml 487 BLAKE2B 6dade6679de9045464ce974db2e6b8a44bf64e97d689b566ded1342c5e1f2a578db10a6a95543bc9c2ab5189e33abb780540a2b4a5d0d687cc3c6c6bcbf9deda SHA512 0c0ffb4a7a744795f041f1bd515b73c251cfb11a50227104abde96d4d04bb837fbd1a550fc03c68ccd3414c6950f9addf934ef54b65ab193cd1833b90ced46ab
diff --git a/www-misc/monitorix/monitorix-3.12.0.ebuild b/www-misc/monitorix/monitorix-3.12.0.ebuild
deleted file mode 100644
index f76b1892b920..000000000000
--- a/www-misc/monitorix/monitorix-3.12.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit systemd
-
-DESCRIPTION="A lightweight system monitoring tool"
-HOMEPAGE="https://www.monitorix.org/"
-SRC_URI="https://www.monitorix.org/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	acct-user/monitorix
-	acct-group/monitorix
-	dev-perl/Config-General
-	dev-perl/DBI
-	dev-perl/HTTP-Server-Simple
-	dev-perl/IO-Socket-SSL
-	dev-perl/libwww-perl
-	dev-perl/MIME-Lite
-	dev-perl/XML-Simple
-	net-analyzer/rrdtool[graph,perl]
-	dev-perl/CGI"
-
-src_prepare() {
-	# Put better Gentoo defaults in the configuration file.
-	sed -e "s|\(base_dir.*\)/usr/share/${PN}|\1/usr/share/${PN}/htdocs|" \
-		-e "s|\(secure_log.*\)/var/log/secure|\1/var/log/auth.log|" \
-		-e "s|nobody|${PN}|g" -i ${PN}.conf || die
-	# Update systemd binary location
-	sed -e "s|/usr/bin|/usr/sbin|g" -i docs/${PN}.service || die
-	eapply_user
-}
-
-# Override compile phase
-src_compile() { :; }
-
-src_install() {
-	dosbin ${PN}
-
-	newinitd "${FILESDIR}/monitorix" ${PN}
-
-	insinto /etc/monitorix
-	doins ${PN}.conf
-
-	keepdir /etc/${PN}/conf.d
-
-	insinto /etc/logrotate.d
-	newins docs/${PN}.logrotate ${PN}
-
-	dodoc Changes README{,.nginx} docs/${PN}-{alert.sh,apache.conf,lighttpd.conf}
-	doman man/man5/${PN}.conf.5
-	doman man/man8/${PN}.8
-
-	insinto /var/lib/${PN}/www
-	doins logo_bot.png logo_top.png ${PN}ico.png
-
-	keepdir /var/lib/${PN}/www/imgs
-	fowners monitorix:monitorix /var/lib/${PN}/www/imgs
-
-	exeinto /var/lib/${PN}/www/cgi
-	doexe ${PN}.cgi
-
-	exeinto /usr/lib/${PN}
-	doexe lib/*.pm
-
-	keepdir /var/lib/${PN}/usage
-	insinto /var/lib/${PN}/reports
-	doins -r reports
-
-	systemd_dounit docs/${PN}.service
-}
-
-pkg_postinst() {
-	if has_version '<=www-misc/monitorix-3.5.1' ; then
-		ewarn "WARNING: ${PN} has changed its config format twice, in versions"
-		ewarn "3.0.0 and 3.4.0; this format may be incompatible with your existing"
-		ewarn "config file. Please take care if upgrading from an old version."
-		ewarn
-		elog "${PN} includes its own web server as of version 3.0.0."
-		elog "For this reason, the dependency on the webapp framework"
-		elog "has been removed."
-		elog
-	fi
-	elog "Optional dependencies:"
-	elog "  app-admin/hddtemp   (disk drive temperatures and health)"
-	elog "  mail-mta/postfix    (email reports/statics)"
-	elog "  mail-mta/sendmail   (email reports/statics)"
-	elog "  sys-apps/lm-sensors (lm-sensors and GPU temperatures)"
-	elog "  sys-power/apcupsd   (APC UPS statistics)"
-	elog "  sys-power/nut       (Network UPS Tools statistics)"
-	elog
-	elog "If you wish to use your own web server:"
-	elog "  Web data can be found at: ${EROOT}/var/lib/${PN}/www/"
-	elog "  Also please check the correct user and group ownership"
-	elog "  of ${EROOT}/var/lib/${PN}/www/imgs/"
-}
diff --git a/www-misc/monitorix/monitorix-3.13.1.ebuild b/www-misc/monitorix/monitorix-3.13.1.ebuild
deleted file mode 100644
index 00607f99c0c6..000000000000
--- a/www-misc/monitorix/monitorix-3.13.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit systemd optfeature
-
-DESCRIPTION="A lightweight system monitoring tool"
-HOMEPAGE="https://www.monitorix.org/"
-SRC_URI="https://www.monitorix.org/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	acct-user/monitorix
-	acct-group/monitorix
-	dev-perl/Config-General
-	dev-perl/DBI
-	dev-perl/HTTP-Server-Simple
-	dev-perl/IO-Socket-SSL
-	dev-perl/libwww-perl
-	dev-perl/MIME-Lite
-	dev-perl/XML-Simple
-	net-analyzer/rrdtool[graph,perl]
-	dev-perl/CGI"
-
-src_prepare() {
-	# Put better Gentoo defaults in the configuration file.
-	sed -e "s|\(base_dir.*\)/usr/share/${PN}|\1/usr/share/${PN}/htdocs|" \
-		-e "s|\(secure_log.*\)/var/log/secure|\1/var/log/auth.log|" \
-		-e "s|nobody|${PN}|g" -i ${PN}.conf || die
-	# Update systemd binary location
-	sed -e "s|/usr/bin|/usr/sbin|g" -i docs/${PN}.service || die
-	eapply_user
-}
-
-# Override compile phase
-src_compile() { :; }
-
-src_install() {
-	dosbin ${PN}
-
-	newinitd "${FILESDIR}/monitorix" ${PN}
-
-	insinto /etc/monitorix
-	doins ${PN}.conf
-
-	keepdir /etc/${PN}/conf.d
-
-	insinto /etc/logrotate.d
-	newins docs/${PN}.logrotate ${PN}
-
-	dodoc Changes README{,.nginx} docs/${PN}-{alert.sh,apache.conf,lighttpd.conf}
-	doman man/man5/${PN}.conf.5
-	doman man/man8/${PN}.8
-
-	insinto /var/lib/${PN}/www
-	doins logo_bot.png logo_top.png ${PN}ico.png
-
-	keepdir /var/lib/${PN}/www/imgs
-	fowners monitorix:monitorix /var/lib/${PN}/www/imgs
-
-	exeinto /var/lib/${PN}/www/cgi
-	doexe ${PN}.cgi
-
-	exeinto /usr/lib/${PN}
-	doexe lib/*.pm
-
-	keepdir /var/lib/${PN}/usage
-	insinto /var/lib/${PN}/reports
-	doins -r reports
-
-	systemd_dounit docs/${PN}.service
-}
-
-pkg_postinst() {
-	optfeature "disk drive temperatures and health" app-admin/hddtemp
-	optfeature "email reports/statics" mail-mta/postfix mail-mta/sendmail
-	optfeature "lm-sensors and GPU temperatures" sys-apps/lm-sensors
-	optfeature "APC UPS statistics" sys-power/apcupsd
-	optfeature "Network UPS Tools statistics" sys-power/nut
-	elog
-	elog "If you wish to use your own web server:"
-	elog "  Web data can be found at: ${EROOT}/var/lib/${PN}/www/"
-	elog "  Also please check the correct user and group ownership"
-	elog "  of ${EROOT}/var/lib/${PN}/www/imgs/"
-}
diff --git a/www-misc/monitorix/monitorix-3.13.1-r1.ebuild b/www-misc/monitorix/monitorix-3.14.0.ebuild
index a6ac6b69d076..7c5126a6c23a 100644
--- a/www-misc/monitorix/monitorix-3.13.1-r1.ebuild
+++ b/www-misc/monitorix/monitorix-3.14.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 inherit systemd optfeature
 
@@ -11,8 +11,7 @@ SRC_URI="https://www.monitorix.org/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	acct-user/monitorix
diff --git a/www-misc/urlwatch/Manifest b/www-misc/urlwatch/Manifest
index de464810db96..be7459f8900c 100644
--- a/www-misc/urlwatch/Manifest
+++ b/www-misc/urlwatch/Manifest
@@ -1,7 +1,7 @@
 DIST urlwatch-2.22.tar.gz 136306 BLAKE2B e7f10872e5d7f42ec0ac1073783431c4b0e4fcdcf40884a9f7f52aee36705fbdbaaf5f9e671223715040c6f68cc580f531ba753c9326a2b1380d2fb707f66f1c SHA512 f2c1e0d279689d1e5761203ba139614b972c6266c30877262d59759b0ce63342a820a063f001039848427ea4af4325505c636762cdedb3dc60ebd09e859914f4
-DIST urlwatch-2.23.tar.gz 137917 BLAKE2B 330c52cad62985d24b2cc4c7345156abe9d5d369f8b3f4402856eb96a98f75422de49045bc10910e5cc81306744aad2dce7c05667a6f4eeb22b2bba47869f260 SHA512 e54f8fe2d8307ca9f2f222e6a2082d517a330db60e410b7c991283a2bf88aa861306965b23ca644811aa69425ec2281f7f48d5e34047b808c0897f45ffc7fcbc
 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 2027 BLAKE2B ab0672d343860d9f5b5127bf3462d71261a1ea32ddf1af10dc034d247d5709cdd51f935f952c55ed916301c5e2c2a6230487461cc207a317f199e11574162157 SHA512 ae6dd63fdda75ff22f5fbe288816634826378c06f9ac066a41148e08f69ee1260b62c8e60b55e8f021bf6add09516d0c650b9a50f9f5c92ea45fa9d6f90cf5de
-EBUILD urlwatch-2.23.ebuild 2226 BLAKE2B e31161870ad1cccec96f8523fc13db58e6e10e8cf3fecfaa0519026ebd4f6b108fa20469f2b603eeff277c07249571dd5a553956f95fb8678d1d6bca22484627 SHA512 6cc6fd3fe7c347b9242c21d77da9d53fac3d6e091b48a5cc7cb3212adb736a4a7ef4c6ad84112e7adfcadd9abef3e7040e6044b0ee28181c9c4c1441580d3b61
 EBUILD urlwatch-2.24.ebuild 2438 BLAKE2B 82a93e7644fd56438ace4c2863812598a6b23ad0fee624caffbffdcc2c55d7cbcad706f60289cb6070472d32b905e95e7379c8cb54d5e2c69a49918e4ab8d237 SHA512 81b2868e19712cb0c8d0d12c7254b8c5f8dc4b3da185a385e8f2207090b51571352ca8704a7b440f6eb7b7811d62c8c8c6ed373e0d3bb06555d04e55f6554f61
+EBUILD urlwatch-2.25.ebuild 2460 BLAKE2B b98459eb37bf24fd4383778c57150ecd3be9aef9ed7c37231377d55d4a6c4c5e69b03c0e70aec2a0fc7be5dd1294012c2fedd9ac5e098a95f7fa0eb7313ccab3 SHA512 4d24a38dab85e05951362c9403e520d36bae87ecb403638039a0a0308fc7ac7fc4372b7b5a68d0a512050bb4b02afb588a75e2771a9c0e15ed196d95235f8a6c
 MISC metadata.xml 541 BLAKE2B f4518dac79cafa9a225d87e125b1fbb3e090c7d3ea1d90a307d8b881379b809112fdc0bd3da6a229daf228aa5660fd130a048fefc63c9a19743987a4c94e528d SHA512 86cf47f19a24fb11c4b1a02b1fe9490a5c171c77b4237a1d0557ce553b1b97ef05f1849f4d745aa0c86f27b2c74f646898f94484ecf75848379b3a02f4157170
diff --git a/www-misc/urlwatch/urlwatch-2.23.ebuild b/www-misc/urlwatch/urlwatch-2.25.ebuild
index 42129d86b8d9..4132a3152dba 100644
--- a/www-misc/urlwatch/urlwatch-2.23.ebuild
+++ b/www-misc/urlwatch/urlwatch-2.25.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -20,13 +21,14 @@ RDEPEND="
 	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? (
 		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jq[${PYTHON_USEDEP}]
 	)
 "
 
@@ -35,21 +37,20 @@ 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]"
-		# 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"
-	)
-	epytest ${skipped_tests[@]/#/--deselect }
-}
+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]"
+	# Requires the pytesseract module
+	"lib/urlwatch/tests/test_filter_documentation.py::test_url[https://example.net/ocr-test.png]"
+	# 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"
+	# Skip code quality check
+	"lib/urlwatch/tests/test_handler.py::test_pep8_conformance"
+)
 
 pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
@@ -57,6 +58,9 @@ pkg_postinst() {
 			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/pushbullet-py; then
 			elog "Install 'dev-python/pushbullet-py' to enable" \
 				"Pushbullet notifications support"