gentoo resync : 16.04.2022

12 files changed, 49 insertions, 18 deletions

diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 52718774a31d..dd4074bbe43c 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 8b021f9af6df..a9d5bb29750c 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,7 +1,8 @@
+AUX 42.0-online-accounts-Fix-goa-helper-on-X11.patch 1283 BLAKE2B 86d8ebd6cafceb4d075395900ecc2845394a06edb2e539ef1d81315ef4e2e26364269b6083f1901fc6e4bf49626ee65b532e14cd6a5c38322bef9c729e7f5986 SHA512 e301d0a97970a2d9df92d3639777dc989895a4993ce0f81cee8df362a908fc81fa0259c6d0f1c4128460493773f969deec837be5266d7be97308111b3b4fc664
 DIST gnome-control-center-41.2-patchset.tar.xz 6380 BLAKE2B de9eacf549686e43870df486994c5cd319f996edb2b09a7d3b5e9021c50b74c067e8c3cbabbc0ca68741fb3b4c5a2d65cc1ea72e20057ec59dab952fa886d527 SHA512 292737b34316ceff5eb43c598b0a8d2a7895e2891215137ba59defb935c6184e78f19e2485963a8642621a409ee87e0e2a1582403fd90ee3c83b2bc1f3334e27
 DIST gnome-control-center-41.4.tar.xz 6616908 BLAKE2B 7c1a2692667c0447590d81c17ae990bff4b3bb7b85007ec70f8623d284cc0743ca79380dc60f1a9f97c01f897260c74acae0d730b197e8d4314e8002c7eec826 SHA512 63fa20041a06f5075d172b543176b4f037fcd623d9fa5ca5f785e047a9b95ccd002c423d29de673dcb28b7d99a83157b39d7bd65ef77fe70065e9a03b5ae38a4
 DIST gnome-control-center-42.0-patchset.tar.xz 5932 BLAKE2B 1c9311481be6a07dc2ff61fc9e65f190bc1668026fba2a1e4a8edf9a033e6b2b9019542d89aac4480323ee4802e00b765654008f5252e87040f013a990cb8048 SHA512 b76c1facd3566edcadfe33f81027966da35bb03909bfbae6faad72005b92447e291fa424611196bfae6e1dc5bf5982917f3ae14c36d87206f6bfb4af502bf1a4
 DIST gnome-control-center-42.0.tar.xz 6238096 BLAKE2B 63540c94d64d312ff9ce523cc3ef0023b35b93bbd0593cc6a3f5d671cc70980969617b2436b0c9994b8d225fac972d639b935affac36bc32bf621c4593d490bd SHA512 d8097240444ab45174e89db0f543d6523051829b124933cdbb84b1bc5d2d6809ee810f6d2c09702da51c991fe11496635b3164b490ed1e2ac523481d5466cf3e
 EBUILD gnome-control-center-41.4-r1.ebuild 6117 BLAKE2B 91a6d1c145971c45330865eb6017546cc4df1d99b87c441ba21edaef1ca3fa2eef9a8ce4396ad741a27557a3fa8e87e11ee54b35fb4d42321e129b5fe55bb742 SHA512 f7db79a7888306f9291c3e90eae254ffb85c7db5deb747b6af9d103a9cc9ea430e4a01642ec1017899fd452f24545031cde765c87c86168744f0973f0b58c588
-EBUILD gnome-control-center-42.0.ebuild 6040 BLAKE2B 9dd706bdc8940653a3a9fd8475828bc97d592a11f455a1b5b9ee903b5182b96b31a049cdda867dd5e9440c6d9fac40f6ba3e8df2b66561d99934a66cde136e16 SHA512 4df4832e107a1d691ab15d456d1cc75cc2ae3b0cac159e8ca6c8ea92a5ffe6aa6484890860b023c9a6eea51655b49a52bf2c2cadc42195634b67523130a38727
+EBUILD gnome-control-center-42.0-r1.ebuild 6106 BLAKE2B 8430e30b14c0f569c6aa38b392c7c3333c8bc1f186162acce72b20b78b5c9aa06f519b17711e8dda2d34ef9a203782eb6e01a3bd6c17cd0b67f7f24204755932 SHA512 7f2e5b02831f912ba5ea0dd38aa8e8a9c39972f31538a9f8c7425fbcb7aa2d209324d14d5d885a6d685684c434dc028505fa8ee48e5c0cfdd99229b28396efdb
 MISC metadata.xml 497 BLAKE2B 27aa6d9d725a3ce90d351442da83bdb5680f9931d78e5d6a653a1d2d392df118406e3eab36c77bbaeefc581be3a62c5df13fdfb611b2db27fc9c7440ba4ceae3 SHA512 c44903fa5a9462871c065bc776450c25bcca1dfe2f52d6bf676568f587bc308a0465bd5cb6e095fb0ecaefd0b8471df90df3b96164c7e7de76a86fbbe416a82b
diff --git a/gnome-base/gnome-control-center/files/42.0-online-accounts-Fix-goa-helper-on-X11.patch b/gnome-base/gnome-control-center/files/42.0-online-accounts-Fix-goa-helper-on-X11.patch
new file mode 100644
index 000000000000..dfa56eab9e61
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/42.0-online-accounts-Fix-goa-helper-on-X11.patch
@@ -0,0 +1,32 @@
+From 7fe322b9cedae313cd9af6f403eab9bfc6027674 Mon Sep 17 00:00:00 2001
+From: Jan Tojnar <jtojnar@gmail.com>
+Date: Mon, 28 Mar 2022 21:02:23 +0200
+Subject: [PATCH] online-accounts: Fix goa-helper on X11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The handle_str contains the “x11:” prefix so strtol would return 0.
+We need to pass it the numeric substring.
+
+Fixes: https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1651
+---
+ panels/online-accounts/gnome-control-center-goa-helper.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/panels/online-accounts/gnome-control-center-goa-helper.c b/panels/online-accounts/gnome-control-center-goa-helper.c
+index 56513147e..533609cbc 100644
+--- a/panels/online-accounts/gnome-control-center-goa-helper.c
++++ b/panels/online-accounts/gnome-control-center-goa-helper.c
+@@ -129,7 +129,7 @@ set_external_parent_from_handle (GtkApplication *application,
+           int xid;
+ 
+           errno = 0;
+-          xid = strtol (handle_str, NULL, 16);
++          xid = strtol (handle_str + strlen (x11_prefix), NULL, 16);
+           if (errno != 0)
+             {
+               g_warning ("Failed to reference external X11 window, invalid XID %s", handle_str);
+-- 
+2.35.1
+
diff --git a/gnome-base/gnome-control-center/gnome-control-center-42.0.ebuild b/gnome-base/gnome-control-center/gnome-control-center-42.0-r1.ebuild
index 43a08b3e178c..70008f3ef6ff 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-42.0.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-42.0-r1.ebuild
@@ -118,6 +118,8 @@ BDEPEND="
 "
 
 PATCHES=(
+	"${FILESDIR}"/${PV}-online-accounts-Fix-goa-helper-on-X11.patch
+
 	# Patches from gnome-40 branch on top of 40.0
 	# Makes some panels and dependencies optional
 	# https://bugzilla.gnome.org/686840, 697478, 700145
diff --git a/gnome-base/gnome-extra-apps/Manifest b/gnome-base/gnome-extra-apps/Manifest
index 4b6954414615..b86c919fb2a4 100644
--- a/gnome-base/gnome-extra-apps/Manifest
+++ b/gnome-base/gnome-extra-apps/Manifest
@@ -1,2 +1,2 @@
-EBUILD gnome-extra-apps-40.0.ebuild 2512 BLAKE2B 90b4eaa54c624a83a7cbec974404575fe17a5f874cdcb0004c87974e89b78450ab83f7e324bc53645fd557dd832f4ac24f5f4645fc12a36a9941a7302862b68f SHA512 450def13c7185c511d055e9ba1ec9cb3ba39ab1b9fbd2bbadd393372e1d16b36686630558aefebdb6960f49ad88decb66e3d103438afa2837baf1cba05f379be
+EBUILD gnome-extra-apps-41.0.ebuild 2476 BLAKE2B 4af25c5835b0cdd3bb1c7fbadb59815d9e775ac9e27b5be59375e4cb75b2427b31152c8328d143ec45acffd1e95020031f5e84c4e2c25d7e224538157d474848 SHA512 b17e5a48d79c27172afc0ba8b6824f1cd8a72816a1483c2d4ce6d45ab77c69cca0d011feb95a2efd3945cd6bae71de256aef7eb43958dd05bc59647415d9fecc
 MISC metadata.xml 618 BLAKE2B b0e3eb484cf4fd6251b59d9be7cd5d150cff79379cdc61bac77eb17e4cdcdfb7f93be57976d6a47e331a44829d30e6f9075e490b2ac9eb557728135bbbd89071 SHA512 0688fb4552c6c1de4b493cb8f7194dd08665441c9c7f06c873bffe0ab1f58d2441c14d13d28073c89577eafc522bf535a72a72a66b9f4bb3f3fbf403a0acbf2f
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-40.0.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-41.0.ebuild
index a4a9a775ec58..b0f7954f7b5e 100644
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-40.0.ebuild
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-41.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Sub-meta package for the applications of GNOME"
 HOMEPAGE="https://www.gnome.org/"
@@ -14,7 +14,7 @@ KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 # Note to developers:
 # This is a wrapper for the extra apps integrated with GNOME
 # Keep pkg order within a USE flag as upstream releng versions file
-# TODO: Should we keep these here: gnome-dictionary, gucharmap, sound-juicer, vinagre; replace gucharmap with gnome-characters?
+# TODO: Should we keep these here: gnome-dictionary, gucharmap, sound-juicer; replace gucharmap with gnome-characters?
 # TODO: Add gnome-remote-desktop as replacement for vino that was removed from meta in 3.36?
 # gnome-documents removed for now, as it didn't find a good place upstream and is getting dropped from default sets for distros for 3.30 (and for 3.26 it required newer tracker than we had at the time)
 RDEPEND="
@@ -41,7 +41,6 @@ RDEPEND="
 	>=mail-client/evolution-3.${PV}
 	>=gnome-extra/gnome-tweaks-40.0
 	>=gnome-extra/nautilus-sendto-3.8.6
-	>=net-misc/vinagre-3.22.0
 
 	games? (
 		>=games-puzzle/five-or-more-3.32.2
diff --git a/gnome-base/gnome-flashback/Manifest b/gnome-base/gnome-flashback/Manifest
index 2c26fd5eba54..f6b5db14ea65 100644
--- a/gnome-base/gnome-flashback/Manifest
+++ b/gnome-base/gnome-flashback/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-flashback-3.42.1.tar.xz 867508 BLAKE2B ddd98e14dede69a43db24acdb8358ad51de90d311a8738a14ad403262f3b0790c4689b2c49d51706d8645c76a70e5d60dbbd6a82acea55d0898761ac0a479d25 SHA512 bbbc9ad419c4bedd772a41d88216d41502a657e1a02dbc32a80c7dd8984e583bd731e7e90932c0537b0e96d511244fec400e76308e9d8b57eb24491fa3334d4b
 DIST gnome-flashback-3.44.0.tar.xz 884008 BLAKE2B d9815634216537f59aa3fb7c50c4ddfcb295a85c2548bd3f5669a1924cf9a3f46fba05a4d7a1cf265f514d5f0f1611992f8b120e76771140bc4fc35908e5c688 SHA512 7a39baa5e37cd01dc6d3b5fff3ef4c99240106f9e13c68c2ce1db19c3f9a672d4c22602e3ca3c4cff28226c3bd26525500bf002fb598c1af362ce15d7a92b55e
 EBUILD gnome-flashback-3.42.1.ebuild 2586 BLAKE2B ecd77b8d792d3ad3f32f30650a92592b86971b957c26f4e725532efaf52a896e0ec3dfeedc696c692e7d5dcdb02730be493559077e5e93c897a464ea94aadb96 SHA512 56d9ba1f84cd7e2d67f0ea95b92302d23f3149b94eca89272df806149b98fb79fc3cd927a97c44f63a5779dd44cbed6cfe047d04e9c911a12f3de1fe8cf5906d
-EBUILD gnome-flashback-3.44.0.ebuild 2586 BLAKE2B fa9544cfe86f9a0ffbedf8fa401ea697beacbc268a60b68b65b265eb43dd9846b4c967aab0395df8d0c3668504c3612e80b3e2c7319516b2c26ce5310bda3bd2 SHA512 96ebe2b543bcfcadcb1ad49ef61b0bbf9f924f129d4ad8fd053556959ab499eecc6a1bb03d63b99125edf2e87e0f662c5978e6fd6fa818e0470cf06e33a44d1d
+EBUILD gnome-flashback-3.44.0-r1.ebuild 2589 BLAKE2B b2e195c27f49b70bfe541b9e14b868e6aca6608bf6b7e0be5d5826f678feff24b096b2ec6864367656785b412a04a303d75af5ecf7f8e5abd2af923f514c7180 SHA512 a40c80376f19452dba585c7789d7accc70027686262df0a1e3891edcc6c9a8fccabccce360105772f27ef636127ffcd5f0c4f5d05b6932adf287297733dfa096
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-base/gnome-flashback/gnome-flashback-3.44.0.ebuild b/gnome-base/gnome-flashback/gnome-flashback-3.44.0-r1.ebuild
index daced3cceb4f..c1764084fd00 100644
--- a/gnome-base/gnome-flashback/gnome-flashback-3.44.0.ebuild
+++ b/gnome-base/gnome-flashback/gnome-flashback-3.44.0-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 	gnome-base/gdm
 	elogind? ( >=sys-auth/elogind-230 )
 	systemd? ( >=sys-apps/systemd-230:= )
-	net-wireless/gnome-bluetooth
+	net-wireless/gnome-bluetooth:2=
 	x11-libs/libXext
 	>=x11-libs/libXi-1.6.0
 	x11-libs/pango
diff --git a/gnome-base/gnome-mime-data/Manifest b/gnome-base/gnome-mime-data/Manifest
index 7dd606940bff..18100f678e24 100644
--- a/gnome-base/gnome-mime-data/Manifest
+++ b/gnome-base/gnome-mime-data/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-mime-data-2.18.0.tar.bz2 607012 BLAKE2B 6653e11f04f94035e7bf7d12413870b6e425bb32c50cd0776fae93be05eaea6eb4116f8d068e86c39fca9a3f86148934357d5a1c538a7deaae117151b8f1e466 SHA512 132996786254799341eeaa7894749cf4a95e391e31d985b1527b2f3dfeeeb01e7cc000753fc21d559db07fcc92018f4839f170eb149cb457fe06058ad3d986d5
-EBUILD gnome-mime-data-2.18.0.ebuild 589 BLAKE2B 3b028618b2293667cf718adc562d6bbf90cfdd729fafd70a0dd6446fa8c6be7fcf81509c3e72792ae17a720efb4bb8219a02f398de1a4341e251ac5d5e50b9db SHA512 dd66b7321bc982e1dbf5344bdf82308d0a458733b1d4d04eafef2285aa976d8505f752918958920c60cf268fd5b003b51176258f8e38a8e790b37ff5b25c470f
+EBUILD gnome-mime-data-2.18.0-r1.ebuild 551 BLAKE2B d619182a20600b2333de6faa8e37edda225ceac3734d227a3fecc580b21923f0f7af725b977231fbeaf20d7e80a19e307f7c84328d478838229a71ace077bf48 SHA512 54c1a3b0c691183dc4a45987a8815adbafae1392a0b4bd231159f660fa9cdecbd5e5fce6a8361f1a5f9797b4aea5de653dfc7737788c6ec088e170a429721f28
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-base/gnome-mime-data/gnome-mime-data-2.18.0.ebuild b/gnome-base/gnome-mime-data/gnome-mime-data-2.18.0-r1.ebuild
index ea06fb291d93..d964ee79cb06 100644
--- a/gnome-base/gnome-mime-data/gnome-mime-data-2.18.0.ebuild
+++ b/gnome-base/gnome-mime-data/gnome-mime-data-2.18.0-r1.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="5"
-GCONF_DEBUG="yes"
+EAPI=8
+
 GNOME_TARBALL_SUFFIX="bz2"
 
 inherit gnome2
@@ -13,13 +13,10 @@ HOMEPAGE="https://www.gnome.org/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
 
-RDEPEND=""
-DEPEND="
+BDEPEND="
 	virtual/pkgconfig
-	>=dev-util/intltool-0.35
-"
+	>=dev-util/intltool-0.35"
 
 src_prepare() {
 	intltoolize --force || die "intltoolize failed"
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index cc14c0f9cf06..96be117d5658 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -10,5 +10,5 @@ DIST gnome-shell-41.5.tar.xz 1899888 BLAKE2B 73491f382413c313956fc6ab878a54d8a88
 DIST gnome-shell-42.0.tar.xz 1918044 BLAKE2B 742d13ad92795fb71bbe8376a86b8e9a828882288f105f026cf98304ef2e9eae8fb967fa978ec322f5c621303a1798d3490c001bbd63c704b0cddc5db688389d SHA512 39b56d3c09a238d9ca387145fdbddfaa929b124d4006f097b792de2dceb882e50cbce1255b0b4585aea04b522a92a4e7a743367f43a863f95bb6386401e73935
 EBUILD gnome-shell-41.4-r1.ebuild 7395 BLAKE2B 3769ab65768b699cf7394ea80a22274279c3d410da4b3d05ceb7f1ce33d9aa41524a0bb4de2a5b11acf9b540cf11c5c9a23c236e4a2df6e41544a74577a37ab7 SHA512 4af8c66e12a16e05e82389a7a28a7e49ae34ed72e68b6ce373a8c223be207f2fdbc007ec9d8fe57b4a53e5612c41f062225fe47d6851cd5481e3d34051cec2da
 EBUILD gnome-shell-41.5.ebuild 7610 BLAKE2B 52e2009ac7e4ad24ca062608bd131436d7533f7a228258d6a525521fbe23060fecddcc3823fe696f1f5252abfaad765113bc677894647da92dbfbbae273200bb SHA512 27a9f2200200fba82eb6ff9aabddce02533077aa1d5cb64e3977e49b5d07fa085a00810de0f68db59554589502f8537ff9d34ceab354215aacdd26e9f7442217
-EBUILD gnome-shell-42.0.ebuild 7339 BLAKE2B 4601218900ac4c6704401ce87422fd66f1917c593434e1b43f89fa066bb3f94f75a312b6168d94dcd9de165c8ad3fa94dcf036893be72e142b4d820b3ced4a55 SHA512 d51e4861fcd4854b16ce50f4fd23eacc057b6a49d4f92eec2601f91868c57031484feced5c502a7060e66f0f65d8f6da888e5cee5ef8f12503ecbeed7d60c2e5
+EBUILD gnome-shell-42.0-r1.ebuild 7336 BLAKE2B f83be460fcfbd49398804bd30618aab5ac678e676a3e1f46daa7785780d7883af1c4d07614365633d7f48609a0721e0212b09850786cd82a56319fdd7507f434 SHA512 37976b8a9762d017688ab48459ecd091e7c5ef722f392a547e23b422b9cb8aa031db278612cf60ff003e61d9007935e7e83ca95b20826f08e6908b6bc04fed6a
 MISC metadata.xml 1051 BLAKE2B 86f9156deb6546719e6bcd09ad609b2837901743dd390f430521226df6b9e8f54387d2c93411d63d0099261ee0463428fb8854ce2c47463b999827b377807d84 SHA512 f6a3efe242c1726508a56506a7817c3beea3cb17fbe37d2d38403bc6f4f1d11fd366b68b5c9c6ce44f200a21d48da6ccfcf07c9758369481376b5882ea872129
diff --git a/gnome-base/gnome-shell/gnome-shell-42.0.ebuild b/gnome-base/gnome-shell/gnome-shell-42.0-r1.ebuild
index db9135e544bf..f7c9320819dd 100644
--- a/gnome-base/gnome-shell/gnome-shell-42.0.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-42.0-r1.ebuild
@@ -108,7 +108,7 @@ RDEPEND="${DEPEND}
 	networkmanager? (
 		net-misc/mobile-broadband-provider-info
 		sys-libs/timezone-data )
-	ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
+	ibus? ( >=app-i18n/ibus-1.5.26[gtk3,gtk4,introspection] )
 	telepathy? (
 		>=net-im/telepathy-logger-0.2.4[introspection]
 		>=net-libs/telepathy-glib-0.19[introspection] )