gentoo resync : 25.08.2020

3 files changed, 4 insertions, 53 deletions

diff --git a/app-office/gtg/Manifest b/app-office/gtg/Manifest
index 666ca0c54866..dfd469b7d22a 100644
--- a/app-office/gtg/Manifest
+++ b/app-office/gtg/Manifest
@@ -1,4 +1,3 @@
-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
+DIST gtg-0.4.0.tar.xz 3744752 BLAKE2B fdeabe32135dea24ac6113a486650b66b5143aa745117029b03e26e1bb3f2e8629623b26efdae0c8217741a2b4964b5dc060f0e450c05c950e21ea360f3f3823 SHA512 f2677f6bbc0b6cb21b7882a2bd0342b4919581c12e4aa43c13b5dbc48740418c512a41619584d0d75bfa63ebc4a5460abfbc27360e1817c8832cbecf3c34a60e
+EBUILD gtg-0.4.0.ebuild 1329 BLAKE2B a4da48e80920c74e1f7249e5dda2c3cdb2aea8bb636c776053d531da02531a88911e5c28057d6d0963e7ee9d04db9e8ba12f836378c5d830dd5e2829897fc709 SHA512 c1d6f91a67cf4c0b41d462426bd69bcfa12e2f0f605fc06e1848a9b03402f47207d187aca0456495a23dac89c00b770ff9f497de283dfa3c5e490b7e9ea97c1c
 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
deleted file mode 100644
index a66d8e95bdd9..000000000000
--- a/app-office/gtg/files/fix-help-open.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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/gtg-0.4.0_pre20200613.ebuild b/app-office/gtg/gtg-0.4.0.ebuild
index d9f3109d2424..135111e7c824 100644
--- a/app-office/gtg/gtg-0.4.0_pre20200613.ebuild
+++ b/app-office/gtg/gtg-0.4.0.ebuild
@@ -9,14 +9,12 @@ 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}"
+SRC_URI="https://github.com/getting-things-gnome/gtg/releases/download/v0.4/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gnome-keyring test"
+IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
@@ -32,7 +30,6 @@ RDEPEND="
 	x11-libs/pango[introspection]
 	x11-libs/gdk-pixbuf[introspection]
 	x11-libs/gtk+:3[introspection]
-	gnome-keyring? ( gnome-base/libgnome-keyring[introspection] )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -49,8 +46,6 @@ BDEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}"/fix-help-open.patch )
-
 src_install() {
 	meson_src_install
 	python_fix_shebang "${ED}"/usr/bin/gtg