Various updates

2020-04-29 11:58:11 +02:00 · 2020-04-29 11:58:11 +02:00 · 6eefb56cb3
parent 0ebebf9067
commit 6eefb56cb3
10 changed files with 206 additions and 78 deletions
--- a/dev-python/pystray/Manifest
+++ b/dev-python/pystray/Manifest
@ -0,0 +1,2 @@
+DIST pystray-0.15.0.tar.gz 22184 BLAKE2B 0c14cda53efa1eed5154794dc0ac1aa2197a6d8075cefaac7142fc22b2b97bc6a02ecf744e1dab2d87ec79e1bb3cdd0d45a5da7412d652c5999619c3e4929d11 SHA512 1edd4be9b42e5cd65683cfc016a4bbaf42823fed614f82e14dca4ca4335783fa2cf5b13eab2c41306b1f47d54d61361b825c474745fd36363643dfc2e3eedc05
+EBUILD pystray-0.15.0.ebuild 676 BLAKE2B 2ce2e965681f07d4d583dfb12dba6479399e4373adec94e3feb2a9d449def41501c620f079d61ddf28fa049fe2bbfb349466c7c0f7e696e6f3ceed3f1bfa565b SHA512 a77ddd86ac5764dbb49de50340f9c30e3a10255b42fb54059a8f12569cca7082900fff9afa1062cb53ca375cdf789a68d7f4113cffdab037600d0d4273ed4a05
--- a/dev-python/pystray/pystray-0.15.0.ebuild
+++ b/dev-python/pystray/pystray-0.15.0.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy )
+
+inherit distutils-r1
+
+MY_P="path.py-${PV}"
+
+DESCRIPTION="Python library to create a system tray icon"
+HOMEPAGE="https://pythonhosted.org/pystray/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+
+RDEPEND="
+	dev-python/pillow
+	>=dev-python/python-xlib-0.17
+	dev-python/six
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.3.1
+"
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@ -1,3 +0,0 @@
-DIST tempora-1.8.tar.gz 12212 BLAKE2B 948ce0887efa4008304688d879a9c020eb94646d976832172073162c43e507963d9ff4f4fa0d6afd1bcc0dd0808b909649b27d3240fde6d9e80744d11bc8c022 SHA512 cd0a913990984f0cfe269c87cdcd80495a79df0479feed3c41c03830a19cb748b92ec71c6b586e18327a9e559d4d9540c073d38088dc95b3fb2b03e127052e3f
-EBUILD tempora-1.8.ebuild 1281 BLAKE2B dce9d5716c5760c16b44f593f10527b09ffe90147087780b80142b7db4162ce5d8da6a03ae0325da234a58b302096c4e7bfacf8c7bc83c0373e99393378a29a7 SHA512 a9266c5e3581c13b072f986bff2923c102481f983648ed26311670d0ce5a6dddd7f4f651ed19c2588ae6abada87e1f3f75886d6652d5d12f56f564284f894d87
-MISC metadata.xml 638 BLAKE2B c86883f938a4779097001ac26dc998a900d39599a930fd5682fca2002f93bc6f3f8b8edb0da06476751ef32fda0ded0641ba12d120919b32bebe2843abca8f4d SHA512 06c699b11df110494a9714a8784042d45834ce647286e57c58831ce036a604f415c7de511901bbff1e9d10a114a2fc6f4ce5fd71dc72ec9cdbe856a93ebd9507
--- a/dev-python/tempora/metadata.xml
+++ b/dev-python/tempora/metadata.xml
@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>sautier.louis@gmail.com</email>
-		<name>Louis Sautier</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">tempora</remote-id>
-		<remote-id type="github">jaraco/tempora</remote-id>
-		<bugs-to>https://github.com/jaraco/tempora/issues</bugs-to>
-		<changelog>https://github.com/jaraco/tempora/blob/master/CHANGES.rst</changelog>
-	</upstream>
-</pkgmetadata>
--- a/dev-python/tempora/tempora-1.8.ebuild
+++ b/dev-python/tempora/tempora-1.8.ebuild
@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Objects and routines pertaining to date and time"
-HOMEPAGE="https://github.com/jaraco/tempora"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-# The calc-prorate binary used to be part of jaraco.utils
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	!<=dev-python/jaraco-utils-10.0.2
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-}
--- a/net-misc/flexget/Manifest
+++ b/net-misc/flexget/Manifest
@ -13,6 +13,7 @@ DIST FlexGet-2.21.14.tar.gz 6174703 BLAKE2B 40d95e3dc3166bbddd6e533095cea92cfd92
 DIST FlexGet-2.21.21.tar.gz 5020038 BLAKE2B d220d45438e7433575cb47483ea5597a92b708c25535feaa227e1712cb103d47618147f7068eca3475b4fcacb9d2ec26da5124eea070c92ffc50b030023aa1b4 SHA512 53a576d958190ba824bbf96fb31a0f433a28413599b2bb0c64e2236512ddc52e961094cb78259dafb3aae6341104dd5a6cea7e391eac6b30b6e86e41781f8120
 DIST FlexGet-2.9.18.tar.gz 2637431 BLAKE2B 78253e2ae95193488715c7c5e5d048b7abb98c1bd2399dc5b77f1e1d0795b52f3ce35074c53c23a0200fb3d4e3b186a87c7b6f88b51bf2db71719e636533400a SHA512 3ae7d407d31850aa4f003e257c3c41b11658d1ab13ca3f11476fe976fd6b16314410c3b7d441a4b66dc987618deb62ec703e1e9e81d34ca7344a6674488a8b57
 DIST FlexGet-3.1.10.tar.gz 9771981 BLAKE2B a023a9281a73fb0040c9d28fece50696a884182b53d52599f0ee4539305174e72bb123e15df83d0f756897e0ce5ad245071786667250dda6198a86509716919e SHA512 6e9ec520cddd8df86daf6c854be08e07101ff19c749292893091709fc769a915b638dfcdf3852270dffe7fa5238e6e9b620111171d993dd23d0d23fa5734b661
+DIST FlexGet-3.1.48.tar.gz 8579168 BLAKE2B e741aea505aca635fb9d9e5518e19d21162a5fc34196cf277c3c045d987df4e032ee97fc64a543db44007334062a7aa270e79944a15d35c31d81e7b9f39e2a68 SHA512 e88d1bcec6f5e41aace79d010e66d1a3ead44ef950244a7d00be319950aa961af0346774c9034a29e4d40835741870b68da1c9dbc360eb8ba303b60de9f383ce
 EBUILD flexget-2.10.35.ebuild 2589 BLAKE2B 0d6e3deb742f146a8f1fc193e340dde9d15e5853c4da2d69c7d15fed0aa327a274f704f2aa515b14820d9b079e0e9ed27cf559140f9f08dde944962ede9001a1 SHA512 30a1ddac133fd8617dfac5c3a8dfae6240503a4e64f65f030582b27b5a0fb2469bcba49357f59e0972c706acbfc83b53dd0b51c0aabd623263c93c6a30fb2568
 EBUILD flexget-2.10.84.ebuild 2555 BLAKE2B 7610d7606ec86ee5ceb957b18560b17b6f945e72bb0fd6f78339ba4f5b8b08d62dce5b631be5f1d6e295a9426744a11fb1eaf6037972c81a197148a3d32fc3e3 SHA512 ba1efb6b476c9bcfd346bcad40f6aac688b17d037de63a3307fb85f8ada6575be52cf44a6ab579a4f0a7dc83bc7f8c86c7e49e2ca275d84adeb3c6f566d59fe8
 EBUILD flexget-2.11.24.ebuild 3490 BLAKE2B bbe9a5328ee84c18cf6f4520bf6b233cf4f89d1b516dd07b3f4b9e914b8cb9a59b89f1e8156f99b97ed91e01b1409fb819b65615cce09c4715a35923db64815f SHA512 229b79ed01853f9efc25f9cba21e73e4475e0474266f22fc06b6526ee48432c996ac738a47f6fb7a810c446ef2e0a0b95750882073380744a0f0c0a266708957
@ -26,4 +27,5 @@ EBUILD flexget-2.21.14.ebuild 6052 BLAKE2B 207022b33db99f21fed2240d0e283d4694c5f
 EBUILD flexget-2.21.21.ebuild 5970 BLAKE2B ae8f4d2b7fd78b798b3beb8f5ebba303264f80aa3015cb3b525bd4fb39e7ee89521845cdd8ecd94b16ccd76a5d6acd348d72ff2b2c0e3ed6027ceaf91b7baedb SHA512 edcf3a67139e7a770c6d4f39ba9f48ccc18d2ecd148bd4ca4ff4d379676a9895a24cf7c91b429d4cf8f67f5cbe0f488250bfc441c5670f6a3c1a27fec7b9fbcb
 EBUILD flexget-2.9.18.ebuild 2725 BLAKE2B 2a80b56f4cf1c5d92a1648919f2daac5818a36908ac3130df5ab482bb65fbf0f3675ae8ff6d1d15025e0acc616314160357972d3d9c6aabf578954e20997d649 SHA512 6a1282b64862b61f15586278462fd29da45a2472dbd5a1740b1ef13eb486210fd42de625d6ed200c804349a4684ee4db4e3a6f2347be3e9d85ffea806e6d9bfd
 EBUILD flexget-3.1.10.ebuild 6484 BLAKE2B 785094de081c42490a8cca366cd410af70a843fe0eb37fea991dd85a986e87727e5de92cc49320c8b7e83f1b12e5f9c3ee449fdb07115f1a1290474db6cdf641 SHA512 fbf2574b26305f594c005bc819243f9d5f9b640e5b396e2228f4d321a0b683437876f23b26fd943e137987f8ad6a50c4fc52247875de3c5c368d73e611393a38
+EBUILD flexget-3.1.48.ebuild 6769 BLAKE2B 9a3894d951b88de316ba70e15442564b569e634e9a5ec28f40415e10dd2f122c87d06155129d206cfedaa065e1c3d2a425685fdd5fd58eb7ef191750135e5a3b SHA512 fcc28c25088de73ddb56e678be205ec80f67c66400368205f0ead4ff24f69f6ef88cc6614482dd24508fb1fcd850cf95e1689ace6981a8ea6cd957e52c816bcc
 MISC ChangeLog 559 BLAKE2B 43030b5c73d9efa71c0cd9b8e60d1d75908debd818fb880a3740b2f74764fccfd9e1e014453a3fe851addce9f57a701c53894279ef1801622d9e8b71900b62df SHA512 85e73780c6b8c9abfd16f66e9183c9d7a8a2bc06fdd6311d05572b316a3975dafbd29bfe6f872862b0d6d41e79fde99717df2dedac2be5eee76af58a2d387667
--- a/net-misc/flexget/flexget-3.1.48.ebuild
+++ b/net-misc/flexget/flexget-3.1.48.ebuild
@ -0,0 +1,158 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} pypy{,3} )
+
+inherit distutils-r1 eutils systemd user
+
+if [[ ${PV} != 9999 ]]; then
+	MY_P="FlexGet-${PV}"
+	SRC_URI="mirror://pypi/F/FlexGet/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/Flexget/Flexget.git
+		https://github.com/Flexget/Flexget.git"
+fi
+
+DESCRIPTION="Multipurpose automation tool for content like torrents, nzbs, podcasts, comics"
+HOMEPAGE="http://flexget.com/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="systemd test transmission"
+
+RESTRICT="nomirror"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	~dev-python/aniso8601-4.0.1[${PYTHON_USEDEP}]
+	=dev-python/APScheduler-3.5.3[${PYTHON_USEDEP}]
+	~dev-python/babelfish-0.5.5[${PYTHON_USEDEP}]
+	=dev-python/beautifulsoup-4.8.2:4[${PYTHON_USEDEP}]
+	=dev-python/certifi-2020.4.5.1[${PYTHON_USEDEP}]
+	~dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
+	~dev-python/cheroot-8.2.1[${PYTHON_USEDEP}]
+	~dev-python/cherrypy-18.5.0[${PYTHON_USEDEP}]
+	~dev-python/click-7.0[${PYTHON_USEDEP}]
+	~dev-python/colorclass-2.2.0[${PYTHON_USEDEP}]
+	~dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+	~dev-python/flask-1.1.2[${PYTHON_USEDEP}]
+	=dev-python/flask-compress-1.4.0[${PYTHON_USEDEP}]
+	=dev-python/flask-cors-3.0.2[${PYTHON_USEDEP}]
+	~dev-python/flask-login-0.4.1[${PYTHON_USEDEP}]
+	=dev-python/flask-restful-0.3.7[${PYTHON_USEDEP}]
+	=dev-python/flask-restplus-0.10.1[${PYTHON_USEDEP}]
+	=dev-python/guessit-3.1.0[${PYTHON_USEDEP}]
+	=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
+	~dev-python/idna-2.9[${PYTHON_USEDEP}]
+	~dev-python/itsdangerous-1.1.0[${PYTHON_USEDEP}]
+	~dev-python/jaraco-functools-3.0.0[${PYTHON_USEDEP}]
+	~dev-python/jinja-2.11.1[${PYTHON_USEDEP}]
+	~dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	~dev-python/loguru-0.4.1[${PYTHON_USEDEP}]
+	~dev-python/markupsafe-1.1.1[${PYTHON_USEDEP}]
+	~dev-python/more-itertools-7.0.0[${PYTHON_USEDEP}]
+	~dev-python/pillow-7.1.1[${PYTHON_USEDEP}]
+	=dev-python/plumbum-1.6.4[${PYTHON_USEDEP}]
+	~dev-python/portend-2.6[${PYTHON_USEDEP}]
+	~dev-python/progressbar-2.5[${PYTHON_USEDEP}]
+	~dev-python/pynzb-0.1.0[${PYTHON_USEDEP}]
+	~dev-python/pyparsing-2.4.7[${PYTHON_USEDEP}]
+	=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
+	~dev-python/pystray-0.15.0[${PYTHON_USEDEP}]
+	~dev-python/python-dateutil-2.8.1[${PYTHON_USEDEP}]
+	=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	=dev-python/pyyaml-5.1.2[${PYTHON_USEDEP}]
+	=dev-python/rebulk-2.0.0[${PYTHON_USEDEP}]
+	~dev-python/requests-2.23.0[${PYTHON_USEDEP}]
+	=dev-python/rpyc-4.0.2[${PYTHON_USEDEP}]
+	=dev-python/six-1.14.0[${PYTHON_USEDEP}]
+	=dev-python/soupsieve-1.9.5[${PYTHON_USEDEP}]
+	=dev-python/sqlalchemy-1.3.11[${PYTHON_USEDEP}]
+	~dev-python/tempora-1.14.1[${PYTHON_USEDEP}]
+	=dev-python/terminaltables-3.1.0[${PYTHON_USEDEP}]
+	=dev-python/tzlocal-1.4[${PYTHON_USEDEP}]
+	=dev-python/urllib3-1.25.8[${PYTHON_USEDEP}]
+	~dev-python/webencodings-0.5.1[${PYTHON_USEDEP}]
+	~dev-python/werkzeug-0.16.1[${PYTHON_USEDEP}]
+	=dev-python/zc-lockfile-2.0[${PYTHON_USEDEP}]
+	=dev-python/zxcvbn-python-4.4.15[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}
+	transmission? ( dev-python/transmissionrpc[${PYTHON_USEDEP}] )
+"
+DEPEND+=" test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+=" dev-python/paver[${PYTHON_USEDEP}]"
+else
+	S="${WORKDIR}/${MY_P}"
+fi
+
+python_test() {
+	cp -lr tests setup.cfg "${BUILD_DIR}" || die
+	run_in_build_dir nosetests -v --attr=!online > "${T}/tests-${EPYTHON}.log" \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 ${PN}
+}
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	sed -i -e "s/^aniso8601==1.2.1/aniso8601==4.0.1/" ${S}/requirements.txt || die
+	sed -i -e "s/^apscheduler==3.5.0/apscheduler==3.5.3/" ${S}/requirements.txt || die
+	#sed -i -e "s/^beautifulsoup4==4.6.2/beautifulsoup4==4.6.3/" ${S}/requirements.txt || die
+	sed -i -e "s/^certifi==2017.4.17/certifi==2020.4.5.1/" ${S}/requirements.txt || die
+	sed -i -e "s/^chardet==3.0.3/chardet==3.0.4/" ${S}/requirements.txt || die
+	#sed -i -e "s/^cheroot==5.5.0/cheroot==6.0.0/" ${S}/requirements.txt || die
+	sed -i -e "s/^cherrypy==18.4.0/cherrypy==18.5.0/" ${S}/requirements.txt || die
+	sed -i -e "s/^click==6.7/click==7.0/" ${S}/requirements.txt || die
+	sed -i -e "s/^flask==1.0.2/flask==1.1.2/" ${S}/requirements.txt || die
+	sed -i -e "s/^flask-login==0.4.0/flask-login==0.4.1/" ${S}/requirements.txt || die
+	sed -i -e "s/^flask-restful==0.3.6/flask-restful==0.3.7/" ${S}/requirements.txt || die
+	#sed -i -e "s/^future==0.16.0/future==0.17.1/" ${S}/requirements.txt || die
+	sed -i -e "s/^html5lib==0.999999999/html5lib==1.0.1/" ${S}/requirements.txt || die
+	sed -i -e "s/^idna==2.8/idna==2.9/" ${S}/requirements.txt || die
+	#sed -i -e "s/^importlib-metadata==0.8/importlib-metadata==0.23/" ${S}/requirements.txt || die
+	sed -i -e "s/^itsdangerous==0.24/itsdangerous==1.1.0/" ${S}/requirements.txt || die
+	sed -i -e "s/jaraco.functools==2.0/jaraco.functools==3.0/" ${S}/requirements.txt || die
+	sed -i -e "s/^jinja2==2.10.1/jinja2==2.11.1/" ${S}/requirements.txt || die
+	sed -i -e "s/^markupsafe==1.0/markupsafe==1.1.1/" ${S}/requirements.txt || die
+	sed -i -e "s/^more-itertools==7.2.0/more-itertools==7.0.0/" ${S}/requirements.txt || die
+	sed -i -e "s/^path.py==11.5.0/path.py==11.0.1/" ${S}/requirements.txt || die
+	sed -i -e "s/^pillow==7.0.0/pillow==7.1.1/" ${S}/requirements.txt || die
+	sed -i -e "s/^plumbum==1.6.3/plumbum==1.6.4/" ${S}/requirements.txt || die
+	sed -i -e "s/^portend==1.8/portend==2.2/" ${S}/requirements.txt || die
+	#sed -i -e "s/^progressbar==2.5/progressbar==2.3/" ${S}/requirements.txt || die
+	sed -i -e "s/^python-dateutil==2.6.1/python-dateutil==2.8.1/" ${S}/requirements.txt || die
+	sed -i -e "s/^pytz==2017.2/pytz==2019.3/" ${S}/requirements.txt || die
+	sed -i -e "s/^pyparsing==2.2.0/pyparsing==2.4.7/" ${S}/requirements.txt || die
+	sed -i -e "s/^requests==2.21.0/requests==2.23.0/" ${S}/requirements.txt || die
+	sed -i -e "s/^rpyc==4.0.1/rpyc==4.0.2/" ${S}/requirements.txt || die
+	sed -i -e "s/^six==1.13.0/six==1.14.0/" ${S}/requirements.txt || die
+	#sed -i -e "s/^sqlalchemy==1.3.3/sqlalchemy==1.3.4/" ${S}/requirements.txt || die
+	sed -i -e "s/^tempora==1.8/tempora==1.14.1/" ${S}/requirements.txt || die
+	sed -i -e "s/^urllib3==1.24.2/urllib3==1.25.8/" ${S}/requirements.txt || die
+	sed -i -e "s/^werkzeug==0.15.6/werkzeug==0.16.1/" ${S}/requirements.txt || die
+	#sed -i -e "s/^zipp==0.3.3/zipp==0.6.0/" ${S}/requirements.txt || die
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+        fperms 755 /var/log/${PN}
+
+	if use systemd; then
+		systemd_dounit "${FILESDIR}"/flexget.service
+	fi
+}
+
--- a/profiles/package.unmask
+++ b/profiles/package.unmask
@ -0,0 +1,2 @@
+=dev-python/guessit-3.1.0
+=dev-python/rebulk-2.0.0
--- a/sci-electronics/vzlogger/Manifest
+++ b/sci-electronics/vzlogger/Manifest
@ -1,4 +1,4 @@
 AUX vzlogger-9999-curl_tls1_2.patch 694 BLAKE2B b26f6617961aa822fec087b25f078ba293a85a19f49f486781f136907be15699a57a1decbe2367cb9eb06b86a39f0f0855412dccea5fe2963c802413d531ce68 SHA512 e304c71e644b3d732945b0cd44f24667da0b99a65691e682816d85571fd262ab5ea69842a741e942435ded45a69b8d3dbf3e5059e0feffdf661590ffdde730af
 AUX vzlogger.logrotate 71 BLAKE2B ac41e0c56cd3ddc1432635ce2ef9c6e383dab49422215b6610ebbff8890916308caf22cc6d10c86e126190dfb8d18f2c6b13f2078c7febcab7a48ca52878f6e5 SHA512 cbb813856a949bd4e11a552def0ce18e55f7127e8a03c7e5d42302f49e79bba004a9f80789f554899c7f5304b555bcc2d85ad837b00e8201550c1a642b64c17a
 AUX vzlogger.service 254 BLAKE2B 3466c9d10ef4e67382f52de0967bfd7256a872244907a5cb4a2fb14d90d26df180698d14b39430e5e8f848157a82065b12194f70b95af8e072c9f8d5db1a325a SHA512 3a0e295c2c6f8467ee070db67adb1bdfca7afd1b958fd193c83bd2f59edd10079ecff9177b098c34bed594cfc13886b15609a7665aa5ab9827223040c04de64f
-EBUILD vzlogger-9999.ebuild 1963 BLAKE2B c19dad23ce0c562e4dab71b865593165b2d77bc1cac0770745176bde755af435021322c652c10cbb99cde3d1e2b769612b0d95314eaf185ae036422a87145464 SHA512 fa62b8f94e82d713584acd72382e2de1b11ce416aba49b13c07ba5341e1c916f46ef54b6d0fa147ef99302fc852dbcef6c115dd3d57c6e804b27f25a67f7744f
+EBUILD vzlogger-9999.ebuild 2067 BLAKE2B 16f1b479438afdd508c8f1e8e95ac4c4465a37e6647f79cd5a3aa2a4fe48e6014a77d09e6f9fdfd7e5ab8ebb58f2d849df57ad1f308d4227772ca3017a70f3ab SHA512 09a8d186d545b4fe6857f0b87e31fce5a96ea34e5c999bc2c6ddc01a4a122f3e73eca116ffaec55b76fc2720115a6e82594357327cd52523e29946ea80fe6a7d
--- a/sci-electronics/vzlogger/vzlogger-9999.ebuild
+++ b/sci-electronics/vzlogger/vzlogger-9999.ebuild
@ -19,12 +19,16 @@ HOMEPAGE="https://github.com/volkszaehler/vzlogger"

 LICENSE="GPL-3"
 SLOT="0"
-IUSE="+logrotate +microhttpd ocr oms +sml systemd"
+IUSE="+logrotate +microhttpd mqtt ocr oms +sml systemd"

-RDEPEND="dev-libs/json-c
-	app-misc/mosquitto
+RDEPEND="
+	dev-libs/cyrus-sasl
+	dev-libs/json-c
+	dev-libs/libgcrypt
+	net-libs/gnutls
 	logrotate? ( app-admin/logrotate )
 	microhttpd? ( >=net-libs/libmicrohttpd-0.9 )
+	mqtt? ( app-misc/mosquitto )
 	ocr? ( media-libs/leptonica app-text/tesseract )
 	oms? ( sci-libs/libmbus )
 	sml? ( sci-libs/libsml )
@ -55,6 +59,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TEST=off
 		-DENABLE_LOCAL=$(usex microhttpd)
+		-DENABLE_MQTT=$(usex mqtt)
 		-DENABLE_OCR=$(usex ocr)
 		-DENABLE_OCR_TESSERACT=$(usex ocr)
 		-DENABLE_OMS=$(usex oms)