gentoo auto-resync : 12:07:2022 - 07:32:03

3 files changed, 21 insertions, 17 deletions

diff --git a/app-office/gtg/Manifest b/app-office/gtg/Manifest
index fbb496ccb5f8..b7aab4578d72 100644
--- a/app-office/gtg/Manifest
+++ b/app-office/gtg/Manifest
@@ -2,8 +2,8 @@ AUX 0.5-Revert-meson-plugin-translation-apply-thing.patch 2389 BLAKE2B e383adebc
 AUX 0.5-mouse-cursor-fixes1.patch 2684 BLAKE2B 3ed8e075911fca65eb8031ea9a998411365c48a40b0985f9ba7bca6de107986be12b74c23ce4d1ab0b469823b60c38875ba592a7e8eaa6e049052a5f88ab8ea6 SHA512 6dcc68967e148bc481a615063913393e2190d8ea070cf193f6525e2e6f24947099fb20353cfb27270005ea2c244d706206f3f3b6f2e48e2f107f8c3f8938f72a
 AUX 0.5-mouse-cursor-fixes2.patch 2299 BLAKE2B 0664740211d33f56f8a55efcec05c89e82f113d04e808a3a883c2c0c9db0298dc2d9bbb060472dfdd3a3a1c219a287aef224387fc161b8b72c44091cee85dc0b SHA512 6a055344dd5012ae0c2a27d115c7c06530ff26fb4817f73f0c9bcaec9dcfb07ed6bc5c40d644f2feaf26c8b7eec7020432b5ae3653c598faea1c55c64a6b6fe4
 AUX 0.5-mouse-cursor-fixes3.patch 1431 BLAKE2B 887e3237d57623b12d3b94e67138aa0838f6b5782aeff18abec12a1f6607334cf49dd1bd82d07053a80649a1f3bb7fdcf1c02a9d7b36749a0a45fe8e9f80ce7a SHA512 a353a4bc4d641e973cd50424cfa089a213d3de283b1c61c3aaeb859d2e8f068108d7740b1f3f6935f20142d2500ca0dffcdd570e47e83b9e0d9959da37f3e726
-DIST gtg-0.4.0.tar.xz 3744752 BLAKE2B fdeabe32135dea24ac6113a486650b66b5143aa745117029b03e26e1bb3f2e8629623b26efdae0c8217741a2b4964b5dc060f0e450c05c950e21ea360f3f3823 SHA512 f2677f6bbc0b6cb21b7882a2bd0342b4919581c12e4aa43c13b5dbc48740418c512a41619584d0d75bfa63ebc4a5460abfbc27360e1817c8832cbecf3c34a60e
 DIST gtg-0.5.tar.gz 2229259 BLAKE2B e724cbd015a6f0b6fee62c52283b56244490efb7df4e57b2e30745f58fbc41442b008f5c81b53cfd001f04a92ff53a14e2117d6c12d0d5a35fe49158b5f736fa SHA512 631f5343301d7d72211398152fa081c0fa15154babc7ec900f13a39a2677d0edaf4fea534a83284207e8019926c9108dc1d8f25bdbeae85ef0665dfe1c7b768a
-EBUILD gtg-0.4.0.ebuild 1365 BLAKE2B 1a8fafbc64ddf449930d8494e14c1e602977438dfdae024a5298d0aceebee153781fb99878484498b17020a8be475949552e48ca5e37af71a16cc441c481fd86 SHA512 7d1ac5b538ca7d10e9b5c77134b1426aaef69d16d1386210819be6d39e155014083d8d506d07125444674a4215776f832a884524305bcdc2f56effa58b7bd85d
-EBUILD gtg-0.5.ebuild 1638 BLAKE2B 1cbe2180ab53b4e86fec563fe6983881af73d89ce1505559f6fcf0c497e8344ebdad89f2b4b42c6184dff1c217f360f1f06a9b7c8e1b7196d3e1a8e5d2967137 SHA512 e41b023fe409b24d578f1452f101cc5550f26ee6ecf0e9eec03097a811279fd7d2893dcb73c1871a8ebf61ad295b5365c19bbecb3d189a6bfc73a30132782971
+DIST gtg-0.6.tar.gz 2361876 BLAKE2B 48f4d589b19181c4e5586254a3411fe2e25126d0f16b2d1294b8bff3f7a86aee7a34762781d9819760ce2e6b36ebded225a478a1bc86aa4c17217b165dae2802 SHA512 68a5229c17b85b87a9a134a08e5e86fbf24d28d6ce55e848c17eef650620d6f56172ee495cb113f4279b34c19127ae03981e2feec5a39dc51be49e387e458600
+EBUILD gtg-0.5.ebuild 1639 BLAKE2B 152dd75b80c101527f22f2acb42dc8269d9975d8123ccfff94897762de5d1d02577e36c3b121ac14dec25dd642b6aa294fa00081b91106c6f3923c3a0f5ea294 SHA512 b75fa1a30b64b8040d90aec7df0234768241adcb78fddb6b8bb55dda5ed3a4c384dfde8a000d5af3e5ce3a3a917cf1ae3f4eb115f4189deac36c9f2068843d9d
+EBUILD gtg-0.6.ebuild 1561 BLAKE2B f491483fc30e0f86fdc59bf886cd406ea9efd43e001237fd433b25c97bf6d598f4e24b8daa1abf67627ff2dc8d4cbde105cb81398f3417464fac2985e7993382 SHA512 404dff2ab52e3e1024a80232aba164dd71a71d2646378551252fcbb3c9bf74d017145f2683437ed80ea5c20fca64fea531633d90218ae096b10721aa8526d2e3
 MISC metadata.xml 887 BLAKE2B dc510d2d5598d32acd9ab78b794618c2f16f25fb25c605fda6f0aa944d93d282c26cc2f39277bf313e4688025195baf13f5ab3e376fe5462c77f1af2bbd7dd93 SHA512 f41496c2e499341cd7f6c7538b27edb7a4c02ffbf5d36d6971d5bcb0b58076ae6f131dcfde499e80b21afea349cb4ca2b25e9d23b35af4ab6d7510136d6a785c
diff --git a/app-office/gtg/gtg-0.5.ebuild b/app-office/gtg/gtg-0.5.ebuild
index c3ae9ba1ab10..fae2baafad03 100644
--- a/app-office/gtg/gtg-0.5.ebuild
+++ b/app-office/gtg/gtg-0.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit meson python-single-r1 xdg
diff --git a/app-office/gtg/gtg-0.4.0.ebuild b/app-office/gtg/gtg-0.6.ebuild
index e16de2b4bc69..d4d376aab05b 100644
--- a/app-office/gtg/gtg-0.4.0.ebuild
+++ b/app-office/gtg/gtg-0.6.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_COMPAT=( python3_{7..8} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
 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/"
-SRC_URI="https://github.com/getting-things-gnome/gtg/releases/download/v0.4/${P}.tar.xz"
+SRC_URI="https://github.com/getting-things-gnome/gtg/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
@@ -21,11 +21,14 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
+		dev-python/caldav[${PYTHON_USEDEP}]
 		dev-python/dbus-python[${PYTHON_USEDEP}]
+		>=dev-python/liblarch-3.1.0[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${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}]
+		dev-python/vobject[${PYTHON_USEDEP}]
 	')
 	x11-libs/pango[introspection]
 	x11-libs/gdk-pixbuf[introspection]
@@ -36,9 +39,9 @@ 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}]
+			dev-python/pytest[${PYTHON_USEDEP}]
 		')
 		|| ( app-text/pdfjam >=app-text/texlive-core-2021 )
 		app-text/pdftk
@@ -46,12 +49,13 @@ BDEPEND="
 	)
 "
 
+src_test() {
+	sed -e "s|@VCS_TAG@|${PV}|" GTG/core/info.py.in > GTG/core/info.py || die
+	epytest
+}
+
 src_install() {
 	meson_src_install
 	python_fix_shebang "${ED}"/usr/bin/gtg
 	python_optimize
 }
-
-src_test() {
-	nosetests -v || die
-}