gentoo resync : 22.01.2021

5 files changed, 14 insertions, 117 deletions

diff --git a/www-misc/buku/Manifest b/www-misc/buku/Manifest
index 43b92221f7be..40a9b890923c 100644
--- a/www-misc/buku/Manifest
+++ b/www-misc/buku/Manifest
@@ -1,6 +1,3 @@
-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-r1.ebuild 1685 BLAKE2B a3dcd4c3bc4a53e66afa51de5adc2ba0e376ed9f4795a55556196bd0fce70a123927b5e1c8fb03591dd88d8692ef1b709d444cf14063d702ebdcbf3d4d6ed6bb SHA512 e61b189abe6c478bd289f1e5039df009e79e5721fa115140289b36cda18208fe9d61e93c2a6a6b847f21329b89096a4c9793dbddcbf662fb7a792fdc7238d73d
-EBUILD buku-4.4-r1.ebuild 2588 BLAKE2B e73bc3332b66b556d990e5c4bf7443031c7083f74b251bedfb55583789ab10bfa9e73cd465b0e3cdcaea7448e455aeb819ee49f45fcd24e01051c1b5bba7d6dc SHA512 7ce393065b288beb12b9869f15e2f657674a051b84270fb1c970c2f96101c265bd4545c87a17d042b3c24d52fe3a4a454a8bfd3c68e5bc60f6e7bfefc88faebc
-MISC metadata.xml 555 BLAKE2B d79b07af4359005c7e280f4f0e0162e75fe69cd6f838b97aa74398627890fffbfe6ef1d67d731e8c547aa2a61ea8cb113a235aed7a769f9367db38ae2d37d494 SHA512 c3edc1739fa142f98a2c1793bd47085af2d24f07872daf579ed16102917dca8449f2af148e493e078718eea4e28f1831349c86fc10ae60e2f8de8326db1dedb6
+DIST buku-4.5.tar.gz 488913 BLAKE2B 29ed93fa9af4503f72a711889fbf17d86bcde1bc1abbfc88242c4ebd18f1c1a57077781eebdd79d9d993078d2f5b5883c9a0ec4fee94e37c0e7bfb727c5154d0 SHA512 7bbb598d5c970e8e594d58c0a18f9b85245d4a214c01d64b537a5ccaadab32c964521046b90754c2f2c721bf816dc7f4438cfeff3a7e7eec75ce958cc41dfa7d
+EBUILD buku-4.5.ebuild 2621 BLAKE2B 56969090f8f7c94f4d017b5a0d1812ab6f4af913808bfe30c2834324d2af34d3809164063dc01241c244e56e22185e39842f0b8c6559299c549447cea5c79e2e SHA512 2551b2c00bdc3201dca605b291987c7079fdae9f6461d9db5ba19f152296d16cc4e902cf6f565a1781fa1e34354adf927498243470a22cc160b26b7a271d5524
+MISC metadata.xml 555 BLAKE2B a867009ea23046f3c2e11a5687f4368e3456a7b2cb3bb3c03f8c552c62485120b6ff664266150696ebf1caea50b59df00727c2c9697d452b8ff2bf99a1be7731 SHA512 aee7256d7bfbc85d8e80bb579f75d9b54367ea500339049f293d07daab9cda2839954e5908b99817ab2225f1b4159333d70610127199e5ca0331280cf63eec12
diff --git a/www-misc/buku/buku-4.3-r1.ebuild b/www-misc/buku/buku-4.3-r1.ebuild
deleted file mode 100644
index 96a36a815879..000000000000
--- a/www-misc/buku/buku-4.3-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE="sqlite"
-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"
-
-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/flake8[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		>=dev-python/py-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/pylint-1.7.2[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		>=dev-python/pyyaml-4.2[${PYTHON_USEDEP}]
-		>=dev-python/vcrpy-4.0.2[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare() {
-	distutils-r1_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
-}
-
-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() {
-	# Explicitly enumerate tests to avoid tests that deal with bukuserver
-	py.test -v "tests/test_"{BukuCrypt,bukuDb,buku,ExtendedArgumentParser,import_firefox_json}".py" || die
-}
diff --git a/www-misc/buku/buku-4.4-r1.ebuild b/www-misc/buku/buku-4.5.ebuild
index 6ea730152354..105679cc5a95 100644
--- a/www-misc/buku/buku-4.4-r1.ebuild
+++ b/www-misc/buku/buku-4.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
@@ -11,7 +11,7 @@ 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"
+SRC_URI="https://github.com/jarun/${PN}/archive/v$(ver_cut 1-2).tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -19,8 +19,6 @@ 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}]
@@ -63,19 +61,20 @@ python_install_all() {
 python_test() {
 	local skipped_tests=(
 		# Disable tests related to bukuserver
+		tests/test_setup.py::test_bukuserver_requirement
+		tests/test_views.py::test_bmv_create_form
+		tests/test_views.py::test_bookmark_model_view
 		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
+		tests/test_views.py::test_tag_model_view_get_list_empty_db
 
 		# 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_add_rec_exec_arg
+		tests/test_bukuDb.py::test_load_firefox
 		tests/test_bukuDb.py::test_print_rec_hypothesis
+		tests/test_bukuDb.py::test_refreshdb
 
 		# Passes when called alone, fails when run from the suite,
 		# but only when the network is disabled
diff --git a/www-misc/buku/files/buku-4.4-fix-tests.patch b/www-misc/buku/files/buku-4.4-fix-tests.patch
deleted file mode 100644
index 0ef0f25228c3..000000000000
--- a/www-misc/buku/files/buku-4.4-fix-tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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/buku/metadata.xml b/www-misc/buku/metadata.xml
index 074e77061ae1..720bd83b95be 100644
--- a/www-misc/buku/metadata.xml
+++ b/www-misc/buku/metadata.xml
@@ -14,6 +14,6 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">jarun/Buku</remote-id>
+		<remote-id type="github">jarun/buku</remote-id>
 	</upstream>
 </pkgmetadata>