gentoo resync : 28.04.2021

12 files changed, 22 insertions, 92 deletions

diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 923e345af92d..836015cab7f9 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/awstats/Manifest b/www-misc/awstats/Manifest
index 208ab89feba7..e13d9aa817cb 100644
--- a/www-misc/awstats/Manifest
+++ b/www-misc/awstats/Manifest
@@ -1,5 +1,5 @@
 AUX awstats-7.1-gentoo.diff 795 BLAKE2B c3c02a9086dc8067cc739ed4b180865aa1c68d5f6786b9a1d850a3c0314bdcb8abb1e3841229ae90cef3e1f6ba24a8262895c44d0b92faffb3f4c4100021e065 SHA512 09e46f32b31389cd1d98465c8b2578c37d5d4d601baf58eb8ed6811875743c3b19819d6820977a9aaace8d8f8c97be8f798fcbaa10f7ed0cb950a2f7f843754c
 AUX awstats-7.8-mime.patch 479 BLAKE2B 320b201daae7613e532123946f073107bf6096d924caa227463817308bcb6824788d683010031dc9ac5ffaaf65d4c169d49f43dd4d9d30d14697a15975835e85 SHA512 38ff55c99fa01ac52dac492e4153bcc2851e79ce3e1d1319c34a7695e66de9f4fff74739ce06e545fcc8ea3902a0325ff370471d04e136b92a6bef1dbba3095d
 DIST awstats-7.8.tar.gz 2938739 BLAKE2B 57c692aa935a4191d1cc1f3b34dd1a70a40eef880a3672dcd17472fe6bf447dd7b85a7752d94666d6f1a8dbdcc2eac4959a7f6a83a8bd538d0909ffcaedfd385 SHA512 2fd78e8c7eefb5c9ed39d8ee830ee8ad00b622b812ae40a84cb01c4fa653b9ab7822d1592313d7a8c4b8503d04dcba48b1775d33a629f1ac1278d2300eef931d
-EBUILD awstats-7.8-r1.ebuild 3015 BLAKE2B b7f76d10a96968b28aa8a560183d413699405eeba6bb732478e25f1af448bc0e8cba0ab6c207981b282cad1b54efb7c0292d308dac84bb6a1b9967161c6ed1d4 SHA512 4c68225a8f766e6f91053ef53b9065dcb2424a9739f93ecb256a990326472a3cebdbb2bbb683136bb47672540da7faf5f13b4fe638ca97108534516d5dd1b87d
+EBUILD awstats-7.8-r1.ebuild 2999 BLAKE2B 3c07cc4bab590270a3dfd0a03ca7fc23f18b079ecb3c8555a4c1fa5726435e4669ed43cc6d1c4e790dfdc44a6ad0a6f8c1aaa6f031649c06ad208e6db4520d2d SHA512 401b114b8981659e38d0402b542070d764fae077d8ad88e557c6ab873bfd05c7800341a8bbbefd60347a6311dbf56c04e79bd1443fe6d48ab70fbb0d49381853
 MISC metadata.xml 254 BLAKE2B 53495a638333fedaee2d8d838a705aaa610797eae56298aa35ad3c965af321b3d8e9b12643d1c3564f4232ca4a7ec44182ee7b35aada373750beee6b1c2a8a12 SHA512 b4674c7f9d0dc24c25846b3fe716415b648a61099b8d2f7eb099cf14f9a8f4670af4638349f953fe1b32b9d357911e533b72eaf4bbf14f54827512fd9bbb0ee8
diff --git a/www-misc/awstats/awstats-7.8-r1.ebuild b/www-misc/awstats/awstats-7.8-r1.ebuild
index 66748aa8bf71..eb1b99ea5e90 100644
--- a/www-misc/awstats/awstats-7.8-r1.ebuild
+++ b/www-misc/awstats/awstats-7.8-r1.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils
-
 MY_P=${PN}-${PV%_p*}
 
 DESCRIPTION="AWStats is short for Advanced Web Statistics"
diff --git a/www-misc/litmus/Manifest b/www-misc/litmus/Manifest
index 8009ba964f25..2a885339db5c 100644
--- a/www-misc/litmus/Manifest
+++ b/www-misc/litmus/Manifest
@@ -1,4 +1,4 @@
 AUX 0.13-autotools-neon-version.patch 344 BLAKE2B ece27a25656cb54a5eac255994fdd757c98840a39c4c215c44bb1b548eb3b5583b04d0bbe2feecec5a05fc0283f8f5ce6903894ed3bb94e57e20e6df825e36ab SHA512 ffc549b2c676a124bbb5a4d9df5ffe3178ac7186dafbad0cbae85b6092b6e204c9ac15e054084efd5eb5bf74620cedeaa88924c02c1f0861e9c258bae7ff9012
 DIST litmus-0.13.tar.gz 467532 BLAKE2B 509951d2751e32917f920fd37720dab215b1b81e6450ee96c5adaad22efd06ce781b80cb6acb363dda9e62ed9e08c2bab1869d24a4fd70f5f7bc337f3e112af4 SHA512 a1c04a17cbe4a17b5e0ed768017296256c9f234ae3f238f838f55064855b254246ba1d2e41b07145e1a9587698145b36b67e31488cfce817a9b5b119ee505b1e
-EBUILD litmus-0.13.ebuild 1581 BLAKE2B 095b887d7de2924e30705b9931bbf74c5809f02f302ceaab7bf7b808ea1754d3250ce4947c651d9336c0cda4aba71550a18eb4dbe0672a001185d087d9b6c997 SHA512 00a5813b6c2c476b705c654081577e286ed54fe983f33a6a478db8b216c0893e5671e443c273481d0fbb3bb1ddc3a074a59d332072205489202b5a8d29bbeeba
+EBUILD litmus-0.13.ebuild 1578 BLAKE2B c293e826677a9a1f0cd68ed969cff5c5af69aee5f99b2e51687f9f24ecf2b7b4daf4b9504d07bfbcaaff6e3ddb6cb396c682cfbe74ccb4cb900a7bc65960a186 SHA512 a05e0149648b14d00f0ba2c5ec7a80a3236b7195cd2b067d6c592bd67e67737b6836ff9ffcbbacf7f42c1edaed7a4752e3eb8117c3fe6a62a1ae8ab4261e070f
 MISC metadata.xml 699 BLAKE2B 4ebf57beed16e1e270450d1a6e7e5fcd1ad88df90df9581194eeea20269a90aedd50f93e3efc50324baf29345d427889bbb608ed8d03863b5faafa625cfd771c SHA512 8f8957df4156b158444cd8afcb478fb882e1500cddd897d01dd3a353849e542abd9f8b10bdf200c80531537444c4590091ed375fa3c6f3d2a88a9c5080ebf517
diff --git a/www-misc/litmus/litmus-0.13.ebuild b/www-misc/litmus/litmus-0.13.ebuild
index 4b14ebaafda9..a7cdc6362201 100644
--- a/www-misc/litmus/litmus-0.13.ebuild
+++ b/www-misc/litmus/litmus-0.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit autotools eutils
+inherit autotools epatch
 
 # TODO: FAIL (connection refused by '...' port 80: Connection refused)
 # We can't run tests that connect with the internet.
diff --git a/www-misc/mergelog/Manifest b/www-misc/mergelog/Manifest
index 78ab0749197f..399c8dba970c 100644
--- a/www-misc/mergelog/Manifest
+++ b/www-misc/mergelog/Manifest
@@ -1,5 +1,5 @@
 AUX mergelog-4.5-asneeded.patch 1106 BLAKE2B f125b2f5604202ddcbc03656c4086532672306d3d5780c65c816dd249e29ce5944d4a8da80a316344b881166a43215047159d511712f1dc3a2c855cf61ccf4b9 SHA512 88c6e44645b41d84e67e4973dede40e550ea64b8d98490eed4c55b8240e3cecbedcf6697b5b73264e5358f3c4eea11cf2534f9588c0bf638d288678e60f8f5fa
 AUX mergelog-4.5-splitlog.patch 13678 BLAKE2B 9d6a020d492edfacce955087e165254708547c800da25cb70d338ec190b7431473068e32fee3acb8798a6f0b09134af0f7668cf9ac01de5026fd84c999ac8348 SHA512 1d3b104e0ea27e41227cf903196a1cdbd4f362a85f9aabe95ea2a648dcc3db5378dc0a64c06b406237c88db91ac8cd63b73bce32de3a80bd44b14f5cf24de803
 DIST mergelog-4.5.tar.gz 39407 BLAKE2B ea51ab27a4a76e635b3a364854cb488ef5b88878a5cb5118443f14658661157c4a8cf601f945e8869614b0205ff71f89d8d8e0b80815a2671ba497e740d6d01a SHA512 f2259cb8981871c1f9d7cadc5414997789aa13eed0e18701673ffbddedc74954e137e282c1357cafaf515e18b39e256f890ec31568a305feefa1089a9347991f
-EBUILD mergelog-4.5-r2.ebuild 533 BLAKE2B 0798a4116a40aa1bdfc23a59ea9cca8a5ab05118b65f0a4ca0778816c05051e7b512db608bedfd67fee5b736ed7d6d46cc68bca844b19ddee02bd00a0d63b99f SHA512 e145086b30341f6dfa9407d1f426f093802e37b54e6deda5712da2f59e0b30986be093db505fede0f3bd0574d1fb07e4b5975fbc4a14f5eb70ff8b39c24bab3f
+EBUILD mergelog-4.5-r2.ebuild 526 BLAKE2B cf2c76ba76034cf83f83659e8874477c6e4ce0a306d690f06e90b9521b9c602570bc8aab257c4ba90cc163fd08b8fe0ab837bf01193a0ef1f345e8288660b693 SHA512 84a981efe32e62f6f4657dc72807c7e3ba024936f579cbe4becae5964146f013ee3443a642f08a6255006c994b32c1b2a8f2d8a1ac6beb45170fd2a46f1f1366
 MISC metadata.xml 588 BLAKE2B b1b0444cee23d8cb7dab856ca462529046683b0a3987f490fda2e0a4e5db796eda47e61f164f7af277d87f771657f3bdf62c400179f2fb97751628102a79be6d SHA512 8301f5e4da25f389e6d3c26bad59c5170c6f971f56b79cd62786cb6fba287e9b3d865f648c04ae4ab22a40fb2815ca69ad36afd917b92d0bab97cd75cbfa41ca
diff --git a/www-misc/mergelog/mergelog-4.5-r2.ebuild b/www-misc/mergelog/mergelog-4.5-r2.ebuild
index 74b4b2512937..f689153b358b 100644
--- a/www-misc/mergelog/mergelog-4.5-r2.ebuild
+++ b/www-misc/mergelog/mergelog-4.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,13 +9,12 @@ DESCRIPTION="A utility to merge apache logs in chronological order"
 HOMEPAGE="http://mergelog.sourceforge.net"
 SRC_URI="mirror://sourceforge/mergelog/${P}.tar.gz"
 
-IUSE=""
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="amd64 ~arm64 ppc x86"
 
 RDEPEND="sys-libs/zlib"
-DEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-splitlog.patch
diff --git a/www-misc/monitorix/Manifest b/www-misc/monitorix/Manifest
index 7f37a52c9803..05c394cca730 100644
--- a/www-misc/monitorix/Manifest
+++ b/www-misc/monitorix/Manifest
@@ -2,5 +2,5 @@ AUX monitorix 794 BLAKE2B f0e4eb70ff867711b749fbdda5150ef0733f9622fceaf8499600bc
 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.ebuild 2311 BLAKE2B 9e840d3269e3c519dcc9393af4eb717579e289c14c12bcf7a6da5c511eb77f30f1895170d17333f52838a57632f7c825d34b4363877c15e3f45a80fe422697be SHA512 20c901143fb4bcd06f230dca57d37c169ecdd785bf7073bae3600b30768c50cd6a081e7c768bc502d2ebccd298c2dfb372a743a3742f9fb4227db6dc78a0c7f2
+EBUILD monitorix-3.13.1.ebuild 2280 BLAKE2B 3fcd6d53fcc3dfeae025a1928548ed8e7355643c07fecc178fa3fa84beec9bc0b637cd9ad305d2a933339088094b8bafe175dec525fcc4f037acb38161bbf2df SHA512 1fdc81e80b92394ba5ebe1e5b38fe0dfb03f9a02276de26a4d2faface07f62ab2cc7457419d698c2f9a35ed67f599437994f511044d03e2b81b0863ab8544b08
 MISC metadata.xml 486 BLAKE2B 7c94f1d6a38beb17aac935fecf18677d03e2e5d022f0b1b9de344ffb0275869e26ae22bc5c1315643b973f750ce22392387afe636c568ae920b9230ab2f41b0e SHA512 435eb932b37370d190f8b8df5e527c7dda51e7fedd08eff9046e8cf92491ddb52e556d1b3a01e401b180413a96971d56fe2431ae04d76b013d5072506209d791
diff --git a/www-misc/monitorix/monitorix-3.13.1.ebuild b/www-misc/monitorix/monitorix-3.13.1.ebuild
index 61230025cd86..d063192776c3 100644
--- a/www-misc/monitorix/monitorix-3.13.1.ebuild
+++ b/www-misc/monitorix/monitorix-3.13.1.ebuild
@@ -77,7 +77,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "Optional dependencies:"
 	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
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() {