gentoo resync : 21.06.2020

6 files changed, 108 insertions, 110 deletions

diff --git a/app-office/gtg/Manifest b/app-office/gtg/Manifest
index bb6c8676c592..666ca0c54866 100644
--- a/app-office/gtg/Manifest
+++ b/app-office/gtg/Manifest
@@ -1,5 +1,4 @@
-AUX gtg-0.3.1-desktop.patch 334 BLAKE2B 639f2eb22b67def21485d2837ef9ed03860dd6595fc69b72cb07cfb62c6132949cc298e0d72030ddbcd0990cc2b237e1db8b022f3ec26af5a3fa81a5d5b5e371 SHA512 3d3b0b1c46fe352183d7a2d5b9ee65db995a1fe8bf10e35033a7c51261700cbfb8341371553eb95e11a8d502b70caeb588a41e8377014e85f30d20df97ee8449
-AUX gtg-0.3.1-locales.patch 584 BLAKE2B a6a7e8797a0e082e77545101455ebf70b40bc72f706471f85c4ba9b0a0d5293c61bd6afdd56d478b554eca882bf309db73a5e8f9c02f9eec912022fdf710a569 SHA512 4a62d55e0bdf4cb0bfaa3edcbf7f1573645c2d5505ec98c17529437545bd5f18374a561063d5e5d163bea0064d9daa9f82a29ee2f8ebeb00833c678d47446142
-DIST gtg-0.3.1.tar.gz 7902244 BLAKE2B 843c0df194450e9fcc718f94b83973209184ab041f42751ff1a32275c839b5e0bc80fe7aa903d91ce44d5999b496cd50218d8656c060d70fcdd3f3561f4eacb0 SHA512 7d342971cd98fbe5b84ec2f2b4c918dd668d00699b6f0afb76b143acdbe79807525bcc02d2e189769c24de5a8b33d7eef4ce242e3c091fe09505daac55158f12
-EBUILD gtg-0.3.1.ebuild 1929 BLAKE2B 6cf7deef0b847b541cc38e20a38f60f083d7bb73213e02f2a9a5f0db4cc06cdb690f9e654a07c7e4d806d15fb490ed420026a013bba301844dc2a6ae1dc598ee SHA512 d8191011dc938d8f2f01193ebdd18411f3635772b9d08252a7da8046072c2b8e6c971be400c1f9877c9e66bd86fb261361b5e808f2aa74495ba071ded341de45
+AUX fix-help-open.patch 1628 BLAKE2B 47f6cc0f7a88a60408884805781410298239d064fa58c36ee57cf777a5fbb7ff0a7f032d1e5e0d30e903d14b33cea1daaadb8461099cae9e3e36aeedbc513922 SHA512 e0968c48ad22b405b0aa353da21cd199c4cc665a7d1e94ea52bba726798f4e403384a4394d87fbf4a225723c2cb1f2eb54ecd0659f5be869dd36e5ee034e477e
+DIST gtg-0.4.0_pre20200613.tar.gz 4827071 BLAKE2B 80515f064b4a034066a86c1b63dcb4e2510e49493b067991b7135a3914b1d75ebfc7f18132d6db81e55fdec34a0225c3147b55dc1e0c891540b2b895f3768f2d SHA512 8d4c9460693f7a913c224bd22aacec5b7db67faa5e74e8575fe99d2e792e8f95f6480e1d0ecc3ac77b0533403b8baa41ece315bd14782fb3c783315aa3d7a5fb
+EBUILD gtg-0.4.0_pre20200613.ebuild 1537 BLAKE2B 8fde70a21d8a9163ccd1506758710b1e0c050b3dff8edb6598476d313a5edb96c161718672435f69b7564d46c4cdc433e64c145d4b57eb6d1f4f0d53a3d84633 SHA512 60062306cccbd7ccf607667076f413e90e4346c675d6ab6d03236b65d24f8ffe4cb488cbc38bca0f960f51424b894d8bb81facc690d2ccef1b5bae3cdc04c0c4
 MISC metadata.xml 886 BLAKE2B 5f0068ca29003ca7dc9988c6e648076eb612103a30c0d5bbf60faec65c7e859d8546243d42764f2b09c000c37ad05e665646aefc6493288c856e2ee96f3187ff SHA512 9676a4693ee4c934eb22673f80b13fe61531e6c82b821990d070ad7c3b709a416c14741c870c3845e5d49a1b4c91b7c8fd16b7812d5e7466ebf352f53328f945
diff --git a/app-office/gtg/files/fix-help-open.patch b/app-office/gtg/files/fix-help-open.patch
new file mode 100644
index 000000000000..a66d8e95bdd9
--- /dev/null
+++ b/app-office/gtg/files/fix-help-open.patch
@@ -0,0 +1,43 @@
+From f8f4cbf0beda0e82388748c916c6152996b12a8e Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sat, 20 Jun 2020 01:06:04 +0300
+Subject: [PATCH] Fix opening of the help files
+
+webbrowser python module just opens things in the browser for me, which
+doesn't understand what a "help:gtg" is and routes it back to external
+program dialog if lucky.
+Use Gtk.show_uri instead, which will properly open it in help handler (yelp).
+
+I believe we should be using Gtk.show_uri instead of webbrowser in other
+places as well, but that's something for a different release.
+---
+ GTG/gtk/application.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/GTG/gtk/application.py b/GTG/gtk/application.py
+index 39a8a5b3..e8091973 100644
+--- a/GTG/gtk/application.py
++++ b/GTG/gtk/application.py
+@@ -28,7 +28,6 @@ from GTG.gtk.browser.main_window import MainWindow
+ from GTG.gtk.editor.editor import TaskEditor
+ from GTG.gtk.preferences import Preferences
+ from GTG.gtk.plugins import PluginsDialog
+-from webbrowser import open as openurl
+ from GTG.core import clipboard
+ from GTG.core.plugins.engine import PluginEngine
+ from GTG.core.plugins.api import PluginAPI
+@@ -251,7 +250,10 @@ class Application(Gtk.Application):
+     def open_help(self, action, param):
+         """Open help callback."""
+ 
+-        openurl("help:gtg")
++        try:
++            Gtk.show_uri(None, "help:gtg", Gdk.CURRENT_TIME)
++        except GLib.Error:
++            log.error('Could not open help')
+ 
+     def open_backends_manager(self, action, param):
+         """Callback to open the backends manager dialog."""
+-- 
+2.20.1
+
diff --git a/app-office/gtg/files/gtg-0.3.1-desktop.patch b/app-office/gtg/files/gtg-0.3.1-desktop.patch
deleted file mode 100644
index 82db6ce36f3b..000000000000
--- a/app-office/gtg/files/gtg-0.3.1-desktop.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix desktop-file-validate warning.
-
---- a/gtg.desktop	2014-11-01 11:23:31.101881704 +0100
-+++ b/gtg.desktop	2014-11-01 11:23:37.349775014 +0100
-@@ -14,7 +14,7 @@
- StartupNotify=true
- X-Ayatana-Desktop-Shortcuts=NewTask
- 
--[NewTask Shortcut Group]
-+[X-NewTask Shortcut Group]
- Name=New Task
- Exec=gtg_new_task
- TargetEnvironment=Unity
diff --git a/app-office/gtg/files/gtg-0.3.1-locales.patch b/app-office/gtg/files/gtg-0.3.1-locales.patch
deleted file mode 100644
index 56bf5ce5e9b1..000000000000
--- a/app-office/gtg/files/gtg-0.3.1-locales.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Do not install unwanted locales.
-
---- a/setup.py	2014-11-01 11:21:49.679613605 +0100
-+++ b/setup.py	2014-11-01 11:26:36.305719135 +0100
-@@ -101,9 +101,15 @@
- 
- PO_DIR = 'po'
- MO_DIR = os.path.join('build', 'po')
-+LINGUAS = os.environ.get('LINGUAS', '*').split(' ')
- 
- for po in glob.glob(os.path.join(PO_DIR, '*.po')):
-     lang = os.path.basename(po[:-3])
-+
-+    # Skip unwanted locales
-+    if lang not in LINGUAS and '*' not in LINGUAS:
-+        continue
-+
-     mo = os.path.join(MO_DIR, lang, 'gtg.mo')
-     target_dir = os.path.dirname(mo)
-     if not os.path.isdir(target_dir):
diff --git a/app-office/gtg/gtg-0.3.1.ebuild b/app-office/gtg/gtg-0.3.1.ebuild
deleted file mode 100644
index 05a309c14361..000000000000
--- a/app-office/gtg/gtg-0.3.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils fdo-mime gnome2-utils distutils-r1 versionator
-
-MY_PV="$(get_version_component_range 1-2)"
-DESCRIPTION="Personal organizer for the GNOME desktop environment"
-HOMEPAGE="http://gtgnome.net/"
-SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/liblarch[${PYTHON_USEDEP}]
-	dev-python/notify-python[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-python_prepare_all() {
-	# Plugins are voluntarily left automagic as application has a nice way
-	# to suggest missing dependencies. We only remove the ones that cannot
-	# work on gentoo.
-	# Backends should be enabled via USE flag when pulling extra deps
-
-	# geoloc: uses removed from tree bindings
-	sed -e "/GTG.plugins.geolocalized_tasks',/d" \
-		-e "/geolocalized-tasks.gtg-plugin/d" \
-		-i setup.py || die
-
-	# launchpad: missing dependency
-	# evolution: missing python-r1 support
-	rm GTG/backends/backend_launchpad.py \
-		GTG/backends/backend_evolution.py \
-		|| die
-
-	# Respect LINGUAS
-	epatch "${FILESDIR}"/${PN}-0.3.1-locales.patch
-
-	# Fix validation warning
-	epatch "${FILESDIR}"/${PN}-0.3.1-desktop.patch
-
-	distutils-r1_python_prepare_all
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-office/gtg/gtg-0.4.0_pre20200613.ebuild b/app-office/gtg/gtg-0.4.0_pre20200613.ebuild
new file mode 100644
index 000000000000..d9f3109d2424
--- /dev/null
+++ b/app-office/gtg/gtg-0.4.0_pre20200613.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit meson python-single-r1 xdg
+
+DESCRIPTION="Personal organizer for the GNOME desktop environment"
+HOMEPAGE="https://wiki.gnome.org/Apps/GTG/"
+COMMIT="abe2a9110dd0fc6a46f2d095013972877ea67d78"
+SRC_URI="https://github.com/getting-things-gnome/gtg/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/gtg-${COMMIT}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome-keyring test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		>=dev-python/liblarch-3.0[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+	')
+	x11-libs/pango[introspection]
+	x11-libs/gdk-pixbuf[introspection]
+	x11-libs/gtk+:3[introspection]
+	gnome-keyring? ( gnome-base/libgnome-keyring[introspection] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	test? ( $(python_gen_cond_dep '
+			dev-python/nose[${PYTHON_USEDEP}]
+			dev-python/cheetah3[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+		')
+		app-text/pdfjam
+		app-text/pdftk
+		dev-texlive/texlive-latex
+	)
+"
+
+PATCHES=( "${FILESDIR}"/fix-help-open.patch )
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"/usr/bin/gtg
+	python_optimize
+}
+
+src_test() {
+	nosetests -v || die
+}