gentoo Easter resync : 12.04.2020

6 files changed, 71 insertions, 153 deletions

diff --git a/www-misc/buku/Manifest b/www-misc/buku/Manifest
index dd31dcc125d8..60403402ad47 100644
--- a/www-misc/buku/Manifest
+++ b/www-misc/buku/Manifest
@@ -1,7 +1,3 @@
-DIST buku-3.5.tar.gz 93634 BLAKE2B 55c4b50b3bf8121c116554613768cd836080b363d702469eb2f76349c26d8d6246f73746248123030c5657006e09a9f72242354ce3af20d93b845f1870929bbc SHA512 b9f70665c83033ca030302e805ee051a524b2f0decae6c99ad54749b4a4bc91ae8261976018741361489525f359ea71c01ddb3e2d827ab9a052fb0acc98be8ed
-DIST buku-3.6.tar.gz 92012 BLAKE2B a92f45810acfb11493ca4c0ff75c57b81064627dea632bdf55ab5e33618e2721163ba0dcaa95d8cbec579605bc714d24ef894de10f4a10f3bf6ef5eb5aa42cc3 SHA512 77fabec93e85d6b6d5dbc0a3c4d095f26093f1d86aadb2a3c961a3947ac1c59acac69c94f732d30daec9943728e35d5e08bede1f0448c02d2db9136fe426186f
-DIST buku-3.7.tar.gz 98970 BLAKE2B 7227b5fb632d9ec92ef236d1889f2ba0872d67d2c3cfb302beab48b03e8d62a762d02e517014d5041a9f79deab74d0f5ceca12c315eb77922f73d359b58a48b5 SHA512 c515e11686aa8888231ffc8c1d6ec29d6143f1714eacdf640d8d3d3fa3fd469e111073762a3ba831dd673d63034afe3db181ec66501c18165e8ddd97cbc57c82
-EBUILD buku-3.5.ebuild 1073 BLAKE2B 1c049b74a55b14564c007e81eee114bc73e369c357d71204b49682643f5945fb3fc17eed8bca0ae0ec884b596162182480d3223de4c904177b2edf908e132aca SHA512 5ce31001fcba741fb45a88ffe77bd84113940db050344b3a333762405287d92fc7f35e006e6e079ae08aab974e6674496456d03df322f4161ed22ed1b0bff649
-EBUILD buku-3.6.ebuild 1073 BLAKE2B 1c049b74a55b14564c007e81eee114bc73e369c357d71204b49682643f5945fb3fc17eed8bca0ae0ec884b596162182480d3223de4c904177b2edf908e132aca SHA512 5ce31001fcba741fb45a88ffe77bd84113940db050344b3a333762405287d92fc7f35e006e6e079ae08aab974e6674496456d03df322f4161ed22ed1b0bff649
-EBUILD buku-3.7.ebuild 1026 BLAKE2B 6914875fa9e316204b649753816d9b244b0dd923c4f88bd3dd0eb151a3bede8ce230b28682653845b67cbd68840c1c4c58004e775ff4fb66bb3caf099997825c SHA512 388db4d1645d9819009734867350716de9b2ff27e85ef94d327a31df6a6c7f2492211be1c89e099afe68a960bac6c65d136c8cea4a357c058b8baf5d4ccc3758
-MISC metadata.xml 441 BLAKE2B 93ab0c34611cf0762ce76f03634d649ab3a7c0d9c3bdbcdcbd3dad1f228f72b522df12eae7731689d7848a7ad647330bfc26202fd8099ac57e98ce73bf1bf6cc SHA512 5f00313957370e1b01d486b6712b232b33bc408884a627df3ba337197208c08cdb8c334699993b65afb2ff598ca7c7c857622442dd46bcd8e3411493b6599f7b
+DIST buku-4.3.tar.gz 264480 BLAKE2B 8bddf640512e5741f80bb5bc073208d843cac32d3c3ade0bdf36241e93d6c81d47238ad03c651e924226933efa572e65d9a4c86f861acda68935c9e96d6e6fb4 SHA512 eabf45b1cc1700b20f2a95baf14940f49e2a2ad51aef0f870c488e67cb07fb110916d93037830cd83572317c5d0a8b05c0a5732f105face2a14facf6af02b690
+EBUILD buku-4.3.ebuild 1661 BLAKE2B f319288aa0be9f9f9cf4e7e74fd0684001acb83d582fc70632543e42290e5dac607bfec7f6c6da845cc3b19bc3a073ad4b2805b2e01a231e4bf7cfee6f7ba878 SHA512 3c07c242385086450dd56e36b173c27e426c6fc923f43c39188596dcf5894c2dcb6ebe9448c2721d05412ca96fc06f70227b1d81eb5eaea9a7047eda3a86270f
+MISC metadata.xml 555 BLAKE2B e600a84c8483017dfd224fd304273ce67f2620c89dac8d3810475d2c31b298fbde7a28460e3fa5151a576503f55a7ce2d9985237638abc04217f54711b4f5aa1 SHA512 53f342ebcf730e825e00219b4ea9d6ccd53b5a9fe3e0dd568327163f7ac0511c83755c32a4fb069880eb624e024d17daf2fe6413b6cf384a16ef90413143fb0d
diff --git a/www-misc/buku/buku-3.5.ebuild b/www-misc/buku/buku-3.5.ebuild
deleted file mode 100644
index e563bc99f5a3..000000000000
--- a/www-misc/buku/buku-3.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-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 -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.13.1[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/py[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-catchlog[${PYTHON_USEDEP}]
-	)
-"
-
-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() {
-	py.test -v tests/test_* || die
-}
diff --git a/www-misc/buku/buku-3.6.ebuild b/www-misc/buku/buku-3.6.ebuild
deleted file mode 100644
index e563bc99f5a3..000000000000
--- a/www-misc/buku/buku-3.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-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 -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.13.1[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/py[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-catchlog[${PYTHON_USEDEP}]
-	)
-"
-
-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() {
-	py.test -v tests/test_* || die
-}
diff --git a/www-misc/buku/buku-3.7.ebuild b/www-misc/buku/buku-3.7.ebuild
deleted file mode 100644
index dc409e690898..000000000000
--- a/www-misc/buku/buku-3.7.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-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 -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.13.1[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/py[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-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() {
-	py.test -v tests/test_* || die
-}
diff --git a/www-misc/buku/buku-4.3.ebuild b/www-misc/buku/buku-4.3.ebuild
new file mode 100644
index 000000000000..6dcf64f9dd50
--- /dev/null
+++ b/www-misc/buku/buku-4.3.ebuild
@@ -0,0 +1,64 @@
+# 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"
+
+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/metadata.xml b/www-misc/buku/metadata.xml
index e3171793d0f6..dfaeb72ad86a 100644
--- a/www-misc/buku/metadata.xml
+++ b/www-misc/buku/metadata.xml
@@ -5,6 +5,10 @@
 		<email>davidroman96@gmail.com</email>
 		<name>David Roman</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>jchelmertt3@gmail.com</email>
+		<name>John Helmert III</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>