gentoo resync : 03.03.2021

21 files changed, 77 insertions, 34 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 91eb719dd812..2ced5d6635b6 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 7e9850356f2f..99f695bd0d4f 100644
--- a/gnome-extra/chrome-gnome-shell/Manifest
+++ b/gnome-extra/chrome-gnome-shell/Manifest
@@ -1,3 +1,3 @@
 DIST chrome-gnome-shell-10.tar.xz 158972 BLAKE2B fe4df942f885aee40d5c5e01dcd127a9deb46aeb57765336c91a7a9c56f7c953eb36d822ffa821300b99e3d765c1b162767fc5debc24e42a16bddb1404796c9c SHA512 cf0d108c3fb57deb4926a4cf043dd64d776eda4c01ec595a1472c6c45726b8460381b9bd7cb1b43d7a5bd8a585be0d1b648c720a2f0a7a377c133b8750e76cd6
-EBUILD chrome-gnome-shell-10-r4.ebuild 1430 BLAKE2B df7c6ee7968fe0d4daa5765b8b44ca5ca298a294122912a029108792631b2ba2a90f5cdac79df493a8e7179f60e2bd63f02fd11925f558fff1388a7a4a916383 SHA512 5f278f3241d60650de64ab283cc2405123d7d94c4c50b4d301c82b6349480cf3014fc18334e88dd8899bfa0073fd1bbc57ca6169b868833462a216aebe86f7ce
+EBUILD chrome-gnome-shell-10-r4.ebuild 1432 BLAKE2B c74858644f47f126e24eeabcf648ac3045aec7dd8d3b38b64f35bf908cc01c7f950c6510efcf231827ee71663bcd8d3bb3e7fd48bace5fa52fa6cea02d86c9ee SHA512 dd8aef0149709cdace75324872d96226d31f3f0e9452a9a497c9b9eb8f6f15c17c99635920425944aa5d517aa0cfb2e3ea76b2250492f915c812826a05d0439b
 MISC metadata.xml 538 BLAKE2B 730cc561a29ab8e4506843dfaa1520af6a8ef1b3139856fbb4e7ba077eab90f28f0440c0b511e0c11167961971ebe0b1b7b53ce386d2f82d4d20b0e9f41664a9 SHA512 fed3f8fac456d95085878b4f3a5f9a0c139df07d4c3a515412727f4e4a805456736d5e36df6397e2a38dbf7043f4e83e2ffddf2615749fa7a43734a17b0ea3b2
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r4.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r4.ebuild
index 84e442bee803..0482fd4e1ff7 100644
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r4.ebuild
+++ b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit cmake-utils python-single-r1
 
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index 540187dda89a..cdde22ea299a 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -1,5 +1,5 @@
 DIST cinnamon-desktop-4.6.4.tar.gz 495195 BLAKE2B eba62e0d99bf824ea034a3bfdf08fcb157e9e5b156260f31c4b41244649ce4fd54adfc192654cffb1336d72c678d32ee151b2a7bbe114dccbe078e66f85ad261 SHA512 09a0e521bd97d4eead9e84ca929a04202d3d4ef35e689d84578a534cc00f1be0a22e04c407f7caaaca4bb5b5a837bd1a2893cd727d0045f15ee20938c36fae72
 DIST cinnamon-desktop-4.8.1.tar.gz 495417 BLAKE2B 3947d39168b2c74ef82a1ad5835d423721d34d1f9f7099050207ba070348abfb0236f08c340bf5896672764a59d19646cb34e342ddd4c7dbb501797ab20cbb10 SHA512 57eaba73cbaf2cd91e07a417bb0573bd0af86712babccfc4f307c6745dd219f0b279277f7a740dcf21d06a6f9a656213436b2e54eda4cbdb2f1f80a5ff085287
-EBUILD cinnamon-desktop-4.6.4.ebuild 1217 BLAKE2B ec13e916ae58a0a7ab4e60dce5e792ef6992efd597abfe33352e013127996901b49410e95e986ea84041dfbe7305ff4a409835e6f6b6b696338ce00c9d70ef04 SHA512 8ef142907bf1ac49649c49c45ddc55aaccae53be9121ec85a45f8adaa670bc8d9568c36627d8d9e165e676b83c2651ff02d415a2a99fcf36534df0767bc93571
-EBUILD cinnamon-desktop-4.8.1.ebuild 1233 BLAKE2B 12bbe6112f6d79a0af6a4ba1954ddf33ff272461036470f7a02a5580e4bdc250900d42fa53d94a08b34d8037bb87c76c580c633ffc87884e7385d039e0eb8b3b SHA512 4c0f6741db2c0aba24b9cd69251734988245365da6353b1aa92a65ee9958a0ea56f36d9f86fbd2ee4632079f17a1667c61b117e6bc476c149620ab7298439b28
+EBUILD cinnamon-desktop-4.6.4.ebuild 1277 BLAKE2B d9d508f32c273b768d01dc9fe0cede0d660f1f8cc0efa926861f779be5a95fd32d5a863a396b1830c7f0f120d88d447455d912bc4ded497027c9663506fbffe3 SHA512 51ea1a2c794d2c43fbf7c5100bcfa7a81a2d5b6b936fe34b65b86c370e496cf2ff4a30817e8626cd291b2012e8c711fb3dd04883a2a5a37297104054b7f1e59b
+EBUILD cinnamon-desktop-4.8.1.ebuild 1293 BLAKE2B d13cfb22b3f2e19fc74526feac885728e809f451fd7e8ccfe74284fb07eaf0d2136d93493c25951a5054fd8e5f83c396017f4b203ac66f56cbc5a108d3a66aee SHA512 c9c8d6300997d3c7ae3a9189e9d1d3de3ccd3e2223d8c27b8f479cc69ecc4e4cd67cf92249cba805bc1736d3122585a7ed50baa3ea718a29a6f9d939f76d3a52
 MISC metadata.xml 465 BLAKE2B c78166d54a50ae1dbf4580564161bb0fd0c824b0f305d8e211452d089d8b88ffab5207c2ee63fd4bc83f434023fe87ab873b9d39c61a5f3199213647189adcdc SHA512 0298cc730405fdc373e8dfd11150651d29ed9d19c98370b2bb5dd19df1cfe5d83816e45d222c0eb103811d330a6508fef09001c00d6022ffe38997bdae771f3b
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.6.4.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.6.4.ebuild
index 414b97507d18..aa76e6dcb9c5 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.6.4.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.6.4.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{7,8} )
 
-inherit meson gnome2-utils python-any-r1 xdg
+inherit meson gnome2-utils python-any-r1
 
 DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
 HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
@@ -40,6 +40,11 @@ BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig
 "
 
+src_prepare() {
+	default
+	python_fix_shebang install-scripts
+}
+
 pkg_postinst() {
 	gnome2_schemas_update
 }
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.8.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.8.1.ebuild
index bcb26761e4d3..699cc4264097 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.8.1.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.8.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit meson gnome2-utils python-any-r1 xdg
+inherit meson gnome2-utils python-any-r1
 
 DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
 HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-desktop"
@@ -42,6 +42,11 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+src_prepare() {
+	default
+	python_fix_shebang install-scripts
+}
+
 pkg_postinst() {
 	gnome2_schemas_update
 }
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index 594e5d189e28..298224fe155e 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -2,6 +2,6 @@ AUX cinnamon-screensaver-4.6.0-python-build.patch 2751 BLAKE2B bc1449bba5365bc74
 AUX cinnamon-screensaver-4.6.0-xinerama.patch 1482 BLAKE2B 4908aed13aca65da9cfe91a9c86a202291abb1ee94d63765f3285f259b2076d41db063f11cc04cf1f223699c92f4c5910c520e43f8fa8a12047913cb8badf368 SHA512 ec7b5fd4104ca59b8790ea7925c50765a6e024ca0729754828cea539d99908153784ec1fa8f925997c4d0e58e2e1a21dbde729b21df216274ba479793a09560d
 DIST cinnamon-screensaver-4.6.0.tar.gz 141043 BLAKE2B ba9f1e02fb7567d269daa4eccdb39d2c73dd6ac6bd3a3a4e00e1bcec685b48394fc9247d5006f908091291748e013ae65cf7718a972ef67ed7fd11a226789d6d SHA512 c83a057ff12a22445a155d4f91a45638d922c9b2180a7655f1e34bfd8ddcd31ed901b5b038236fa0e06c6f7986547c34ee8ab61cd216b5bc75f1c202b545c28f
 DIST cinnamon-screensaver-4.8.1.tar.gz 141996 BLAKE2B 73a61e28210efc58a205357abd7b1ca5efce85c542a14ba0de1688ca3c6c86cc81cf02b7eee7d7a13d015d43b6084a0e5a5a0f417a3be77771ff969381c24726 SHA512 5f165cddf5cd3f079192179f2308e015d7d70ce52f5214a56f8fc4318fdc6d6fc2b522b1c8eca31b4799074e58bd93bdce282d9774d1a552616c9ae1a0b46cae
-EBUILD cinnamon-screensaver-4.6.0.ebuild 1631 BLAKE2B da55ba0ea176b9a1f7d23ce24d93bd66de2ef4f205ac795c6411d07333c7bd05bce7fdad668f0c942206001d825275fc9793c2df7ad9ce6126b7de78cb776691 SHA512 be359a6e8ddd91d818dc21dfe0b4037da056613ba08297e23218c8900eeed1f08b21f55214cccee69b67e5ee9c876279428e4e38d9104e496a4f1ee237b9f944
-EBUILD cinnamon-screensaver-4.8.1.ebuild 1588 BLAKE2B 0c55db31a18f0b4e9c5b9fd184337262c812291ef59e9f98dc77fe575e70a38adccb43fd45fbf0cee5c20ee880991b8d855cefab37b67dc81cb699adc7d1c8aa SHA512 eeab5f84e55c99fc8bbf7fb5873f8831a5510d7c26f3a99aad8b32435b970c22e2b13370d04ffbcb22fa7dae345700118836209a1af4f6b7e06a6c96765b003e
+EBUILD cinnamon-screensaver-4.6.0.ebuild 1672 BLAKE2B 8020bd0aecf18fa044f477bbe702d79f1ed67425e9c3cd81f84ba8a23ac34d3efee118c40f23ad54969e2d21a45a9e639f277b03b046a9ef89fd02eed90401f8 SHA512 5e3a30c36adb4de717363a092387c35ed664f01e43b9cde26d71b232dc220d6bf30746615645e594ce8fb0602477b210d858703ae9a44c41f08411ecc3b2f0a7
+EBUILD cinnamon-screensaver-4.8.1.ebuild 1629 BLAKE2B 79882f5056919c8f47e8f64616de115fb8f3dc3c3223d841ccf20b6b72b8b73f77ae7131e369aa288864c358441de1df3402cf4a703d984cc2116857952c68eb SHA512 68da60c0a1d8c03782631874c97ec72ded3733cc7bbdd18982070cb4b17a94829155a628ad5d0b07d362a4319ce74015f27607e44d81d79b6d323192c967cdcc
 MISC metadata.xml 469 BLAKE2B 0f8fdea17d41db323fbd27368ecb1d4ddf4fc625d32e73a5fad69fc8e6db19120dcdbc807455a3e28064aac8c78fbca4ddb72bc359d730f3661b4857a5a993db SHA512 05d67a25bc957bdcb9aca4c48d43a24898aae6a1d7c9740ced98f0751259de5b918b87cab75ec9f8926c6bad0858dd0254572229f33e20073f69ed73f01e2d82
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.6.0.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.6.0.ebuild
index 2d9d4dbde29d..e25d02acbe8d 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.6.0.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.6.0.ebuild
@@ -34,6 +34,7 @@ COMMON_DEPEND="
 	xinerama? ( x11-libs/libXinerama )
 "
 RDEPEND="${COMMON_DEPEND}
+	>=app-accessibility/caribou-0.3
 	sys-apps/accountsservice[introspection]
 	$(python_gen_cond_dep '
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
@@ -60,8 +61,8 @@ PATCHES=(
 )
 
 src_prepare() {
-	xdg_src_prepare
-	python_fix_shebang src
+	default
+	python_fix_shebang install-scripts src
 }
 
 src_configure() {
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.8.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.8.1.ebuild
index 350596781e3b..90fa66ab4774 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.8.1.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.8.1.ebuild
@@ -34,6 +34,7 @@ COMMON_DEPEND="
 "
 RDEPEND="
 	${COMMON_DEPEND}
+	>=app-accessibility/caribou-0.3
 	sys-apps/accountsservice[introspection]
 	$(python_gen_cond_dep '
 		dev-python/psutil[${PYTHON_USEDEP}]
@@ -57,8 +58,8 @@ BDEPEND="
 "
 
 src_prepare() {
-	xdg_src_prepare
-	python_fix_shebang src
+	default
+	python_fix_shebang install-scripts src
 }
 
 src_configure() {
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index 49897e6b30bd..544f064f046a 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -1,5 +1,5 @@
 DIST cinnamon-session-4.6.2.tar.gz 199292 BLAKE2B f4a2a7dc438846c6013b539a027cbc13359a3cb47ed01c6acb97daf4a28fc26da3754d4264aaa90e8f10504bb7415a82dcc509430825cfd3e50e3beac7c78616 SHA512 c4b9d21145a82ecd0c9645899bb76acff632c7cc7ce4c5cc162ef38b91c772a29c66ab1645a6e35f92dd121cea0bd6748cf86275bc95a2a6d045fdbb4aea7d24
 DIST cinnamon-session-4.8.0.tar.gz 199684 BLAKE2B 07baa1d359376fb1c5150224d3420c2ea2c06c2c015739835ffa2c8f0be751362b8ea2299e155369c0cb2d3e8493d5c45ed3f521bb36b6ddb092aff493f01b1f SHA512 21e40d3776c2cd2fcb70bf5597e7f97d415a3236b7c2bdb46cc2359adcb62ec34ad529841154f87ea4a38013cd329cbba5cd6c88e16c4fc4e03acbe38a62edd7
-EBUILD cinnamon-session-4.6.2.ebuild 1281 BLAKE2B f25092c655f38b9ec095a317d6a587cc2ba1eb606dc1a19a9ee7bd96d2b4d64ea391cef52c510942323e1ecff791f97d13e56cb60e838b726e616f7deb8c82ae SHA512 eff29152fdb20453e07f16b96a79736d2eac2d37c2176aa344ff8e35b6db1af3b5f3c28f43a332ba4b88736c17c727fb7ebf2af1924fd7082d6aed238c9cf1e0
-EBUILD cinnamon-session-4.8.0.ebuild 1305 BLAKE2B 9f24e5c4af03240ddaa147b494beef1a264ca70a2385725b949569258cf7faaa595ca8fac20aeb8ca57a609d7598a7608947d686b232efe8ff9a499c1d6d22e7 SHA512 bd66970e0f3d4f4988fc4c703f0c3ddf882c3b1c2008d718c43e34f4776de7fe3f91c2ce1d991266fe693787312be56605a2848b09b7ed499f2ac128318037fc
+EBUILD cinnamon-session-4.6.2.ebuild 1416 BLAKE2B 3d4089f43abe155d7f8a54ed1bf81bc172b78e067e2c46e6a796b22844808adf17e7a29b3c83a53c9471a362266f254e2c301ebcfff5881d33ff535ba506e73b SHA512 fb06b0991774065a279b46ec857e22424b6b222814adf4b1705fc6a35e09a8186131cbb5aa267d1e2df249faa1eccf18aaeeb668c5eb2588a7a011e903fe1d0d
+EBUILD cinnamon-session-4.8.0.ebuild 1441 BLAKE2B 8671cfdab5344d90f5e3e7ef28b667b27d5b25b1dcfa7bbef8c6d3f1c67469409758eea0821003cb07b09893ee228b5ef07d59a55598328663ce50060cd6b8c4 SHA512 1c36fb317fac0f938ec5729ec6023e7b96dc93b296d86d6e87b71178ca117e9ec5c14894b366ebc68f7dc79c6a0b1bf3cb4843043836749740b1e22c2f410900
 MISC metadata.xml 465 BLAKE2B e67971b7481b6dff91982fb7b3d72db752d62b683cd0043e215589aea4a026e5150b4da5a3798b8d09d39933b0bb41c5a62bfb41ff70ead0dcb01c2e4e732053 SHA512 35772b3727591d6cd02458d0862bdbd2346cb1d7a2640e9871a7dd0fa279ae7aece23e4f0194f10d67ae24ca999fd7463c6e29be470653d520c1295c7d679771
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-4.6.2.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-4.6.2.ebuild
index 03023fcda262..3bf079671799 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-4.6.2.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-4.6.2.ebuild
@@ -2,7 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit meson gnome2-utils xdg
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit meson gnome2-utils python-any-r1 xdg-utils
 
 DESCRIPTION="Cinnamon session manager"
 HOMEPAGE="https://projects.linuxmint.com/cinnamon/"
@@ -39,6 +42,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 DEPEND="${COMMON_DEPEND}"
 BDEPEND="
+	${PYTHON_DEPS}
 	>=dev-util/intltool-0.40.6
 	virtual/pkgconfig
 	doc? (
@@ -46,6 +50,11 @@ BDEPEND="
 		dev-libs/libxslt )
 "
 
+src_prepare() {
+	default
+	python_fix_shebang data
+}
+
 src_configure() {
 	local emesonargs=(
 		-Dgconf=false
@@ -56,11 +65,11 @@ src_configure() {
 }
 
 pkg_postinst() {
-	xdg_pkg_postinst
+	xdg_icon_cache_update
 	gnome2_schemas_update
 }
 
 pkg_postrm() {
-	xdg_pkg_postrm
+	xdg_icon_cache_update
 	gnome2_schemas_update
 }
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-4.8.0.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-4.8.0.ebuild
index 9efab00f5a58..48382c50c3d2 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-4.8.0.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-4.8.0.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
-inherit meson gnome2-utils xdg
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit meson gnome2-utils python-any-r1 xdg-utils
 
 DESCRIPTION="Cinnamon session manager"
 HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-session"
@@ -40,6 +42,7 @@ RDEPEND="
 	>=gnome-extra/cinnamon-desktop-4.8
 "
 BDEPEND="
+	${PYTHON_DEPS}
 	>=dev-util/intltool-0.40.6
 	virtual/pkgconfig
 
@@ -48,6 +51,11 @@ BDEPEND="
 		dev-libs/libxslt )
 "
 
+src_prepare() {
+	default
+	python_fix_shebang data
+}
+
 src_configure() {
 	local emesonargs=(
 		-Dgconf=false
@@ -58,11 +66,11 @@ src_configure() {
 }
 
 pkg_postinst() {
-	xdg_pkg_postinst
+	xdg_icon_cache_update
 	gnome2_schemas_update
 }
 
 pkg_postrm() {
-	xdg_pkg_postrm
+	xdg_icon_cache_update
 	gnome2_schemas_update
 }
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index fde98d5b5808..1a7601708c53 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -3,5 +3,5 @@ AUX cinnamon-settings-daemon-4.8.5-build-fixes.patch 4529 BLAKE2B 9e28834a8d2d09
 DIST cinnamon-settings-daemon-4.6.4.tar.gz 668339 BLAKE2B 80e14d29a74004c1778e90d39c6ca892d3eee778134e43b8ea77cfec8cbad4f5ac21609cfbb9cdaab0b4d35b42e897223a5b9cdfd43de49d8112b8bc6fc45914 SHA512 77ddb637fd93fdfd59fb27c5a10082259fd99b4753ff36b3473db12f2fe0d19ee89d44c9e72f1ce9eab3f228c5fef418ce774dd78746d77b959ad9d8f93c1208
 DIST cinnamon-settings-daemon-4.8.5.tar.gz 662123 BLAKE2B b3ddd72e55c10c2cacc6dd29145e381395bd2ef68db7082a0770bb3eb647964041ed023d4a8357f2adcf5e8c9f8f713bac837809ed5926cc0434c2dc3e5c90ad SHA512 4a1d128b3f6faf3e2c13420d3569d4fd8cfaa1798ba5cf83fcb692662b9888d22f9f4bfb6fe18af59d0632583a2730a07e3ab48cca12c357b2d318d205fd7d0a
 EBUILD cinnamon-settings-daemon-4.6.4.ebuild 2562 BLAKE2B 9ca766a67b310e90461b3dfe889b75a20e0698ac5205600a09ce92b7e5d87676d84bcf901b4669db238a73fdbba5db79065e3b68ae0df2670821dab941d99bcc SHA512 f576c527dbb4aac5145e8b0b56f3a4f5e5c3382e9f5cb766abf29fa1a6fa652af99005d7d24a3d508d2c3341e65036046ff55f34fc5b258b82a52d1ba2d1c557
-EBUILD cinnamon-settings-daemon-4.8.5.ebuild 2221 BLAKE2B 05986492eb00c87560c61741b53d0c8f4e435cd7bb7a31f00f461ff1a44305489ce16de2cc565e73a530c0cf73e195c915ecd11f134d18655726f5e9b9e06c3e SHA512 024bb484e2e5f11b79882c36248f730b8a13cb076f70b9b341f5a0870698a2371820e0ee85166f6fb339fbeb825457af0e184c1b5091f35330bbacdda13f633e
+EBUILD cinnamon-settings-daemon-4.8.5.ebuild 2350 BLAKE2B 70436726dbad58dab73be4f1263d35200c282a1ce7fe1821bd5a31b784c87024d4f860f334a1995579b984b7c49a5f646709312ea5d91a22ff7e92aabb3a414c SHA512 40e3de6507e938492a9e539b93b606ca50f36ff216896dbb78675aabf8e71bd1c22afda209647d7706376d9bb810843891f1ab46fc7c6141817bc013cfff244b
 MISC metadata.xml 473 BLAKE2B 653c7036ca8c17890778db69bab8294046cff31b4af5ee5148a65181183231cb83e4898eba4e9b3a10565ae6abebdc6b3720d2401c6f397861031d7d19df9521 SHA512 6b3a5f8882234339eddabdc46e3ed4fe34e985558f90e516f31f6e4953719bec084a5e4090f473ef7562ac81427c2a6a122c01020d3626b5aecec50bfd0aac7e
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.8.5.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.8.5.ebuild
index decd70b8dc19..67d58faa2c5e 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.8.5.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.8.5.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
-inherit meson gnome2-utils xdg
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit meson gnome2-utils python-any-r1 xdg
 
 DESCRIPTION="Cinnamon's settings daemon"
 HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-settings-daemon"
@@ -56,6 +58,7 @@ DEPEND="
 	x11-base/xorg-proto
 "
 BDEPEND="
+	${PYTHON_DEPS}
 	dev-util/glib-utils
 	dev-util/gdbus-codegen
 	>=dev-util/intltool-0.37.1
@@ -68,6 +71,11 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.8.5-build-fixes.patch"
 )
 
+src_prepare() {
+	default
+	python_fix_shebang install-scripts
+}
+
 src_configure() {
 	# gudev not optional on Linux platforms
 	local emesonargs=(
diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index e0456c0cc0fb..26956eebfe7a 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,5 +1,5 @@
 DIST cjs-4.6.0.tar.gz 463060 BLAKE2B 466f807539ea95eece8b468287582f2c085ce86a63cf37ed1489f6ed20c98dfcb7028c7679102526009b71aba7d737f6f56c9544bc926fbf5a0be540afeaee53 SHA512 b7b457b43b756918670c9acc1064fc5b424d7bb7ab826ec207595c98159f407411ceb6d3043d305570f21f7675e1b699d7e95466688835034e178e079e118dfe
 DIST cjs-4.8.2.tar.gz 600711 BLAKE2B d1506e599c05301083479df4145d3177c9cbb057d3ed260e9744994da70fe392eb2cd872dc00b1ef6269efe9442e32e16878ba975f57f1abc35851cb15e7bb97 SHA512 c607198847a3229443bbfa6906b05036295b6d7f95d3b355780b28e69382407a8f6ef5f637f411fbf2ae474c4c7c5f68f64fec6dd7a2e7f944945927f5efac91
 EBUILD cjs-4.6.0.ebuild 1693 BLAKE2B 0e85f00c9a38a3b83231a5770ea9e906fd3754de9a78c70ccb05f9be4764c4764335c8af557dcf18f1caccbe2cd5d734f5553c1668d0f53b59c478a3b2112fbe SHA512 9a84918c0453f47af3e65400dfd9ff8b021e94f289d402888b06b0639135588649625e73ba1e086a07011ec9ceb3018a0a2d631f55d4ff3840c21b2cb3a12aa7
-EBUILD cjs-4.8.2.ebuild 1383 BLAKE2B 87d62b29c5b744834cc6020bdf11722695e27b66d3646a8c9d2f0d3188ff911d82d10eb0add33ed446add1d389cba985c973f00621c830813e9a126b65be9632 SHA512 030b1363087aeac571d7e422dc8ece1672b025de2792523ccc0fbb6c6b5f106557023a0f14b7594d5729c6be3ede07b151fc11cb5d7f7f464cddb6a880ba931d
+EBUILD cjs-4.8.2.ebuild 1502 BLAKE2B f16b1a4fd392e78984d8c3c73e2aa04ceaf50c422d8aad5aecd1112bea02cd85f12ee0e732862e1e4cbce10ebee7c3b6904abc1801ad70a639a619b9a118abcf SHA512 3f02401b9061c5d2161b90db5b22fa85eddf85c6ca0f60be6fba6ecb7cc1c35914bedee6c1a74a6fd7ad3ba80c308f67ab97ffb1dcad2db6c346379d8c4707f1
 MISC metadata.xml 577 BLAKE2B 7b78b21cf3c8fa925625a56ece9a134b4c3ce3d40a8ab2dc33449c0fc37702ba6284c95f21404a864ff920b3fee2e53a5dcf85ed03b5f72fca4c8bfb32d3ef65 SHA512 e7524b00348868c07b931d72bf765f5d1690ca8c273c5d9a61123f78e57fd5d0680efc8074c6ef19322047fe9d26b8d7de843260dcf745006e585dd990c37c47
diff --git a/gnome-extra/cjs/cjs-4.8.2.ebuild b/gnome-extra/cjs/cjs-4.8.2.ebuild
index 2daead9e520a..59ef8a7d5a6c 100644
--- a/gnome-extra/cjs/cjs-4.8.2.ebuild
+++ b/gnome-extra/cjs/cjs-4.8.2.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
-inherit meson pax-utils virtualx
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit meson pax-utils python-any-r1 virtualx
 
 DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
 HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cjs"
@@ -33,9 +35,15 @@ DEPEND="
 	)
 "
 BDEPEND="
+	${PYTHON_DEPS}
 	virtual/pkgconfig
 "
 
+src_prepare() {
+	default
+	python_fix_shebang build
+}
+
 src_configure() {
 	local emesonargs=(
 		$(meson_feature cairo)
diff --git a/gnome-extra/gnome-tweaks/Manifest b/gnome-extra/gnome-tweaks/Manifest
index 02ccf9a4e0de..b9296bc934a2 100644
--- a/gnome-extra/gnome-tweaks/Manifest
+++ b/gnome-extra/gnome-tweaks/Manifest
@@ -1,5 +1,5 @@
 AUX 3.28.1-gentoo-cursor-themes.patch 1019 BLAKE2B 1dc92c4f8e53c1303f884f6acc332a7a0f1bd11b463e91ddd4ae731938e678f75499692044b5c13021f24dd9bf61264c4454fab734fe65609b3b4c009cb2eee2 SHA512 e502e1ae5945517e7a69cd15436bc07e34fe0db739350e0617d02c9b7a45264f585229f80352a93595e1246d5f9c6e987242772dfb7293de06b400fbaf676971
 AUX 3.34.0-fix-python.patch 2967 BLAKE2B a1a2859dcd5ecd1028b1b08d266960bb0366d0a940c81a2e9e338af02b72a01939a835dca37ab05b8a5b0ca8e118e2e0b5178479aa90b61a59b3f426f83e95be SHA512 097abd98bd2124c5e2536ed7bc8f337f836da4a4dda4e2566d533c16e771d91690f43f47e7d61a9a238e2c9cf6e687a057b6857265ef3892eacfa7f2079a00b0
 DIST gnome-tweaks-3.34.0.tar.xz 246592 BLAKE2B 8701b03f64bf6b779f6f96de25684602447b4da8f2714cb38f866e5016532aad3283f3dc217b29161534958c03e72aed33c0803e60681a3616818d037c23e5e8 SHA512 1d2b21a31550d4b48afd02a9fcfb9844eacac7aa726ef624abcb40225af31da29b34e9032b3bb2943e5cb5f7553a6f931467d04bfbc2b026732e6bdcb86eb840
-EBUILD gnome-tweaks-3.34.0.ebuild 1272 BLAKE2B b90f670026f79973c29e3abf0262531b50a48dab2ef4946673b5ceacfee3b3e638cae3cf37a55e4446168e3aaeb3487c8952b8b0e7aab5ce434a1034ccd47f94 SHA512 c3676da41620fa7a3e8c406d1da9cd44a4570e3b24cdc6c9ce1c90f99cea809aaea736cfa5990f23f409b2b08913781d0ee2443ae98e5867a608276d1e7221ca
+EBUILD gnome-tweaks-3.34.0.ebuild 1274 BLAKE2B 7244b2f1d70713c9ba3fb863a024b0382ca22a2f1ecc6e19838fe970e712bf20568bd8b5966e29253c3c364f5c105e77d1dd76d5cd4cc651c988aefe5d03fc02 SHA512 3c7752d5c3df7759c5e6cfb8941a36dbcd69bfc497186197b88c46b33ca9c1ea826be12e81d83ab0d761d39b20564197ca550012d025e33262d68adda90e4f82
 MISC metadata.xml 556 BLAKE2B 0964398067f54577410c361418ce6f70d1afc4e1f064e3f67a1b3b6a7d37489124b7405f75c1bda57f0f25f74bc0b6ae144a4d5e04fd29bf1d180b5b4245a1a6 SHA512 1e6abce7e7e566d0c382956311c35ce9d70d044c8ee672103dc443eddcd7492e7bb4940b889213dfd7b49accce41269d820bb0b39d32e81857e3c6775609f67d
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.0.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.0.ebuild
index 005ee40c769a..d205a89c335d 100644
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.0.ebuild
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-3.34.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit gnome.org meson python-single-r1 xdg
 
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index 571cc2c93316..870274a756c1 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,6 +1,6 @@
 AUX nemo-4.6-captions-fix.patch 1113 BLAKE2B 1b6abccebfcf3719559cdf7c077e71c1b20b53fad0538d15012cbf026933ad1708394d709b39b9109c6f6d880a4bcc54d528b840cfc46f05bb46515796a159c8 SHA512 444f4274af3d332efb0c3764beed5027114415dc5a6a79c644a51b440bd476c876a9efa35e9563a5848750949845d481e99e268a564bfc305d6700d454ce7fbe
 DIST nemo-4.6.5.tar.gz 1468701 BLAKE2B 42b47300782745e4ae98db164ca547b0794caf8f0883db4241f2f0ed2e375e5c8564cff6d878142b55744ce41f49c60aad3f24930398ff68444e32c572d7e9bd SHA512 3c8c95e75e8bc499b56d1fd133f5ccc86ad18dae2219772b732586fd684a4a7a36e51fa61e6b734ad182ffd96636bdf276b8645d049e5ca68795fac274236eb6
 DIST nemo-4.8.4.tar.gz 1464683 BLAKE2B 10945a385defdf1bdc7fac9432306e31476ec015489a5150a5b4f9d5f31977b93da6e92241ce153cd5435c789c7a6ce16d2a86002758f26fc587a33dc5343e63 SHA512 b63ee2bd85f67e7d18271032ac3d95c7446b5110b71a3236f7e8c4ccb31e2baf11912060dde36f12ed4b90491c3bb1215a0de38c419130d692c775031cc0e11e
-EBUILD nemo-4.6.5.ebuild 1882 BLAKE2B 341a5abda3c70ec4ecd118d174aedf29cf8940664c808c613693efb8ae46b3f73121ff9e72383dfec3086cc090c63f87b4ae219c30bf7f8c32970dd8a87ee476 SHA512 adf8b7e5a6d2ce84286c19ebcf227acf8cdac521b583dc1625b164dc1334e0d90f92d4793f0f28af258b0511bb465c38017ed311ff131b08b2e52522cd04e5e9
-EBUILD nemo-4.8.4.ebuild 2151 BLAKE2B 92609aea48c3d08dda8bfb25d3427dea7d6d7c7fdb419dcba3ba0e6748b8d2d83ca8a1961a33db78c9e65dd2208a40c3daf730fbc7fbcc5f2f0433e886e2c2a0 SHA512 772de089be497d8a238ca5b0011860f899e7b0a3aaf99b10e8c2754a19c26251970024b0bc12c5b2d6d24edb54bfb48423064f550ae9dde08f5bc4f5ad756162
+EBUILD nemo-4.6.5.ebuild 1875 BLAKE2B d64d8ba9cae1b3b99db4f6119c1d883e7435de1a24ec4ae84d669742babd95fe735d8784373d95534eade44079c76ca13c3cc5324a350ad3af828f431607f0dc SHA512 c887dfbb213e3c1d12e7d458802b6fbc4148732e44b4e2c68849782f45ee3b57b314c71bdaf686a4a11cf3be95b73451cd1bc57217615f0d873afa768aeaf9de
+EBUILD nemo-4.8.4.ebuild 2144 BLAKE2B 040387d15ff53178f071c2877510d68a90995e5dad795d4bbd8aac8fe6dca4706399513220843924278d2091e18dc4c8b5b7c7dfb3c2ee0b10196797c725c05d SHA512 cdd92f0cb3c2ca42eb9ecd811d70d7a52fe1e708f29459250a0a6600885225ae2d6b3be406e7859647f761d88943d4aad179751d0949009aaa6b76d96940bade
 MISC metadata.xml 549 BLAKE2B e60bf6d13687fbd3fd8277dbfc61ad428939e2fe91f648dde5e740dd8e5cc7ac75609a95a01fdaf11f721837ac05a01dc5b7c1604c008036a8f01b006dccff27 SHA512 4bff873128b46a56e572f4d9d355ce2016518cadf3fd0ffa00ac0f6b0961fb7efac4873c8a310eacd6862f8bf4265fa1df306e4efa3130330376e03966ad5278
diff --git a/gnome-extra/nemo/nemo-4.6.5.ebuild b/gnome-extra/nemo/nemo-4.6.5.ebuild
index f6e7684c8dd0..c6c93c5408de 100644
--- a/gnome-extra/nemo/nemo-4.6.5.ebuild
+++ b/gnome-extra/nemo/nemo-4.6.5.ebuild
@@ -57,9 +57,8 @@ BDEPEND="
 "
 
 src_prepare() {
-	xdg_environment_reset
 	default
-	python_fix_shebang files/usr/share/nemo/actions
+	python_fix_shebang files/usr/share/nemo/actions install-scripts
 }
 
 src_configure() {
diff --git a/gnome-extra/nemo/nemo-4.8.4.ebuild b/gnome-extra/nemo/nemo-4.8.4.ebuild
index 794134d1e33e..1ba7c72d2d2e 100644
--- a/gnome-extra/nemo/nemo-4.8.4.ebuild
+++ b/gnome-extra/nemo/nemo-4.8.4.ebuild
@@ -70,9 +70,8 @@ PATCHES=(
 )
 
 src_prepare() {
-	xdg_environment_reset
 	default
-	python_fix_shebang files/usr/share/nemo/actions
+	python_fix_shebang files/usr/share/nemo/actions install-scripts
 }
 
 src_configure() {