gentoo resync : 10.02.2020

18 files changed, 110 insertions, 34 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index f4e30f424959..288f04b4e210 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/chrome-gnome-shell/Manifest b/gnome-extra/chrome-gnome-shell/Manifest
index 0609a5756f91..c520c639ee50 100644
--- a/gnome-extra/chrome-gnome-shell/Manifest
+++ b/gnome-extra/chrome-gnome-shell/Manifest
@@ -1,4 +1,4 @@
 DIST chrome-gnome-shell-10.tar.xz 158972 BLAKE2B fe4df942f885aee40d5c5e01dcd127a9deb46aeb57765336c91a7a9c56f7c953eb36d822ffa821300b99e3d765c1b162767fc5debc24e42a16bddb1404796c9c SHA512 cf0d108c3fb57deb4926a4cf043dd64d776eda4c01ec595a1472c6c45726b8460381b9bd7cb1b43d7a5bd8a585be0d1b648c720a2f0a7a377c133b8750e76cd6
-EBUILD chrome-gnome-shell-10-r1.ebuild 1400 BLAKE2B 1eff2159294e582f96506fbbaaedf163d7ee6c6adb5cf8824971e5ea923f8338c9773890f77e0620a5eba7016c89e8603f0dd550dcdb54c07b5bf23470f1e414 SHA512 8a2561cae747ee489341f04fda2cde8b7dfc0eec5a74caf742797497dc3db221e0206fb24bbe43b77efaf72e7f8dd28fca63e0ab4fb022a4ba70cb5ef01f0fc5
-EBUILD chrome-gnome-shell-10-r2.ebuild 1410 BLAKE2B 1a0b6a89aa703cad9dcd490c19d65848425c282a0f688c00e3ff1215aeb6f47da2e2c1f208a75baa44adaab9b7be8c6cc74274de7912bcb92c6b06bb42dc9084 SHA512 a531ec080633a497d82c8fdcb231d78db58409c806983538b9082634d220260af3b467e0df0bd3fafa5d8c5b8977883c0a7e2ce223a987f96b45ef6711e6e172
+EBUILD chrome-gnome-shell-10-r3.ebuild 1433 BLAKE2B 0291ed26b1aea206a1ba70cfbe355bead13f0452b15b04b778a675f5521253957494507b5f3960155aa8e3c8206568a9e2cc45be690abaaf4c091a3c5c37476c SHA512 89aed312c59e3612cb4c0023f0bd8608de1df94cbfd35bc38744ac4673a8e83284124174fe0d64dc0bd8194291cc99a8db38ebcaabc6cbc175866f0cc086ce85
+EBUILD chrome-gnome-shell-10-r4.ebuild 1443 BLAKE2B 299b9bdca0e2e6e1f819bf6b258be131597f9d916f16476e3b5a1d2381b263ae7db1dfba842a897334ac03ff8b141f8a3bc284702c495399a04cbe9e6bed62c3 SHA512 e8d6ec606faada72c84e73c31662242f55ca0d1fd7a35810abe89c7d1de171747788f556900a8889160cbb060567c9f58711dd0590204ba822a6ec187dbdf287
 MISC metadata.xml 538 BLAKE2B 730cc561a29ab8e4506843dfaa1520af6a8ef1b3139856fbb4e7ba077eab90f28f0440c0b511e0c11167961971ebe0b1b7b53ce386d2f82d4d20b0e9f41664a9 SHA512 fed3f8fac456d95085878b4f3a5f9a0c139df07d4c3a515412727f4e4a805456736d5e36df6397e2a38dbf7043f4e83e2ffddf2615749fa7a43734a17b0ea3b2
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r1.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r3.ebuild
index d60ba0d0a1ec..b7c746b42dd3 100644
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r1.ebuild
+++ b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit cmake-utils python-single-r1
 
@@ -23,8 +23,10 @@ DEPEND="${PYTHON_DEPS}
 	sys-apps/coreutils
 "
 RDEPEND="${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+	')
 	gnome-base/gnome-shell
 "
 
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r2.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r4.ebuild
index cc94f8f1db72..b70997c19680 100644
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r2.ebuild
+++ b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{5,6,7,8} )
 
 inherit cmake-utils python-single-r1
 
@@ -23,8 +23,10 @@ DEPEND="${PYTHON_DEPS}
 	sys-apps/coreutils
 "
 RDEPEND="${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+	')
 	gnome-base/gnome-shell
 "
 
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index 6b9a3652be99..bc4e3db5a4c9 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -2,7 +2,7 @@ AUX cinnamon-desktop-2.6.4.systemd.gschema.override 127 BLAKE2B 9e92cc304697735f
 DIST cinnamon-desktop-3.6.2.tar.gz 571728 BLAKE2B 17a3297b75a1ba9e34ff5ef8b7252748b4300fe40381b8d5942fcf5baaf7532a560cdbd918d2dc7ed34921e357c61f74d947a5e2174cd7b0310f91015a4bc4f4 SHA512 75af7ec916d43d02eebe9a83214cdb538067f6b674ca76e109f3bed909e61df11ec83350e97505ddaaed24f097e7b20512822e30b52d14a39d6a0e3d582d05fb
 DIST cinnamon-desktop-3.8.1.tar.gz 489295 BLAKE2B cc2216040387ff573d4cfc740e7e400862c8fc1361f38b2771ac94c490a8710e487ae1d33ab1a7ed98423c94e77bba32db6cbc563e9152c67b011459f91ad123 SHA512 d4b5e6d848a4cb01e811410da8b07d2a400f6632abba9cc0ed74e5321ba3fafd1ec9ac90307eb56ba7047dbfabbad9526e1348533c6207c9a7756c24751da933
 DIST cinnamon-desktop-4.0.1.tar.gz 489598 BLAKE2B 3d223faf0d9381bc5bcd4be131f9dbe1bea0f6ec57cc5413e24fac8a1855737ba55f55faff36436c8b8d6266be264d96ce51ec1bd8c1406f5737c9b3ee41c0a9 SHA512 68ce970736eac025c5cf73239dccd010d70197011e75258dc234bdbb52346466f51fc211c58d2ce730e63fb6250fa763ccbdf44cc08df7a028a0bea01826ddb4
-EBUILD cinnamon-desktop-3.6.2.ebuild 1707 BLAKE2B a27d76ab355d0a08bff965af58ee2e1e0109103b1b1674ec30f56b0a3a2d1b3254465fc0a30fb3970851f03d22da3684cb3422bd8ef3de411989febec57da776 SHA512 6bdae0da4d55048bee8c75089b2dabf984b1b9fdaaabc9c7bd1175bef1ae8aad8f91824b8903e7d0b45660daa461b2270b46c910186b0b890b16e5af35f9a873
-EBUILD cinnamon-desktop-3.8.1.ebuild 1598 BLAKE2B cda2a5ce6c91a8015aa938459ef6accbc52a80af537675e2e9b04f9b0b69fc30dcb392d93fc10eaccacbdb4a5efc5942f8aca071ca9a7430593744e539f863c8 SHA512 ec8376b02023ce576c05803e9bc10bb0a1d66f6da9e46e83299b5a1912dd93312dd5ae50d017eccc210d15373e73073fc228f77be6d4411bec6f5cff910857df
-EBUILD cinnamon-desktop-4.0.1.ebuild 1596 BLAKE2B e9d6cdf9b1456819080c6d1f876a969c71a54e5ad0ec5dc981490b10a8d774bdfcb6be79f01b13a71c3a381b51717b380be0c25c23d69ae1a4b47f0409f1d30d SHA512 59146b09cc7e3731849234c589a8d10ca605baee4ce3c584da29d3871a14c7173f1522e1e4ceed543f10e782d801c9f631d7f2a844178182ca19472c6fee36b0
+EBUILD cinnamon-desktop-3.6.2.ebuild 1743 BLAKE2B 69c3fa571dd2c104c3f68055a31c31c7103535cd777f5b5e10947054d75634fdf00cc784119e4a0b0edc4433d7d4fb3b6ab4c4193b80c82af029147fe7660ef2 SHA512 c3f038f586b59dbdf00f8c68448212a306352cfa56557ac8701669f8f3cbe1957769aef2364d00862b9b1a268afe4b4a2485aa7618224fed1aeae82e8cbc5d65
+EBUILD cinnamon-desktop-3.8.1.ebuild 1634 BLAKE2B 0eaecb7a494e0cdb860b08023d7cf30da2beca7cb55bed7215d630ee8d4ba4e81afabd28a8a0b77391e03ca5e8b83197504ad989b99bee169bd540b4384f8cba SHA512 517f27825555ec909763d654a1b4bd7102f4b80f7b88fff52f5afb01489a50a11c06137ccf72a03fb9595837e11d0e945ec988e1210328157cd81ded08948909
+EBUILD cinnamon-desktop-4.0.1-r1.ebuild 1632 BLAKE2B b657c7b7a8f4cd7ff3662ceadd2c76c9005942b907dc30c585f1d4a4f98184c8c376dc3db250143343050355320f61462b45e59f52dc21ca54ab921e08347f88 SHA512 29e1b11182972589fd035857957f26d605d094eb011b8b232e7b07ae7a7e034674ad0c8ddedd324115dd66905131b35bbdd545bca3c28562bf4a6445506dd9a1
 MISC metadata.xml 343 BLAKE2B ad89f9bce993b3d57620eadf715cff2aec3e4ef058e3edc34f8b02478be2a783f6d3e90c645818ce7a6dea30274fd67ca093f2284123e677fceb0b89da80c95d SHA512 628ef0f1097a5afc62968982247ae10d2db811fd0e82944d64d1b7bb2f6dec888cf16a5bb2ddf5ca1317860abc099cbd63916381a4be69568dd0c21405fe0e18
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild
index e992aeb0f027..a984f3d7084b 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild
@@ -32,7 +32,9 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	sys-apps/accountsservice
 "
 RDEPEND="${COMMON_DEPEND}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.4
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.8.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.8.1.ebuild
index 15d3acece1d1..f9831b1fdf9f 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.8.1.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.8.1.ebuild
@@ -32,7 +32,9 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	sys-apps/accountsservice
 "
 RDEPEND="${COMMON_DEPEND}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.4
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.0.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.0.1-r1.ebuild
index 11d093a363c7..9faa5c73cd35 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.0.1.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.0.1-r1.ebuild
@@ -32,7 +32,9 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	sys-apps/accountsservice
 "
 RDEPEND="${COMMON_DEPEND}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.4
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index 00333fc0196f..a851d8d4dd3a 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -1,7 +1,7 @@
 DIST cinnamon-screensaver-3.6.1.tar.gz 154729 BLAKE2B cd94413791d0500f01ec8eefc9b003e635c1bdac35d37768097ba19aff3005359e6596d3795dcf41ded9338f33dc9b68f6fdd5b7556eef9fbdcb88b8de4dd500 SHA512 9fd5ad0227993277d8ea773cbf80de7d3d7145eb38014e3673d2c31f9947dae0f45cd961077c56cd17deb6422b128ea56c909f4974ab55953bd42c63a2a2fc37
 DIST cinnamon-screensaver-3.8.0.tar.gz 161238 BLAKE2B 1deb5439c30eed8f16240cdacb20beee3dfeef9529d9efb913f4922b7a53ebf3372f64f80c1afdc9899eb5350b97bccf9a1cb98d703d19afa05e6ce11377531e SHA512 9abed09abfdf193b66c70cd2220d7d7aa056a99b6ffe12e3d80ea8af39d4aef79f0851e83b525850cc56da5944d7b29ceb8c4e15e2bc1e847ce62c13c45d1bdb
 DIST cinnamon-screensaver-4.0.1.tar.gz 156640 BLAKE2B e82354ce36fc325f524e60680c51d46ba7924154e2ff64514687498a7ebbf13d626e5441177d0679c763a4bd3c10a2b7e08ed01470358bc4606be90d37867570 SHA512 c1262d6c1e9575da8007f41f637ab9f7ba33ad5a3a909a7b756cef1f4cb0f323ea4d89fd7498d9589975b9fa6e4715d631413eec7fbcb9c3b46d3a42e02ac7bf
-EBUILD cinnamon-screensaver-3.6.1-r1.ebuild 2048 BLAKE2B 728f9d272a513df250a21a46b145925ffca408e8ea2edb26d2b621301048856d9a2e9368d9c11a5a5d47e9bfd4c00518722331db1b6f1c7196d5d711f01ddec0 SHA512 d19c887fce833b393a3d08261f114807004a596ae304e3f27e54728ad15f5af4c58db53573e4e31e3d4ceba74253449d03bcfee60b31371e3f2d86f9f10a4a0e
-EBUILD cinnamon-screensaver-3.8.0.ebuild 2050 BLAKE2B 5bc23e21d25e85118664b76aad715f4b98f281a428f7f095029503be2322e32efca561868fc85bc25fa9787c84f6c2eb62dba8062507966c536b8b46b67c95c8 SHA512 0c5368eaf2f7c54664eec25cd6e03d0c08487363ef397f83ef1797d424078d72ef6ecd58affb425d30f13867fc7e63d79037e159b9506419f6707e0141c41611
-EBUILD cinnamon-screensaver-4.0.1.ebuild 2015 BLAKE2B 8e34b8d66019b7d26b12c55b2f706d64175c3f969ae75de3de429300de5074bb56ad77cb39e49d64954410b063b082976f62d497bd42b44626ff77f978905d2b SHA512 ab53233f1c32b84e251f2eb499cf73bc8651d6afe92f4481117f305e94e08372fd013924a7c602da6d490bd6b8e94e2dc294d4778f059c4eb37cdf18cbe1401c
+EBUILD cinnamon-screensaver-3.6.1-r1.ebuild 2105 BLAKE2B ff5d34cb4f717e3bf6f308943db027bce5efda46c12b6ae9f6992812b0756851883700714bbbfbad7941d1ffd303a968f4b201a7f944400437e907e50a09e278 SHA512 aefbfb732f13e5f9fbf24f0d70d3655dba05a0769076ee82dd2b930c1176155d14d7e28feb1cfe1583455a146432141d827c06f44efae74e28482c4fdd2199d7
+EBUILD cinnamon-screensaver-3.8.0.ebuild 2107 BLAKE2B 70b1a8932cf889d7fb09cbf3e11546555519e1a0d0e4e09ad0089db185ede46368a821838dfcf72f1bc20baa7d36adfbc866465db067a23a957a80568bbe68d6 SHA512 a65b8fa9a8be1839162c7340e8b0a2eb7dd43b7e9ece8062808d4e9d62b42551fffc189ba2b7a730fea5d651d2792dad101cfba13e761aa719584bd826e3703e
+EBUILD cinnamon-screensaver-4.0.1-r1.ebuild 2072 BLAKE2B 006d373a431c276c83af2c4a2af1b18219ea02c52782af790efc67f46dbb1889f2fe672c7cba2bf35882fa2c20e0ba05cba176b7d4f72f5fb16f348904d0daaa SHA512 15f3fd1f49a4010a782ac1ff251881eaf56b87ff972545ca4feb3280cda820696770b3f6948c2540939350e0b89397138e9f1159ba5ccde33c5cd16dbfc987a0
 MISC metadata.xml 347 BLAKE2B 773184a65ac7d37b4a3d999c2a191c93b5b02fbe7a7649132b67673d6285a7cfdddc699e18d9c30312e776c8a323d773722b45fbd75991fb46fee079b689ccfc SHA512 4467748a71035d2147a185121e657c8fa84f7d62c80c5a5bc2eadea631d1dde6c741e1e33c39f839cca9c9a48dfbad99706633bccc48af4c5009b490f353d4be
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild
index 109631bea787..a9ae0d2b2e4a 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild
@@ -47,10 +47,12 @@ COMMON_DEPEND="
 # our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
 RDEPEND="${COMMON_DEPEND}
 	!~gnome-extra/cinnamon-1.8.8.1
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/xapp[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+		dev-python/xapp[${PYTHON_MULTI_USEDEP}]
+		dev-python/psutil[${PYTHON_MULTI_USEDEP}]
+	')
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.35
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.8.0.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.8.0.ebuild
index b4a515ce0514..36c7cc681d2c 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.8.0.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.8.0.ebuild
@@ -47,10 +47,12 @@ COMMON_DEPEND="
 # our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
 RDEPEND="${COMMON_DEPEND}
 	!~gnome-extra/cinnamon-1.8.8.1
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/xapp[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+		dev-python/xapp[${PYTHON_MULTI_USEDEP}]
+		dev-python/psutil[${PYTHON_MULTI_USEDEP}]
+	')
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.35
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.0.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.0.1-r1.ebuild
index fe990bf96f21..50d097882560 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.0.1.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.0.1-r1.ebuild
@@ -47,10 +47,12 @@ COMMON_DEPEND="
 # our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
 RDEPEND="${COMMON_DEPEND}
 	!~gnome-extra/cinnamon-1.8.8.1
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/xapp[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+		dev-python/xapp[${PYTHON_MULTI_USEDEP}]
+		dev-python/psutil[${PYTHON_MULTI_USEDEP}]
+	')
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.35
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index c73c81907013..01f83ef5d023 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -2,5 +2,5 @@ AUX 3.32.4-gtk-doc-fix1.patch 4057 BLAKE2B 7ca0773467fa13e540e18b18f7c5ee883c1d1
 AUX 3.32.4-gtk-doc-fix2.patch 1051 BLAKE2B c93cda6a5e60dd89beae2ee2d710ef1392c3c99265fe59a4b99dd873875aa93933fac513d4ed2717665a53d747578d94f475b58bb7f61351f637515d9e86249b SHA512 c77607534d7b262044658ccaf88a6281c294561ec9e84a78c6dc79385bd14fb7beda33a175fadb8804be3eadf3ddb3e72055728b6e978f68a5e6ce05643379bd
 AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
 DIST evolution-data-server-3.32.5.tar.xz 4588900 BLAKE2B f14d0782c00e9cead10e9e5dd6c5686d4c8a292d70027a08dbac027ba92b998bcea1b219447847284d225096480e373c89369e12198fdf2516ca5b622f81cbb2 SHA512 a1bc350a7223dc2e3d369f0ac8fb3ab210b6b1cc25311daf1ddae6926168f7bd1c3fab69ab261e442e3c30f9b43754e2f8e38ac2a5c32a714223d9741045a1b6
-EBUILD evolution-data-server-3.32.5.ebuild 4353 BLAKE2B c30d4c9b1cd2387a9954dfdd75179cec253c6be31dc1deabe78dff538bd18a5ba47c3e510a1fc4cce97ab45813e6b6ee2c1de639c9467d0876b116452102dda7 SHA512 2eef76ac77415e939a870bd2d421e15b386f7833cc6b76a20c19d44e0944046d4892d53de6ad239b51960e2a90ef0545bc9adbd55ae3ecb23c2594e31d17d04f
+EBUILD evolution-data-server-3.32.5.ebuild 4343 BLAKE2B 659f0a4f4d816830884fef39f3f2a546aa20c06b0019d703c2d5bb670112829d7abc0529a631b87decdfe904677c0b02e9c4a3f0b0fc86930a0419c3450acaac SHA512 7822ea9a2984d795a03f28039d2d3580f9b72d5ee3c1ed0afd79f714ae996e97e8ac55ba3da3682d4ad50ec74c1ce4dd972d75b5aa32dea608a47f907af544e0
 MISC metadata.xml 849 BLAKE2B a02a770ca4498189e14588af9aa58d82a7e28fbbfd99d891dfaa7e4148c71a0d7c89ae33a6b41899a174fd6dfa8ba012a2c0a3e342b58c8d84369010859f4b8c SHA512 da5fba1f5313c6bb027d870279ead3f9cf6da27a3fed183dced79abaaf3de4bbbc49076a01968e3af5dbe004f1641c7f0773801a040ba824924955894bcbbb1a
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.32.5.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.32.5.ebuild
index 3f15245d2c44..1c26f9c18bec 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.32.5.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.32.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 VALA_USE_DEPEND="vapigen"
 
 inherit cmake-utils db-use flag-o-matic gnome2 python-any-r1 systemd vala virtualx
diff --git a/gnome-extra/gnome-power-manager/Manifest b/gnome-extra/gnome-power-manager/Manifest
index e8f17901dad7..1caa38f8b75a 100644
--- a/gnome-extra/gnome-power-manager/Manifest
+++ b/gnome-extra/gnome-power-manager/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-power-manager-3.30.0.tar.xz 380820 BLAKE2B 9d39df24854f649ab3b40fcf454c7be73d93e3e99050b93ec5dfb86760e27055f856918e5fb7d7b53472a4062cf9b2039a519130bb5d887126a69326d9392737 SHA512 ed0e2a20bd8979fd9064cea9f4485da832eb44a2c727e39cde5ca9f9e2eb75a37e3d1b5a2181d9c666c19b1b300cbc62cd5f9e2c3f36ee4a4dfc3e1537a10329
+DIST gnome-power-manager-3.32.0.tar.xz 379136 BLAKE2B 3f9b385c37fcf1de3741781627d275057f67d489ed4b372f6f68495a707d9e67b78be9f186922a99a606a80008addd570943800ddb2ddd17d2071161b7276c49 SHA512 0ea11085dd015e30c1bdc6913000b63eabf7df76720f2d51d63b075f3b7bd2a610aaa484c53a4092d78d3c484ed8c4e81ec66603bdc6c132b0316113ec6a24a0
 EBUILD gnome-power-manager-3.30.0.ebuild 1094 BLAKE2B dc026aee1e73ff75549bf0f4dff27303ff4e11f039f65684b9cb812b8f04d0e7db920b0507872924b714152855cfdff3ef5e1b34bb6246608e82893a85626ffa SHA512 99d2492bda2450d55244196fcc63eaf814cb110eac13f1bffb058860ce481e2d0fc7daf5fd5be4f200acb115466c6ef0770c4101ce904ad8603609efe14795b7
+EBUILD gnome-power-manager-3.32.0.ebuild 1096 BLAKE2B a393d9460613b5bd75a580cea4e1a3c8c2cd1dd10a5943a5446c3bb6459b8aad0567a02b513151eeba1259815cc27b4874644359e8e4d548a93e0fb8692a6566 SHA512 c035f9faa3e5330b107da9999a50e6525622d2474ec941c50fcae6c1e1a1fa3c0e2c427c3620894f4819878f4022a2b2c1bc5f3d84b1a6ccfc08bbe3916cd624
 MISC metadata.xml 600 BLAKE2B 31046c118a172aa788bcafc57e5a2615d22a9ddbcd56886607a6b07a496adb950f3e05067470ea3b85298acf9ee045fba5fa315e9fe7eb7e72dc3fc9511f5dd3 SHA512 05290535ed07687c59013dbf7b3e527063a48f99da84fc6603ee48b4548d08e0ffe4a2f5836a100786f0ed87bdc43a68cca707c5f5f0c36a8126f53822561ef2
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.32.0.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.32.0.ebuild
new file mode 100644
index 000000000000..245404a12318
--- /dev/null
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-3.32.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="GNOME power statistics"
+HOMEPAGE="https://projects.gnome.org/gnome-power-manager/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.45.8:2
+	>=x11-libs/gtk+-3.3.8:3
+	>=x11-libs/cairo-1
+	>=sys-power/upower-0.99:=
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-sgml-dtd:4.1
+	app-text/docbook-sgml-utils
+	>=sys-devel/gettext-0.19.7
+	x11-base/xorg-proto
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+"
+
+# docbook-sgml-utils and docbook-sgml-dtd-4.1 used for creating man pages
+# (files under ${S}/man).
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use test enable-tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-tweaks/Manifest b/gnome-extra/gnome-tweaks/Manifest
index d3204dedc183..5a200f14b741 100644
--- a/gnome-extra/gnome-tweaks/Manifest
+++ b/gnome-extra/gnome-tweaks/Manifest
@@ -1,4 +1,4 @@
 AUX 3.28.1-gentoo-cursor-themes.patch 1019 BLAKE2B 1dc92c4f8e53c1303f884f6acc332a7a0f1bd11b463e91ddd4ae731938e678f75499692044b5c13021f24dd9bf61264c4454fab734fe65609b3b4c009cb2eee2 SHA512 e502e1ae5945517e7a69cd15436bc07e34fe0db739350e0617d02c9b7a45264f585229f80352a93595e1246d5f9c6e987242772dfb7293de06b400fbaf676971
 DIST gnome-tweaks-3.32.0.tar.xz 241492 BLAKE2B f3c0a25b39726600fc5d53d8d3c343dbcde594642a87fc56dd3fff9b88a3498e0f283568a944fc37445c138201db1f280222eb1161f5b8351c566537404cde5e SHA512 8107e9d2b33ac6c46e8d0076b27a1c3a84e1721e49a6b80da28fe854f6f4f6693bc7f7e836c54d39bafec79dcee8a6e2b2962580a77d7d01bfc06c6d11206d8f
-EBUILD gnome-tweaks-3.32.0.ebuild 1197 BLAKE2B 91c91da8ec72c7a5e04310e7062b6491353ee02bb9482f34d5052673b8000b475cd992ae55e3e4d10922bad30d7c9ad016d4f515edb783c0ee1750f50bc9e6aa SHA512 b3d6c6b0d6752f053ca36cecc0906591f86816bd17b76b3824e958cae07dc477af0faaf52932564d733fcff0ba655a329a62c14fe9224ef18a8e855a49837fcd
+EBUILD gnome-tweaks-3.32.0-r1.ebuild 1233 BLAKE2B 9241987e7079112f706e7de2153153502efa9ec9a187666e2792d797932c03744e1032be24679407fa99ee499b2da205c35335ff3b98a166c2fcebaff1d16967 SHA512 773dcef7bd2f9747dfecdad0d405331a394eb3dfe2a715d14ca828cee634c8e3f92fe76a768f3d1ed368ac8cc771c08a7600ef43fd746ea7ba1eb8592cbf9fc2
 MISC metadata.xml 556 BLAKE2B 0964398067f54577410c361418ce6f70d1afc4e1f064e3f67a1b3b6a7d37489124b7405f75c1bda57f0f25f74bc0b6ae144a4d5e04fd29bf1d180b5b4245a1a6 SHA512 1e6abce7e7e566d0c382956311c35ce9d70d044c8ee672103dc443eddcd7492e7bb4940b889213dfd7b49accce41269d820bb0b39d32e81857e3c6775609f67d
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-3.32.0.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-3.32.0-r1.ebuild
index e01e362cbc48..40f1b553668e 100644
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-3.32.0.ebuild
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-3.32.0-r1.ebuild
@@ -22,7 +22,9 @@ COMMON_DEPEND="
 "
 # See README.md for list of deps
 RDEPEND="${COMMON_DEPEND}
-	>=dev-python/pygobject-3.10.2:3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.10.2:3[${PYTHON_MULTI_USEDEP}]
+	')
 	>=gnome-base/gnome-settings-daemon-3
 	x11-themes/sound-theme-freedesktop