gentoo resync : 15.06.2021

7 files changed, 7 insertions, 91 deletions

diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 233427f5262c..b4a60857a4c6 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/urlwatch/Manifest b/www-misc/urlwatch/Manifest
index 8131bc5643d3..f258fdd251fe 100644
--- a/www-misc/urlwatch/Manifest
+++ b/www-misc/urlwatch/Manifest
@@ -1,8 +1,5 @@
-AUX urlwatch-2.17-fix-yaml.load.patch 675 BLAKE2B 39198576b888d72ab9a21a99430cc32e22a113104e54008301f6caa4065d0c143116e46ed217fd5661489f0759c07399e9ca4ad06d27ac781da8f5a84ef93552 SHA512 300742195fdfed34a39b22b724ae53b9ccaa27857250c91fa431a8270eeeebbfa3ce81b72f0482a5fbea1636aa5ec78a202757fce45a3b71edae4129c6cb756c
-DIST urlwatch-2.17.tar.gz 44178 BLAKE2B 46163b3305a50c3b5165da8f794c252aeb0a3581f16ba04cc1f0d920066accd02f7eba47718012e2ac0071f6bfa31019777a28840179a28a7fe365ae2e8f1d2c SHA512 635bca7e55641dd73447f5ec9ad429539decfaa8a1c19ab073c3bd46acfc518fa6012d855e0c37dd78654da28acf1446f580def611bcb85ae94fe13f567e3613
 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.22.ebuild 2030 BLAKE2B af4cd474d1ec3e54fc4b775959148703efc28e1acb523f096a4fdba5f65453ec735b9b37eed4ecfdc0c150f1ac7f3199f5e921c74121879e875cd5e76b194539 SHA512 92c0a3057b60dd24d36cbfbfa3a0ee3e0b577e18540649c67e2314b2f66caf98f8a492c1c0e85239bdf673ef2db20e4b83f927ce63a1236b3d6648321b1a159b
+EBUILD urlwatch-2.22.ebuild 2028 BLAKE2B 29c2150b76f1a657c37703a3dc593a408ee4ad8d6d4937517da45f89a27325cd8d883c387be8b0160cf4a2e12f91a1d0e8bc2282f3b9843e99264ebcfc8df8b4 SHA512 a79088a228028ffaed1f6c07d390bad9907f1c36d573139f516eadac2911d1d3472e35a968e3940aaa5a79a13697ca3c4c0381353e07b1de6f3e6c86e6c3d08e
 EBUILD urlwatch-2.23.ebuild 2259 BLAKE2B 8b0ab0f9a743c31bedd8fbbfbff4f910bdf73105cc8e7a58514b98288efb0c37c39151c050b83f233551e2fce4dad68703b413a2fadce882184d4dcf6886b0e6 SHA512 208d1772be17b1c38c6d2b7d6b954464baa40dc61955136d91a16228376e4499eb38a9832e2ca075797a93e2d04bdc40d94e264f51b4354d465325eade8f21bd
 MISC metadata.xml 540 BLAKE2B feb952d37175ef6a6ec17ae6ff1751d031cd14e3e8d98d5b6cdf44074c05068a1a6ce88b9447fdc0a8dec18f37f7d07232072ba81dd0ce6401a106e5e508cb92 SHA512 7c79bc952f7be46983f83c1f357f013df14d87f906df3a3e0f8690c32d296945729ebe9f95838d6a3c3c1e85b4fc8dde20b0ef12037d17967119e4cbaf652f2c
diff --git a/www-misc/urlwatch/files/urlwatch-2.17-fix-yaml.load.patch b/www-misc/urlwatch/files/urlwatch-2.17-fix-yaml.load.patch
deleted file mode 100644
index c8bd04ae932f..000000000000
--- a/www-misc/urlwatch/files/urlwatch-2.17-fix-yaml.load.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit d00041bacd6343cadf29c3d0a98817a7b9fda2a1
-Author: Louis Sautier <sautier.louis@gmail.com>
-Date:   Sun Apr 14 14:49:24 2019 +0200
-
-    Fix YAMLLoadWarning in tests
-
-diff --git a/test/test_filters.py b/test/test_filters.py
-index 3402616..da2393b 100644
---- a/test/test_filters.py
-+++ b/test/test_filters.py
-@@ -33,6 +33,6 @@ def test_filters():
-         eq_(result, expected_result)
- 
-     with open(os.path.join(os.path.dirname(__file__), 'data/filter_tests.yaml'), 'r', encoding='utf8') as fp:
--        filter_tests = yaml.load(fp)
-+        filter_tests = yaml.load(fp, Loader=yaml.SafeLoader)
-     for test_name in filter_tests:
-         yield check_filter, test_name
diff --git a/www-misc/urlwatch/urlwatch-2.17.ebuild b/www-misc/urlwatch/urlwatch-2.17.ebuild
deleted file mode 100644
index b1488b254b6f..000000000000
--- a/www-misc/urlwatch/urlwatch-2.17.ebuild
+++ /dev/null
@@ -1,63 +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} )
-
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-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="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pycodestyle[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( CHANGELOG.md README.md )
-
-# https://github.com/thp/urlwatch/pull/382
-PATCHES=( "${FILESDIR}/${P}-fix-yaml.load.patch" )
-
-python_test() {
-	nosetests -v test || 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/beautifulsoup:4"
-		elog "app-text/html2text"
-		elog "dev-python/html2text"
-		elog "www-client/lynx"
-	fi
-}
diff --git a/www-misc/urlwatch/urlwatch-2.22.ebuild b/www-misc/urlwatch/urlwatch-2.22.ebuild
index 32b0eebb11ae..fb04d721b518 100644
--- a/www-misc/urlwatch/urlwatch-2.22.ebuild
+++ b/www-misc/urlwatch/urlwatch-2.22.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
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/www-misc/xxv/Manifest b/www-misc/xxv/Manifest
index 9b039ea71912..2377021f8fc3 100644
--- a/www-misc/xxv/Manifest
+++ b/www-misc/xxv/Manifest
@@ -2,5 +2,5 @@ AUX xxv.utf8-v5 2006 BLAKE2B efaaee155d84782a756e81e23a60129698fa1ae4d20e6e534eb
 AUX xxvd-1.0.cfg 2257 BLAKE2B 16e83bc63415f658c1dca638b8ab8d7d62a3f5b64fa0d9d260482490da7ddd2b5524709cdca705c8999398dab74a719f9bf3f963159708e0598a4024ca8a0fe6 SHA512 b1507123e680b7766e07a1d45234f2769dc1bedb0a8a2eceb9162c82fb5f888c2963f9f432c6de4591da047ba48ac3ade1e2b0c67ddb7ed86d761fbb4f948646
 AUX xxvd-logrotate 367 BLAKE2B ede5967e1868dbd53eb81b6216598b7d15a890ed5914f4581b654bd5c0cd965475fe2837fb7640d68917c6c42de188e47cb840779995157e043b36f7fa63ba3e SHA512 b10918d478a42f90a9f24e3b358fc8af7fd8366146a42291ea6c5bed258414d834348dd58688f260aecc69c4f76af362c881ebd5a4abef52c1244310a8751c0e
 DIST xxv-1.6.1.tgz 992065 BLAKE2B 9c0b9d2575f412a677a84b1fe0417042f74c4ee4225181a14447e996a8fad46d0fdb4f5ada57fc02ff875be3a7602cf2e8976416b0fd5596b3adb1061ddc8f4a SHA512 e5171ea02d00d7c07d0faf5361a5261bf882d3c5a996b864593216a941c35f823b09431579341f43cf75f87dd42a1635275e8a24b393d407c83c7eb299095566
-EBUILD xxv-1.6.1-r1.ebuild 4651 BLAKE2B a1b1c144e8379335a750baa86c740fcce1a9b6df7dab135142ca8ae3767be2729853fa1ffd38241281f2c65e20ee8e4909e87e775dee008c5c7af640b66c2f74 SHA512 4653c16cef029e7599d59b6d5b725fa7e8d5cb70b0acbef987fc4ff794f055822bec91b23aa71fec42e709b00c78b98d028cd51e58209496997f90d312d68ca9
+EBUILD xxv-1.6.1-r2.ebuild 4656 BLAKE2B ba4adccf1b4fbb9825b8d6a2ae580be14951eb3aaff58b88ea93978fce4b7837354f5de8e2328abb4e9354d788558c88c9e285f935985f6206b019aa269098f1 SHA512 30c1221b34d0e6eb24c35d824bed80bb6edd81d4db12278bfde0e184c68f0f88d1d62ece1a674b2a4f42dbc0104c2473e4a0da045418074fa27e6cfd256de6c6
 MISC metadata.xml 354 BLAKE2B ff1cce0d07a97f0535fc1d6331f0f553fc37196aca898d6ebeec7199aa801e9c1f1143c785bc4aa019c22ac2ac3409f2792fa9d5bc559772a39804c394fdfd21 SHA512 f0bafb730bb9b1319320903c96e656a953a26ad1e2838f8c9e3c1ab8c3c3d5f035cf52c7f5178905693d1347d2eefd0c71ae731fb18e6119c4c71173c90e6812
diff --git a/www-misc/xxv/xxv-1.6.1-r1.ebuild b/www-misc/xxv/xxv-1.6.1-r2.ebuild
index d1bb93512081..13b7f874d3a9 100644
--- a/www-misc/xxv/xxv-1.6.1-r1.ebuild
+++ b/www-misc/xxv/xxv-1.6.1-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="5"
@@ -15,7 +15,7 @@ SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="-mplayer themes"
+IUSE="mplayer themes"
 
 RDEPEND=">=media-video/vdr-1.2.6
 	media-video/vdr2jpeg
@@ -35,7 +35,7 @@ RDEPEND=">=media-video/vdr-1.2.6
 	dev-perl/Encode-Detect
 	dev-perl/Event
 	dev-perl/Font-TTF
-	dev-perl/GD[png,gif]
+	dev-perl/GD[png(+),gif(+)]
 	dev-perl/IO-Socket-INET6
 	dev-perl/JSON
 	dev-perl/JSON-XS