gentoo resync : 15.12.2019

4 files changed, 67 insertions, 4 deletions

diff --git a/net-misc/trackma/Manifest b/net-misc/trackma/Manifest
index 5ecee12e9a82..7d99bf4e28ae 100644
--- a/net-misc/trackma/Manifest
+++ b/net-misc/trackma/Manifest
@@ -1,4 +1,6 @@
 DIST trackma-0.7.4.tar.gz 143814 BLAKE2B 8fafa53b4af94a1078e2343b1b309efe8caa058809309ddbdae618b2b3d85fbf001cb73c2556fd50b8946c9d61ddb32d74c3bb5be9bb2c2501b29265a587e2d4 SHA512 88b7eacc6a60fec5b022787337274b95d0fb972dbdd8ffa1a000806612403d8f84a2317e5903ec1ffcdbac91132a960670855991c0885f526fdbc4a1033c3364
-EBUILD trackma-0.7.4.ebuild 1979 BLAKE2B b5a0190c8d128cf6c6419d06ae0cbfacd05ab2102ff6613ddff338da2bbc3e7936eeaf435171731e7b41a75668c8b8e9c8f5608b11efc091fb515a11d9d84b2f SHA512 034a2bff20f856767d08939cf1f151d71e4351bc118be26b086b4bfb64eb681cb0cc6ee44265f8be713c9d975d75e7650340e1f1fac8c9ef1f5c48958760dd2c
-EBUILD trackma-9999.ebuild 1931 BLAKE2B 3b52f598487bb469a890a96d978d31a4d796459da3908a28ce17994e0ad9a39709431152eb26bce72f4006449ed4c4582bb5d5422c4366f0e14877a5e06e7c23 SHA512 d953512cb15a9f05dd972487cc9f19a88b69b0f9810aee3755bd51b64e46965e22859832c97c57cdaa5518a3a3ddf34106398f443cd864f6f793db109a7ef9f9
+DIST trackma-0.8.2.tar.gz 171917 BLAKE2B 9fedd04036d55ef8fa748e64a18a2d471cab61b71030840baf18252cb81d2ad3df72eba6d417484c2772cb81d3e0e6e2311440c77040a899152681e427408a7a SHA512 6063f65fa70ee65f3b30cd2750bc1f501a6a94dc796195f11d89f4430cdae830fc5987bf6d261c77603c9cc5d32f80286aeecc05d44f766ca705e932997d46f1
+EBUILD trackma-0.7.4-r1.ebuild 1952 BLAKE2B 0fb31b5b5df5c325d814989564cea1d512a16e1abfdf44f16a5c659974241de3f4d73466a7d29bf268998f624f04e46f8fa44e5eca7d37241c735cbbf9520a80 SHA512 d66b70dc4921f7aa49da208007b7b16e976d5dad645d842ff9f9f60388df5ecdb454258255880e69bd1a2bb8e52d909354bb88ba985e5b212bf7f186a9b9e7b0
+EBUILD trackma-0.8.2.ebuild 1951 BLAKE2B 86d80e7d059663f486429987fff04e60300989d38280d8769c2301b36fd4d7c3232e8244695ace0c87f8d490dead736da1d36075d37105539b514543343c7648 SHA512 c3a82e80395355d983f2999299c51d4579b1c53fefe5c0aae6984606405480c292625e0919e26abd61aa8c5942eabbe90bd8a449a5505222379153c88ac2a4ab
+EBUILD trackma-9999.ebuild 1904 BLAKE2B f5d0a6e16959af610bf104fbb826eee29b94c0be08639a7c8891bec52ad9ac35dd411e48e3cfa9ebbbddbb67b1738e130d6f7af4bb94c2bafb8cbe03d4cf6c80 SHA512 898f27b9bd97236b50454148a2f8ed4af3071bee185f4471fca5f25668ee3d430d8998fb2481d1de8ecc759f3e7475eebfe0453e28d05b3e8a3d2d88d6a7c579
 MISC metadata.xml 579 BLAKE2B 246c639d17e6a69b309624da7ca46720c19f7226b770012bd7d020cb409b842d90d3ada211934062f65202798031dcc667e6801720e588b604b69b71ed0fa34f SHA512 0cc21a27e6dfe16172926c5a0b61b4349c6e68a538e32c041d259c4ada8c147040595c782c8d2ef9e1054edb72c8475f9e1b4d0d3544f277e805d681401d46bf
diff --git a/net-misc/trackma/trackma-0.7.4.ebuild b/net-misc/trackma/trackma-0.7.4-r1.ebuild
index 1f5b5a79bb4d..5c7cd0c57569 100644
--- a/net-misc/trackma/trackma-0.7.4.ebuild
+++ b/net-misc/trackma/trackma-0.7.4-r1.ebuild
@@ -27,7 +27,7 @@ DEPEND="ncurses? ( dev-python/urwid[${PYTHON_USEDEP}] )
 		dev-python/pillow[${PYTHON_USEDEP}]
 	)"
 RDEPEND="sys-process/lsof
-	inotify? ( || ( dev-python/inotifyx dev-python/pyinotify ) )
+	inotify? ( dev-python/pyinotify )
 	${DEPEND}"
 
 python_configure_all() {
diff --git a/net-misc/trackma/trackma-0.8.2.ebuild b/net-misc/trackma/trackma-0.8.2.ebuild
new file mode 100644
index 000000000000..fc1e2899065b
--- /dev/null
+++ b/net-misc/trackma/trackma-0.8.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_5,3_6} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Open multi-site list manager for media tracking sites"
+HOMEPAGE="https://github.com/z411/trackma"
+SRC_URI="https://github.com/z411/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+ncurses cli gtk inotify qt5"
+REQUIRED_USE="|| ( cli gtk ncurses qt5 )"
+
+DEPEND="ncurses? ( dev-python/urwid[${PYTHON_USEDEP}] )
+	gtk? (
+		dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+	)
+	qt5? (
+		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]
+		dev-python/pillow[${PYTHON_USEDEP}]
+	)"
+RDEPEND="sys-process/lsof
+	inotify? ( dev-python/pyinotify )
+	${DEPEND}"
+
+python_configure_all() {
+	sed -i -e '/trackma-qt4/d' "${S}/setup.py" || die
+	rm "${S}/trackma/ui/qt/qt4ui.py" || die
+	if ! use qt5; then
+		sed -i -e '/trackma-qt/d' "${S}/setup.py" || die
+		rm -r "${S}/trackma/ui/qt" || die
+	fi
+	if ! use gtk; then
+		sed -i -e '/trackma-gtk/d' "${S}/setup.py" || die
+		rm -r "${S}/trackma/ui/gtk" || die
+	fi
+	if ! use ncurses; then
+		sed -i -e '/trackma-curses/d' "${S}/setup.py" || die
+		rm "${S}/trackma/ui/curses.py" || die
+	fi
+	if ! use cli; then
+		sed -i -e '/trackma.ui.cli:main/d' "${S}/setup.py" || die
+		rm "${S}/trackma/ui/cli.py" || die
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newicon "${S}/trackma/data/icon.png" trackma.png
+	use cli && make_desktop_entry "${PN}" "${PN^} (cli)" "${PN}" "Network" "Terminal=true"
+	use ncurses && make_desktop_entry "${PN}-curses" "${PN^} (ncurses)" "${PN}" "Network" "Terminal=true"
+	use gtk && make_desktop_entry "${PN}-gtk" "${PN^} (gtk3)" "${PN}" "Network" "StartupWMClass=trackma-gtk3"
+	use qt5 && make_desktop_entry "${PN}-qt" "${PN^} (qt5)" "${PN}" "Network" "StartupWMClass=trackma-qt5"
+}
diff --git a/net-misc/trackma/trackma-9999.ebuild b/net-misc/trackma/trackma-9999.ebuild
index c267a57aade6..aed3ebbc8ef5 100644
--- a/net-misc/trackma/trackma-9999.ebuild
+++ b/net-misc/trackma/trackma-9999.ebuild
@@ -26,7 +26,7 @@ DEPEND="ncurses? ( dev-python/urwid[${PYTHON_USEDEP}] )
 		dev-python/pillow[${PYTHON_USEDEP}]
 	)"
 RDEPEND="sys-process/lsof
-	inotify? ( || ( dev-python/inotifyx dev-python/pyinotify ) )
+	inotify? ( dev-python/pyinotify )
 	${DEPEND}"
 
 python_configure_all() {