gentoo resync : 16.09.2020

12 files changed, 129 insertions, 19 deletions

diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index d9e8fecbaab0..24806d6594b7 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/buku/Manifest b/www-misc/buku/Manifest
index 186bf2e0e373..15a6a5a0a194 100644
--- a/www-misc/buku/Manifest
+++ b/www-misc/buku/Manifest
@@ -1,3 +1,6 @@
+AUX buku-4.4-fix-tests.patch 1351 BLAKE2B 470f521fb2b38bfa0ba54abab1937d046f0526154ff6e5ee131c45b32ef81da63bf4f3f20f1c7158d98b6470fc3264711735512bcbf3a031017ef8927755446d SHA512 e734928264f8c84bedaa903556d9a509d7f12d5ec289fd5c8c9022fb0469d9de80dcb81ab63af24cf7bc2798be46fd7327ce2830c78adaa12c4c4ff9cfc00e29
 DIST buku-4.3.tar.gz 264480 BLAKE2B 8bddf640512e5741f80bb5bc073208d843cac32d3c3ade0bdf36241e93d6c81d47238ad03c651e924226933efa572e65d9a4c86f861acda68935c9e96d6e6fb4 SHA512 eabf45b1cc1700b20f2a95baf14940f49e2a2ad51aef0f870c488e67cb07fb110916d93037830cd83572317c5d0a8b05c0a5732f105face2a14facf6af02b690
+DIST buku-4.4.tar.gz 273207 BLAKE2B bff849f03ba6b2f8779a9445da26f64875ccc6a7cb1434cba51237742a7b9968d302ee0dd9f87fd2857922660fc304d07012a962c080704d7d99312e8672e4d0 SHA512 5ccd3e72b2256d4d3daf007ffc9279c9958eec6a5baa913cb31bf97d978db227e28311f882a930da737c002ec0750ee9f8cf0f7584e639154398ba5d486bd8ba
 EBUILD buku-4.3.ebuild 1661 BLAKE2B f319288aa0be9f9f9cf4e7e74fd0684001acb83d582fc70632543e42290e5dac607bfec7f6c6da845cc3b19bc3a073ad4b2805b2e01a231e4bf7cfee6f7ba878 SHA512 3c07c242385086450dd56e36b173c27e426c6fc923f43c39188596dcf5894c2dcb6ebe9448c2721d05412ca96fc06f70227b1d81eb5eaea9a7047eda3a86270f
+EBUILD buku-4.4.ebuild 2564 BLAKE2B 0904c7582b7e72140108266acb83eb12416f99e9961780608f4d27f54cdfeea783c98a42c0b1e0dd497acd659808aa0677885961748fc47f30dae81d9dd2e6f0 SHA512 7fd63e9218aa2bdfcff758af94efbb78ed0b091b317db35fa9a8027bdf4ab6e709795c67c0c1bc89a9341a526ba67639507531d7c74bc1f6e7eb18d34d740fc5
 MISC metadata.xml 555 BLAKE2B d79b07af4359005c7e280f4f0e0162e75fe69cd6f838b97aa74398627890fffbfe6ef1d67d731e8c547aa2a61ea8cb113a235aed7a769f9367db38ae2d37d494 SHA512 c3edc1739fa142f98a2c1793bd47085af2d24f07872daf579ed16102917dca8449f2af148e493e078718eea4e28f1831349c86fc10ae60e2f8de8326db1dedb6
diff --git a/www-misc/buku/buku-4.4.ebuild b/www-misc/buku/buku-4.4.ebuild
new file mode 100644
index 000000000000..a626d1b80273
--- /dev/null
+++ b/www-misc/buku/buku-4.4.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Powerful command-line bookmark manager"
+HOMEPAGE="https://github.com/jarun/buku"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}/${P}-fix-tests.patch" )
+
+RDEPEND="
+	>=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/attrs[${PYTHON_USEDEP}]
+		>=dev-python/click-7.0[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		>=dev-python/py-1.5.0[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-4.2[${PYTHON_USEDEP}]
+		>=dev-python/vcrpy-4.0.2[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Remove support for bukuserver - complex depgraph which isn't all
+	# sufficiently packaged in Gentoo
+	sed -ie '/console_scripts/s/,.*/]/' setup.py || die
+	sed -ie 's/.*bukuserver.*//' tests/test_views.py || die
+	sed -ie 's/.*flask.*//' tests/test_views.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/zsh/site-functions
+	doins auto-completion/zsh/_*
+
+	newbashcomp auto-completion/bash/buku-completion.bash "${PN}"
+
+	doman buku.1
+}
+
+python_test() {
+	local skipped_tests=(
+		# Disable tests related to bukuserver
+		tests/test_views.py::test_load_firefox_database
+		tests/test_views.py::test_tag_model_view_get_list_empty_db
+		tests/test_views.py::test_tag_model_view_get_list
+		tests/test_views.py::test_bookmark_model_view
+		tests/test_setup.py::test_bukuserver_requirement
+
+		# Broken with network-sandbox
+		tests/test_bukuDb.py::test_load_firefox
+		tests/test_bukuDb.py::test_add_rec_exec_arg
+		tests/test_buku.py::test_network_handler_with_url
+		tests/test_bukuDb.py::TestBukuDb::test_tnyfy_url
+		tests/test_bukuDb.py::test_refreshdb
+		tests/test_bukuDb.py::test_print_rec_hypothesis
+
+		# Passes when called alone, fails when run from the suite,
+		# but only when the network is disabled
+		tests/test_bukuDb.py::test_delete_rec_index_and_delay_commit[1-True-False]
+	)
+
+	# tests/test_server.py is bukuserver tests, ignore it
+	pytest -v --ignore tests/test_server.py ${skipped_tests[@]/#/--deselect } || die "Tests failed with ${EPYTHON}"
+}
diff --git a/www-misc/buku/files/buku-4.4-fix-tests.patch b/www-misc/buku/files/buku-4.4-fix-tests.patch
new file mode 100644
index 000000000000..0ef0f25228c3
--- /dev/null
+++ b/www-misc/buku/files/buku-4.4-fix-tests.patch
@@ -0,0 +1,34 @@
+Upstream: https://github.com/jarun/buku/pull/462/commits/9ecf8857d74f51666ba2ea40344c8ba99accccb8
+
+From 9ecf8857d74f51666ba2ea40344c8ba99accccb8 Mon Sep 17 00:00:00 2001
+From: rachmadaniHaryono <foreturiga@gmail.com>
+Date: Thu, 6 Aug 2020 14:52:31 +0800
+Subject: [PATCH] fix: test: delete_rec
+
+---
+ tests/test_bukuDb.py | 6 ++----
+  1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/tests/test_bukuDb.py b/tests/test_bukuDb.py
+index 7e798b3..8b56331 100644
+--- a/tests/test_bukuDb.py
++++ b/tests/test_bukuDb.py
+@@ -936,16 +936,14 @@ def test_delete_rec_on_non_interger(index, low, high, is_range):
+ 
+     for bookmark in TEST_BOOKMARKS:
+         bdb.add_rec(*bookmark)
+-    db_len = len(TEST_BOOKMARKS)
+ 
+     if is_range and not (isinstance(low, int) and isinstance(high, int)):
+         with pytest.raises(TypeError):
+             bdb.delete_rec(index=index, low=low, high=high, is_range=is_range)
+         return
+     if not is_range and not isinstance(index, int):
+-        res = bdb.delete_rec(index=index, low=low, high=high, is_range=is_range)
+-        assert not res
+-        assert len(bdb.get_rec_all()) == db_len
++        with pytest.raises(TypeError):
++            bdb.delete_rec(index=index, low=low, high=high, is_range=is_range)
+     else:
+         assert bdb.delete_rec(index=index, low=low, high=high, is_range=is_range)
+
diff --git a/www-misc/litmus/Manifest b/www-misc/litmus/Manifest
index d88c9d7327a7..7f2535ee1153 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
-MISC metadata.xml 750 BLAKE2B 99476220901ddc365659ec57e10985b27782e98a234df51fcac2682c10eb5a8b0723987d7a224df44d68c3a21d487f3ac206f9d34d4958767f01cae48a1d9fa8 SHA512 d6973143e28fd6462a846248c48d82f88ae11d93286e4d4499cf6aa9d186e816057b4d93f3a2b1e4104e2baab5b590ab1321ac8e971d1d4f556d3e221cdba7bb
+MISC metadata.xml 669 BLAKE2B 3ad98886cfd15316e0c93a0978510a39385dba76fd3a9780299cfeb87406fb145620435b2d7b0f6cac401eb979b77e72910ee81ea1ab68da57fad6401a4a7361 SHA512 a8685a079bfd09d61d5ad0c1e73b53c482f9408428f9de65abb9b6c35c23407d11d247f609b3b53c03cd21291d2bed6b02d943022084cf2e67262a53a403b619
diff --git a/www-misc/litmus/metadata.xml b/www-misc/litmus/metadata.xml
index 368745c5187e..0ca40bd7e0de 100644
--- a/www-misc/litmus/metadata.xml
+++ b/www-misc/litmus/metadata.xml
@@ -9,7 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription>WebDAV server protocol compliance test suite</longdescription>
 	<use>
 		<flag name="libproxy">Support for automatic proxy configuratino management through <pkg>net-libs/libproxy</pkg>.</flag>
 		<flag name="libxml2">Use dev-libs/libxml2 to parse XML</flag>
diff --git a/www-misc/urlwatch/Manifest b/www-misc/urlwatch/Manifest
index 41a6730214ca..4345d0606fd1 100644
--- a/www-misc/urlwatch/Manifest
+++ b/www-misc/urlwatch/Manifest
@@ -5,5 +5,5 @@ DIST urlwatch-2.18.tar.gz 48268 BLAKE2B e595a6ed27637463f14f92ecafd123eb0c7cef71
 DIST urlwatch-2.21.tar.gz 126235 BLAKE2B 9e0f39e51e413355974ce886e019eb86dd07fb9a75c02c5c711ccdbba573c2e6b218cf11b42c714172ad00288ea0219a079fd9b8016d33c29f087537d160e80d SHA512 30d7312c72d839e8ef681a11065f82c2611b650ab1b9b9a33e718bb791712674afb31e4b2e6da97038379fb8cc4ae5bc58b4d0ee6a26c424cba01898b56566b7
 EBUILD urlwatch-2.17.ebuild 1650 BLAKE2B 01abaf115bbfb7ae572ae850505fd8b17ceb098f5ad4c11e578ec0ac554f77cb4aa689d8fb278028c6841520eb614983beb693c329cca202697e049b465df968 SHA512 b64a3a26d4a0909b85e2316b3e5d79876cb256d3f1be2ec8b820eca9f52fff2304622dc7d69d75c95e587563362fee18b06b8a15a986543893db63080ae5aab1
 EBUILD urlwatch-2.18-r1.ebuild 1811 BLAKE2B 9a42617e89c5a88cdc081b069de209455b9b382de2652493a7990c2dddf6545b8e9e58da65553c4aa64917e2797ee6f50d1e2b061a5f27e494512139d65d8446 SHA512 654098c0d31c1feffb0edf1970f59ab1cfd9b806fd1478aaebc7bfb96486c21655e1db176496de8bebbf239f4a331c31ae362258a79191ba3987f262d8fc7f3c
-EBUILD urlwatch-2.21.ebuild 2121 BLAKE2B 05e9128f1bff22de0cb9b74c15686e4506c4b3c76b7ac589a26f6d8f387c2182c6e39da167ac75e4af6e9d7e800d5abb843fb350dd41a22c9eaf60ce92bdbb41 SHA512 1be7c7c48a36e0866da80ff519044db1ac9fb46af3c970b5affa6d8724657284111a151d322c066d1817a1f5992ef826d30a6c828da93bd1de55ec92557c1880
+EBUILD urlwatch-2.21.ebuild 2204 BLAKE2B adf00db03d43268fe42f3ea293b3d578d46892955a631a1ce0611013a2bd6a5e0533ad780a67632725658b0ddbebc786972edbb0a8899642b26153e9ff1cdc8d SHA512 3fc443fc74482a67aee3a4435ff0f265ff07eac808479e7f997323b721ae19b65958c242a78cdb23b67c4b6427eb8fae3f6803340ba5c995d1e4cbfc7ce21def
 MISC metadata.xml 540 BLAKE2B feb952d37175ef6a6ec17ae6ff1751d031cd14e3e8d98d5b6cdf44074c05068a1a6ce88b9447fdc0a8dec18f37f7d07232072ba81dd0ce6401a106e5e508cb92 SHA512 7c79bc952f7be46983f83c1f357f013df14d87f906df3a3e0f8690c32d296945729ebe9f95838d6a3c3c1e85b4fc8dde20b0ef12037d17967119e4cbaf652f2c
diff --git a/www-misc/urlwatch/urlwatch-2.21.ebuild b/www-misc/urlwatch/urlwatch-2.21.ebuild
index 890f051e65f0..72f069acf850 100644
--- a/www-misc/urlwatch/urlwatch-2.21.ebuild
+++ b/www-misc/urlwatch/urlwatch-2.21.ebuild
@@ -34,6 +34,8 @@ BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/pycodestyle[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 	)
 "
diff --git a/www-misc/vdradmin-am/Manifest b/www-misc/vdradmin-am/Manifest
index 69162daa2eba..0c3c63d52f2d 100644
--- a/www-misc/vdradmin-am/Manifest
+++ b/www-misc/vdradmin-am/Manifest
@@ -10,4 +10,4 @@ EBUILD vdradmin-am-3.6.10-r1.ebuild 4745 BLAKE2B ae6dcfccc5c4ee3bb42f860cb576dc9
 EBUILD vdradmin-am-3.6.10.ebuild 4768 BLAKE2B cbddb51256653c55a36ffbfab055bf6deb93eba83b1ccafa01c98bd4d8e0237a6b0cf441894281e90d05839098384193666ee9b5a650b87d928cbf420d1f0308 SHA512 cbfe87316898d2cafd01dfb8f3bd681310a80383061c9966d0fc0a246a19cbd1894f7904a2ff94280e17dc148ec1b48c74e71a5475aaa758dacc46f00330b828
 EBUILD vdradmin-am-3.6.9-r3.ebuild 4730 BLAKE2B bdc97dd0b5be9bbf0977c9fd687c9260c14831278e43dbb2ea26a00cb4f494b48ba5571a03b3e049340d381df6beb2891b5c62c9752e0e6dacdda5cf5df72e0a SHA512 69a1ce6c895f45b2b738375bcf14501fb1771f72fbf794b99019398599ed9d553402abb17e7488822cf847440939afa644ab7ce81fdd9d21a2971a91c01d849a
 EBUILD vdradmin-am-3.6.9.ebuild 4315 BLAKE2B b69fc3e119c2ed3eaf70898515b9612012ab3fbd68395eb9c50b59dc8904293f3fd83988db6f0f6d97f47641f0b85787a01547d566dd26ad9b60f7024481c407 SHA512 1ab55053c9eefd90ca28a5cd7659e6da9cb56c1178a1fffff7e7b9a111ec8b1b0ad3631d29c0206c6ddf1996b2ccd7265b62ef5621269056d566930f063499c3
-MISC metadata.xml 644 BLAKE2B cc2a5a6a3850a15bbb5188a1d08f9496df43dc0a964c71cad73ff3cadaf9e4c629bdee2e80841540a0ee087f3f42c4bfd9feea53a0e0ec5e04e853ada394b5f9 SHA512 a51923afa708144a4ee6ea9b5f5ee08b90c69840218979a855f5021f2ea351838206c2d2bd6f9be52a61884ce4da3990630672d85e2a077b504351ddb202422f
+MISC metadata.xml 399 BLAKE2B a95fbcee2ab7afdea9ec9ce42107fad106c32091ae9f07ed643db2584dd1ba20ce215b3409e4ba19af67bfac565fa2136ee56e2847bc3873ffc14d560b1988c4 SHA512 89baa05100ebab55a1c12f5156f482f152f0bde04b39ebcf584b64694bcc27f1182dec6a2813867b2cce450bc1e562cbb15460f77982d7c5be0e83807181e555
diff --git a/www-misc/vdradmin-am/metadata.xml b/www-misc/vdradmin-am/metadata.xml
index 3213a8bef936..692eb1a3b640 100644
--- a/www-misc/vdradmin-am/metadata.xml
+++ b/www-misc/vdradmin-am/metadata.xml
@@ -5,13 +5,6 @@
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
 	</maintainer>
-	<longdescription lang="en">
-		To program and steer central service over a Browser the VDR 
-	</longdescription>
-	<longdescription lang="de">
-		Zentraler Dienst um ueber einen Browser den VDR zu programmiern
-		und zu steuern.
-	</longdescription>
 	<use>
 		<flag name="vdr">
 			Support for media-video/vdr.
diff --git a/www-misc/xxv/Manifest b/www-misc/xxv/Manifest
index f80042b3d39c..9b039ea71912 100644
--- a/www-misc/xxv/Manifest
+++ b/www-misc/xxv/Manifest
@@ -3,4 +3,4 @@ AUX xxvd-1.0.cfg 2257 BLAKE2B 16e83bc63415f658c1dca638b8ab8d7d62a3f5b64fa0d9d260
 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
-MISC metadata.xml 599 BLAKE2B 4efc53df48a3ba3a87898677c5d1b3b06d91b8b0f2c3c99de2eccc52ff13cfca8d4f4e9af9a0ab511a3cd787c4dce7f51a170d6a5c49458eb56f9d3741f4cd92 SHA512 fc3d162151833e5c17fcf90d6b4843e5c8729a7dc55eee0f6340750b89ad550231545751da5bafff12929d48a367cadfa1bb991dc389dac7bea747991174d4c0
+MISC metadata.xml 354 BLAKE2B ff1cce0d07a97f0535fc1d6331f0f553fc37196aca898d6ebeec7199aa801e9c1f1143c785bc4aa019c22ac2ac3409f2792fa9d5bc559772a39804c394fdfd21 SHA512 f0bafb730bb9b1319320903c96e656a953a26ad1e2838f8c9e3c1ab8c3c3d5f035cf52c7f5178905693d1347d2eefd0c71ae731fb18e6119c4c71173c90e6812
diff --git a/www-misc/xxv/metadata.xml b/www-misc/xxv/metadata.xml
index 7a140a4e8658..c0f28d75383c 100644
--- a/www-misc/xxv/metadata.xml
+++ b/www-misc/xxv/metadata.xml
@@ -5,13 +5,6 @@
 		<name>Joerg Bornkessel</name>
 		<email>hd_brummy@gentoo.org</email>
 	</maintainer>
-	<longdescription lang="en">
-		To program and steer central service over a Browser the VDR 
-	</longdescription>
-	<longdescription lang="de">
-		Zentraler Dienst um ueber einen Browser den VDR zu programmiern
-		und zu steuern.
-	</longdescription>
 	<use>
 		<flag name="themes">Enable more themes via
 			<pkg>x11-themes/xxv-skins</pkg></flag>