gentoo resync : 31.05.2021

37 files changed, 41 insertions, 669 deletions

diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 8d804c3d471c..e35a7b6b5a34 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/angrydd/Manifest b/games-puzzle/angrydd/Manifest
index 5aaf569b6d00..c1b2e7965e13 100644
--- a/games-puzzle/angrydd/Manifest
+++ b/games-puzzle/angrydd/Manifest
@@ -1,4 +1,4 @@
 DIST angrydd-1.0.1.tar.gz 5331883 BLAKE2B de8a418b881f17e0869d9b8004b6db3cee56c1bb05729a5238f6357d3072ff10afb864252fcb3cef5c90d136ad7c8739afd71b88c932545203f2e9752c5eac81 SHA512 e0901833febcabb6622bb85405189bfaf3c917c3254ce282045d58e8e5b5c6c6565ca0e7c56fe2819e0d3f344df3bb285cca54c360b467d284739673d1aa74f0
 DIST angrydd_1.0.1-13.debian.tar.xz 11940 BLAKE2B d64ae1f878f3dfe4eee9f236ce6869f7ce3d77021a09593240a84860157781ecd776be7a06edbb48d1e340c654c50f4463b76b42049076e9c02b6397988ca9df SHA512 123d593ac7ceff8f6fe5d70442b92e6564f4e6ee668450cb623bbdeb4633cad6e04cf896d93cacc5e11bda08cb61b7c92ce0b99072e6e12b21e023620d12b360
-EBUILD angrydd-1.0.1_p13-r1.ebuild 1210 BLAKE2B 70d41783c5c7759957ff17af4fddae0cc0c801df47265d5126f11ba1f10736bd4a35efe8228d45b599493373e2c366e0c7e773c21bb833db55922e822912c1c6 SHA512 c0db63309282ffd5be4e60d7b6be96e934896d915ca7a49bbf20ecfe50cf8864b24a2cdecfb847162fc05128c2c6711844f8b45948e042ac3273b90d03084d17
+EBUILD angrydd-1.0.1_p13-r1.ebuild 1212 BLAKE2B 99a2f0117f39182180dadef3ccd0cf8727f5c425d2a9444aeda0c147e8a89254cfb7bb9c2c1b2db503b80b6b78ab2449b26c7a83f128e528649ab179a8545dc2 SHA512 a4d60cea200734be0c2c938b453beb519f81426699ce9ca4fe7aa9f8510b61999cd80fa4485cb21238d24399cfbb8cf3c717dcc9d349c6a4a6e228cbdb310df2
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/angrydd/angrydd-1.0.1_p13-r1.ebuild b/games-puzzle/angrydd/angrydd-1.0.1_p13-r1.ebuild
index 4460627d59fb..e4bdd9f36a81 100644
--- a/games-puzzle/angrydd/angrydd-1.0.1_p13-r1.ebuild
+++ b/games-puzzle/angrydd/angrydd-1.0.1_p13-r1.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 desktop python-single-r1
 
diff --git a/games-puzzle/gnome-klotski/Manifest b/games-puzzle/gnome-klotski/Manifest
index dd9ec07fcc5c..c6c2ea672f33 100644
--- a/games-puzzle/gnome-klotski/Manifest
+++ b/games-puzzle/gnome-klotski/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-klotski-3.36.3.tar.xz 903456 BLAKE2B f8890d3e3c20fdd3df1933c5abfe81f4a7aa55678b62285c8992e899612c8ed361a57328b9a1b3ac190b9cbb6492f2cfd8b9dc93d77deea5752c4ca0552a19d2 SHA512 7e47ecad366e3c43108422263de0c1c01692f9eacd27622c2db8e673782b0f20c5e3085fbc4f33490c0a48e8b537141537bcd9fba4284a47ab151449034398a9
 DIST gnome-klotski-3.38.2.tar.xz 1030904 BLAKE2B 06af4115dab0fc63fd867633209c2590ad88331f9e7945ed1efec555a78dce9b6f41772e804170cb4a11a8463daf423e68e697abaf3ffba7fbc075dec78201a9 SHA512 dc2c33b4b555d77f04a8146741f9a4f5a6694ec046d457d50255fac306894c5b3306082c91adbfbc7d73d43ea3b109b36d992ecd9183db803c20e22f17c5e274
-EBUILD gnome-klotski-3.36.3.ebuild 848 BLAKE2B 860ab0cf8b57610fbfa3fa80ef8748faebaba39c97b23331a46b66eba36711f2222e41c17843bc6915f57c9e2c6cacaa155f240c6a1b996c7e979d5290bb3366 SHA512 2eeb0cd520ec56c5f286ee7849b13396469537f73df933ec8a950a3073aa7813b6ad5a7bc26971ab08ab7a9494475f8b466f4d1e6afc2fd9774088a6a9fd6189
-EBUILD gnome-klotski-3.38.2.ebuild 857 BLAKE2B df9f0542a0f08877623b9883d9cddf824473f8bdf9e151e9c2f58487964d95b4525bdcabe5905b7132acaaa34783fa260134f7c24725056b590375fbfe7d9df9 SHA512 b5b781c1dd11f7eb062ed7d334e8ebaf2783cfab1be3a4c6d09c43cd39b6eb19bb09df62ff2ceee976f4a795340ca3c5ccab8e1a24cb1cbf3597deea80f81b07
+EBUILD gnome-klotski-3.38.2.ebuild 855 BLAKE2B 421290b78810081e5ac563fdc33c7d3c8cbc2dff993a213cf0bf520c419f6bef7af3fcc0a23b430e85981270a508aaa81895d0baa2e258006c4654cc87248f64 SHA512 120138608b5bc5f47f954317cfee7a65e0ab3c8c27ddd3d8e83a9c33891edd6904fa771f83706e3a6a01ac3657971ec0230f5130f7ad56e06ecd569397032f45
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-klotski/gnome-klotski-3.36.3.ebuild b/games-puzzle/gnome-klotski/gnome-klotski-3.36.3.ebuild
deleted file mode 100644
index a1884f0a09b1..000000000000
--- a/games-puzzle/gnome-klotski/gnome-klotski-3.36.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MIN_API_VERSION="0.40"
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Slide blocks to solve the puzzle"
-HOMEPAGE="https://wiki.gnome.org/Apps/Klotski"
-
-LICENSE="GPL-3+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/libgee:0.8=
-	>=dev-libs/glib-2.42.0:2
-	dev-libs/libgnome-games-support:1=
-	>=x11-libs/gtk+-3.22.23:3
-	>=gnome-base/librsvg-2.32.0:2
-"
-DEPEND="${RDEPEND}
-	gnome-base/librsvg:2[vala]
-"
-BDEPEND="
-	$(vala_depend)
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-puzzle/gnome-klotski/gnome-klotski-3.38.2.ebuild b/games-puzzle/gnome-klotski/gnome-klotski-3.38.2.ebuild
index 84a764921058..726971794975 100644
--- a/games-puzzle/gnome-klotski/gnome-klotski-3.38.2.ebuild
+++ b/games-puzzle/gnome-klotski/gnome-klotski-3.38.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Klotski"
 
 LICENSE="GPL-3+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/gnome-sudoku/Manifest b/games-puzzle/gnome-sudoku/Manifest
index 3da7c1467063..47058ebe4bf0 100644
--- a/games-puzzle/gnome-sudoku/Manifest
+++ b/games-puzzle/gnome-sudoku/Manifest
@@ -1,7 +1,3 @@
-DIST gnome-sudoku-3.36.0.tar.xz 357916 BLAKE2B fa56f8a1aaa87d7fac6c1df182ec8a3572aefe6a2693b3c2784afc0fd050a4085082b2ff6b0bfe8733d4b1d6e28e2e0927270b43a5708fd259d00f8803cb5e93 SHA512 617477b884d9ffb08571b25c76b52f2a418064f7af324673e32f43e8b3327c995ab4ace26feb5edeeadc79a1f7f1a0ef7d7fb39ef9397fc855e476bad29a50dc
-DIST gnome-sudoku-40.0.tar.xz 355580 BLAKE2B 9561e375fb9112c722317d1e85105e7efe2fa010f17756449f29d8d8fd292882c6f65706e412917166b841ba8618bfecbb8aa340657b61b7e6dba30076a33c49 SHA512 28b32179a038d692b0fe0cdc77971b20ede4865fb99e6b2761399ce554fdc1c8d11fdd96c2637cba44f534c2e84e1550daffc91180546683a13b417417125ca4
 DIST gnome-sudoku-40.1.tar.xz 358076 BLAKE2B 03a53827956a40a7ce54eef3dfa2d27c455d716cdd7f395c8c1e6b0e1f4e07cccad766b9a5cb23de81ef384b56296dfb117867672ade87fa5efffca740add1ef SHA512 29f97a0f9c7b990cffe66fe99c909822c1050c3c01c703e7967f9aa214824f153b6fba619e2c084dfa66aa66a3d3fd034659a8f0995ae69a9d2a85435e0e38d6
-EBUILD gnome-sudoku-3.36.0.ebuild 918 BLAKE2B 5710e04a013be7ea5231a035a9da54f825500bad59d9218a366b53cbd932954a47983bf9bc4943d87ff3990accd6fd7996e9983795a1d48cca2b7f6fee1ccb97 SHA512 8045e2ca7de7f188c703c143ba830f1d95d432bd4342248a2129968b1be5728ecbda8c4d83ad44160d92e6570ec7724df288aeef90fd7179fba1fd465c258670
-EBUILD gnome-sudoku-40.0.ebuild 1070 BLAKE2B d3a9ac318697373cb00943258c91994e94b37b261c41615e120768b10d07ade078c39996880d6df79adde0233bac70854716a994f30c67d5f603ed65ce8eca56 SHA512 cb859d7e677c51fd72d98167f9179e13c6fed24ea3ea5a813c50d48ebbec00f2c96087377a1d9e807c805197d33357569443de19c0159dd5e379eb5f955ad8b8
-EBUILD gnome-sudoku-40.1.ebuild 975 BLAKE2B 609b51ba12852b474ed5310bd4752c1ff5467541c3dd201c27f4cd622d025453f41a994eee204a777f773a9727ff9efc95a39cb8388cd2cab4ce422a5e618b89 SHA512 5924e72a909933ed1d4f7ea44a9fcaaf0282271eebd969ca138b42ca7c262963220391f87d2759700575722188d126c10f8b3f262c979fe3dc43bbdbbff287a5
+EBUILD gnome-sudoku-40.1.ebuild 973 BLAKE2B 69cc10fae2b368c06fccccb3666294a035e8964da74d6dfdddce713ecfb77d1469c33d63ce7d97a22455cec702d1964c0d2519054085f1b2d7f85da6c3ee13e2 SHA512 3f841ee10a879e13579959292f85fe8fd4f0973556f3eb0012a7bcf896dbb202185cdd925404151134a14f672873751026337ecf7653381ff9f5fddd90b0e0b1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-3.36.0.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-3.36.0.ebuild
deleted file mode 100644
index d20d7a0bb73f..000000000000
--- a/games-puzzle/gnome-sudoku/gnome-sudoku-3.36.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MIN_API_VERSION="0.40"
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Test your logic skills in this number grid puzzle"
-HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	dev-libs/libgee:0.8=[introspection]
-	>=x11-libs/gtk+-3.19.0:3[introspection]
-	dev-libs/json-glib
-	>=dev-libs/qqwing-1.3.4
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	$(vala_depend)
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-40.0.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-40.0.ebuild
deleted file mode 100644
index bec42402e4f8..000000000000
--- a/games-puzzle/gnome-sudoku/gnome-sudoku-40.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-VALA_MIN_API_VERSION="0.40"
-
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Test your logic skills in this number grid puzzle"
-HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	dev-libs/libgee:0.8=[introspection]
-	>=x11-libs/gtk+-3.24.0:3[introspection]
-	dev-libs/json-glib
-	>=dev-libs/qqwing-1.3.4
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	$(vala_depend)
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-
-	# Bug #784365
-	sed -i -e 's:40\.alpha:40~alpha:' data/org.gnome.Sudoku.appdata.xml.in || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-40.1.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-40.1.ebuild
index 693d2558f9bf..be8d649a0e28 100644
--- a/games-puzzle/gnome-sudoku/gnome-sudoku-40.1.ebuild
+++ b/games-puzzle/gnome-sudoku/gnome-sudoku-40.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku"
 
 LICENSE="GPL-3+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.40:2
diff --git a/games-puzzle/gnome-taquin/Manifest b/games-puzzle/gnome-taquin/Manifest
index 2b72be33e2ba..d525fc1cf9e3 100644
--- a/games-puzzle/gnome-taquin/Manifest
+++ b/games-puzzle/gnome-taquin/Manifest
@@ -1,7 +1,5 @@
 AUX gnome-taquin-3.38.1-vala-0.50.4-GtkChild-1.patch 6122 BLAKE2B 5146cfd27fa3254187eeed6c529839597ff84b55cf3228e1777aaf40f20831467aaa04854f4a1215670ed1fcae2943bfc8eebfc865edd56cfb4d7818381c48f7 SHA512 11bd1424ad4f1102136c8a966befd66b0cb62d0b2f87e727c12910d0cc26ba391c049383e5b535fed27cdf09cafc89ce1a05b6f41e7f61d3969c3e2aaf17a3b2
 AUX gnome-taquin-3.38.1-vala-0.50.4-GtkChild-2.patch 9566 BLAKE2B 7f6dde7993122cbcb96ca3e4a493e965758e3d8a52e98734e9d0bd199dcd7ad8a74d5f16b9c24d5b0e7229f9749ba03a12847ceb5f88f9d1a7b8a788c785f767 SHA512 e726c24b6526b9d137cfe4acc0ae3c9caa36b1605f8ff6acd8a5dd0aea6339fafe8ec39d09cc55533055a25a1a9c6b2874c2a6e7dd5a2ce49aa72bd9004102c5
-DIST gnome-taquin-3.36.4.tar.xz 5253972 BLAKE2B ddeacc57e52e434c5f3f7956226c4dc3c25416c61d8e920116dafebd89a3b442c01c54840bacdb93d5ee6ca4b6428c36f77c56f53651fe90ee8fda9026b23db5 SHA512 72e28698e292ec198c77f4f56624bafd88220157582d220ace363e29bb2f3bdbe7198c30348a6aef12e07dce275be6280fd4dc8a6bcc58f31d1e5ef54d0f3f7d
 DIST gnome-taquin-3.38.1.tar.xz 5265440 BLAKE2B f37397a4f3d0e71cfe39b8bce00fa7a04679467b402251aae155395740b655aa67031d2cdcc8d46fa45b9a69b1e829e0da883f17f9ec9a48d763098cf44e7f95 SHA512 c92244049bb24ab1585375ca6337965891bcaf46e642e009e3f670a818554d842c1f55c78735229198dfd6d96e95ee56e106a7eb238052e1382118287d9e28d6
-EBUILD gnome-taquin-3.36.4.ebuild 1003 BLAKE2B 51ee839a014005e60356f9aefca14f6470c6cd0b348cc2e062559b3277b3f5a5fa473be186dc6b78f1f8d820d29a6222d2fb970f831c5dd1e1593d6828f01fd2 SHA512 bb3d7d15b49728f22367ad40fb881e864a96beaa03757b0fa986118c82d38fb2c1675ff92e95a3282b51615a0fae21c5c88ef80d16a25b3ffb669682c164220b
-EBUILD gnome-taquin-3.38.1.ebuild 1188 BLAKE2B 42be290ce4bbad8ef6c47f5cb8c9fe5e69e1c96048ed3715b0f6e3ae5fbd725c43c8dd92fccefe9a7767791df34aa9620b3e8175824ba8530039219fccd5e30a SHA512 bf926603e3af291bb23b286cb50bb08d18ba362ed3b9d0000a402df1c8a9e5ecddded7bd4918fe0317543f69d963b933cdc03dc6d624e08c6ebb460c35e10b32
+EBUILD gnome-taquin-3.38.1.ebuild 1186 BLAKE2B 3417c1de7f2c6f6ebf312e7f3037584eaf5a1c9bab6da9f199d4c6870f69ed6fec23de155a03d21b78a0cdde4d6ec5c74fbf1f7c28d5b986fbf2525ac5156f7b SHA512 faa9b0822bfff4393d375810d7aadb5a6060da467992da44b6fb72dcabd1641089648b97d46fa33935d4f0d9faa37a8946d3781ad1224ce49fba35d1da620db0
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-taquin/gnome-taquin-3.36.4.ebuild b/games-puzzle/gnome-taquin/gnome-taquin-3.36.4.ebuild
deleted file mode 100644
index 47db03401bc7..000000000000
--- a/games-puzzle/gnome-taquin/gnome-taquin-3.36.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MIN_API_VERSION="0.44"
-VALA_MAX_API_VERSION="0.50"
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Move tiles so that they reach their places"
-HOMEPAGE="https://wiki.gnome.org/Apps/Taquin"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0 CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.42.0:2
-	>=media-libs/gsound-1.0.2
-	>=x11-libs/gtk+-3.22.23:3
-	>=gnome-base/librsvg-2.32.0:2
-"
-# libxml2+gdk-pixbuf required for glib-compile-resources (xml-stripblanks and to-pixdata)
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	x11-libs/gdk-pixbuf:2
-	$(vala_depend)
-	media-libs/gsound[vala]
-	gnome-base/librsvg:2[vala]
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-puzzle/gnome-taquin/gnome-taquin-3.38.1.ebuild b/games-puzzle/gnome-taquin/gnome-taquin-3.38.1.ebuild
index 47c0bdf04fb2..42a9b55fb48a 100644
--- a/games-puzzle/gnome-taquin/gnome-taquin-3.38.1.ebuild
+++ b/games-puzzle/gnome-taquin/gnome-taquin-3.38.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Taquin"
 
 LICENSE="GPL-3+ CC-BY-SA-3.0 CC-BY-SA-4.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/gnome-tetravex/Manifest b/games-puzzle/gnome-tetravex/Manifest
index 9a7360f76909..823d6ba8282f 100644
--- a/games-puzzle/gnome-tetravex/Manifest
+++ b/games-puzzle/gnome-tetravex/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-tetravex-3.36.4.tar.xz 1005996 BLAKE2B 9647f3db8e60c6cccc243d3da798265fc51eb16a463ef37b8259689b6cc36b81391616f36b665f28c108bb0d70bc42ebe2fc1feafbbc77cb3256f78d1bc4c016 SHA512 a3c163ae61b312b94ed32c02eb13ccaf9aa2f5eefede1a0735b4240e3127be0bd6e827fda47b1bc2987f793fc5927ee63cc836bf1e2a149f958acb1946dba954
 DIST gnome-tetravex-3.38.2.tar.xz 1004632 BLAKE2B 5e16420e9e05668e3c697a275e748e75d65531fbe7bca61baffa5846b76781403a3014e1f85a6f9ec69965c256cbacbe3a756e36c9725eeccfd6abd0c568dabc SHA512 ad67dfcbec5cf33f5361c6f5746d78158726a4bf5c85f29ea084a324e2ec493ca41bb61e47228ad4deb30985fd750e8703e11fd02051af5ac7c9c256513644b8
-EBUILD gnome-tetravex-3.36.4.ebuild 897 BLAKE2B 4d62a9bcd51804dc375bd33acc02c4383514b0273e4da1f97d9fc4873a30aa9e6bab7f2dee93407d261eb267e6b91d96410d72f5aff140d90656c036987442c8 SHA512 dcb13c1e1df3ee8bc8762eb35c394bc190e77e425aec7d9c586890b8a0cc881e95907def0fee2c641460b5c05e6f6795aea1f161eabaa819bcb7193d7c879d74
-EBUILD gnome-tetravex-3.38.2.ebuild 973 BLAKE2B 55906c2953625973cea39998caf10ff723eb18e2a095ba92a0c6b0fd935e3e2eb11a05cf814a4fc9b3d097b8141f6219cc055e974887b5480abfa8b6518c2c52 SHA512 aa873d2a631c34c30222bb272e580dfd60aa01982e5e977da233985bc563b1318666261159fa8967789aa89749d1ac1764d3f08ada13b65d78f7a0a3f75775a0
+EBUILD gnome-tetravex-3.38.2.ebuild 971 BLAKE2B 174d99979d186407842f767f7e22a7c4d5f67a224faa29b87b51ec72fe4480627ee874be852c62d7ca4b6579613944efe3d8cc123a33f06d1b954dcd1705c670 SHA512 05dde03d49607f94c2024f6a7b8cda5600d0dde3d1cb6f34e4880c46fffeefea46fb3521e43cdedcb229377f06e7c12a5514239095e22b02fe28bb20a9bd3424
 MISC metadata.xml 418 BLAKE2B 9722632bf30d5cd8920572c229e6344ebb73aee42104644351f8a512db0cfe890203328d063f6108a75cfaced93c7f680f296a2993b2ee0a7335ea483a9baaf3 SHA512 4cad964a8d4e4b0fa2c8161d867ba9683eaa591069b29a0aba877ab8deec55ab2d3a5d4b36aa37fa8314b93a31dde799e87cc0c54a7edde2aec139e567bd6913
diff --git a/games-puzzle/gnome-tetravex/gnome-tetravex-3.36.4.ebuild b/games-puzzle/gnome-tetravex/gnome-tetravex-3.36.4.ebuild
deleted file mode 100644
index 28b35616a649..000000000000
--- a/games-puzzle/gnome-tetravex/gnome-tetravex-3.36.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MIN_API_VERSION="0.40"
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Complete the puzzle by matching numbered tiles"
-HOMEPAGE="https://wiki.gnome.org/Apps/Tetravex"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="cli +gui"
-REQUIRED_USE="|| ( cli gui )"
-
-RDEPEND="
-	>=dev-libs/glib-2.42.0:2
-	gui? ( >=x11-libs/gtk+-3.22.23:3 )
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	gui? ( dev-util/itstool )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use cli build_cli)
-		$(meson_use gui build_gui)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild b/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild
index 040bddac9007..324455704cb2 100644
--- a/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild
+++ b/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Tetravex"
 
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="cli +gui"
 REQUIRED_USE="|| ( cli gui )"
 
diff --git a/games-puzzle/gnome2048/Manifest b/games-puzzle/gnome2048/Manifest
index 4836aea1fc6d..b05d9f0f2e2d 100644
--- a/games-puzzle/gnome2048/Manifest
+++ b/games-puzzle/gnome2048/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-2048-3.38.2.tar.xz 126780 BLAKE2B 8d6eeb63927b49db6ff4cd4f0cf4da73233aa4b916bfb94b994e17417814c004bdbeaa913eee43dbb965e0723d0ef20682df62655138620cd0ba0ce42ad8be1c SHA512 9063c31ef2a1126b92b6f52950237ac3878a8cbe4b1304e2c56e4bc7f8b99320f45ad27b3d7be3fb4cd2a1856bd11a171facc98bc917076118b83380668e4df8
-EBUILD gnome2048-3.38.2.ebuild 860 BLAKE2B 65f97681abc0e10d494555b58df12f7acbeccf1ddb0825bf67346a0bf51f23d4591459b4c912ffa0b09da8ccc8c030d69f541170762e2533c06967677f4e05ca SHA512 c9d3a43893ccf2f9b99639650476b9b558aac7a2e1d48cb6154e350d4002a8d54993d57c4ed70f972bcc92464163824144af281b114113ada8ce41f8e99094c0
+EBUILD gnome2048-3.38.2.ebuild 859 BLAKE2B 5f4c77c0b8db7ded8d1d2bcdac57763d3f887c9063d4761c19ce9c623857435382aae039dc693d099e16851da84716aaac360acad3f880c2ec5d271d13f75610 SHA512 2cbe66543137691558626db6322bf39d52a2d6f552f418f1c29f72161571a9bdc864f4e487d7bf5a39bae49fc466a60b95efaae989ae1b06c40bfe9b759a9e51
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome2048/gnome2048-3.38.2.ebuild b/games-puzzle/gnome2048/gnome2048-3.38.2.ebuild
index 6e94bd1f38df..7b0f85ac85ae 100644
--- a/games-puzzle/gnome2048/gnome2048-3.38.2.ebuild
+++ b/games-puzzle/gnome2048/gnome2048-3.38.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/2048"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/lightsoff/Manifest b/games-puzzle/lightsoff/Manifest
index fef9135a491b..4fda3e8dbb91 100644
--- a/games-puzzle/lightsoff/Manifest
+++ b/games-puzzle/lightsoff/Manifest
@@ -1,5 +1,3 @@
-DIST lightsoff-3.36.0.tar.xz 497756 BLAKE2B 1765f848608a40feda87e7e950675febcccb307639b6aeec3f12001516f80766a815e8989ba9c18813a397759efedd251921d988091be2bdd7c8c887a296bfe5 SHA512 9d026432bf059fb72aa8aab7b52c22e81acca12c8ba6a26350970a22a760a5d113958288196acc38d6ecba1096155323ecef86406e94d35e9ed82f26f9e30eae
 DIST lightsoff-40.0.1.tar.xz 562340 BLAKE2B c80aa328e56a1cb8da723c187c6a223d0bf93353f36ed651b10c38ac129c6d62970dcf72308cbbf4fd0f911113b5c53ed490824b488bdc92e84c7bd9e9ae1015 SHA512 ac1f812c3297a42f1e5aa8b8cdda2884b5c2aea2ea0190047ba5a0f47254b191d2105d7d1b548f0233fdee1b0e6033a97265a1cb28503daf403ee4e2c53a1aca
-EBUILD lightsoff-3.36.0.ebuild 951 BLAKE2B dc2169345331e43ad287da88c4577edc991679e1ad0b703988bfc3c82528962a5148063bfd743e84cb0fcfb49e527065ba7f33c9c21871cb06b21a46aa27089c SHA512 c816ec5142f1fde195cd9af0376abf74f4743b11c4f3f5209122f40d2b7bcebff4141a968284f73e1fd918229b85d805076b2cdabab70059b4010d1b20947535
-EBUILD lightsoff-40.0.1.ebuild 1044 BLAKE2B 5160499039e1b371a19665206ba9ae264738d6a140d65479fa880c8adaa854ebcaf490447d446280dc3d5d0f0ade397877d86f65fce9591132bc4d752332f92a SHA512 3b3ca3139a336315bc46b50414dc0bdd5b3b0f126f97f515ab839ab0f67f8d543c2f69879c659975cde961865d7d7cf3d3fa70046e248f327c4380c0c7905bf4
+EBUILD lightsoff-40.0.1.ebuild 1042 BLAKE2B 02f2bdfd3077b0cc2b5f0a389be1a08eecfdafe24696de389e77af4abbc7f9ca0f14a257627dc2b0ee39c95cd2c089e8926142dce4c677f36e6b68ac312dd905 SHA512 9afba70a78524137ca02f8e24fa514dd75914c559c65b5477ec9ac6d28857333dc9150e75ca0657acf38c2e00f4aa0f740b70506878399c0202157f25493efdb
 MISC metadata.xml 501 BLAKE2B 0bb4f0ee48a733ac3da0c979642015df17a1c4628d857e1374b25678f1c0f8d585b26d455c037617233c8fc6cdf1dea190c1a4ad1ec383b398481a5f37df1076 SHA512 6248a8562c08d902ba2c078157c84111b46d7ddfa79dc76ee98405894f80cd9cad9f97d6ae9d071ca1b43aa9310834acee6f0d2a27e32e547d657cebbbc47ad6
diff --git a/games-puzzle/lightsoff/lightsoff-3.36.0.ebuild b/games-puzzle/lightsoff/lightsoff-3.36.0.ebuild
deleted file mode 100644
index 08dca22501a6..000000000000
--- a/games-puzzle/lightsoff/lightsoff-3.36.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MIN_API_VERSION="0.40"
-inherit gnome.org gnome2-utils meson xdg vala
-
-DESCRIPTION="Turn off all the lights"
-HOMEPAGE="https://wiki.gnome.org/Apps/Lightsoff"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.38.0:2
-	>=x11-libs/gtk+-3.13.4:3
-	>=media-libs/clutter-1.14.0:1.0
-	>=media-libs/clutter-gtk-1.5.5:1.0
-	>=gnome-base/librsvg-2.32.0:2
-"
-DEPEND="${RDEPEND}"
-# libxml2:2 needed for glib-compile-resources xml-stripblanks attributes
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	gnome-base/librsvg:2[vala]
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-puzzle/lightsoff/lightsoff-40.0.1.ebuild b/games-puzzle/lightsoff/lightsoff-40.0.1.ebuild
index 211499a9c37f..70327bede186 100644
--- a/games-puzzle/lightsoff/lightsoff-40.0.1.ebuild
+++ b/games-puzzle/lightsoff/lightsoff-40.0.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Lightsoff"
 
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/games-puzzle/monsterz/Manifest b/games-puzzle/monsterz/Manifest
index c4a811eefab3..5ad28fa4373d 100644
--- a/games-puzzle/monsterz/Manifest
+++ b/games-puzzle/monsterz/Manifest
@@ -1,5 +1,5 @@
 AUX monsterz-0.7.1-gentoo-r1.patch 390 BLAKE2B 4cd80a3b5ff0d0c67326a811e92637b5006d37b5a00e87ae8dbb9432060ca65e3754b5e75bca023e8822854613bad9fbec0aa3dc7a1040a804bdab0f1204b135 SHA512 6b8eb58d5610d0e15c9598b6bd92a98690b4fdfa663f9d84be0c77c727a8ad8c48caa946f8ea4060e895984d9e28b5cd4caa9acb6385c2c4f045fa5987a6b8da
 DIST monsterz-0.7.1.tar.gz 1879537 BLAKE2B e1ad9f17a64bcbb07005eb61d951dbf756997a6e6bd76c48d88bb634c9b3167c9fd41ef32032925b219153eb607dc238af76b44c3ef6c47aab753d59c61958e1 SHA512 62de125251a74e7ff237c90ad88e10a4953b8841251dfec45cc6b77f416677ef6d68cf4308c3190f65896b5bb1312934abd5e438f0341f08c02884585f0e4787
 DIST monsterz_0.7.1-11.debian.tar.xz 13688 BLAKE2B 2274b6d18b2f03200e09468243bae7ede94b81bd7595f65a73fd33bc9ccc7302fbea3a4876b5bbf6cf98735652742b1cf76b3c288fc6c005f9566c04b4a4f277 SHA512 c172355667db29de949de07745469552d62dc226120f38ff76a288b14018424338f27b6a562de215b7194b8b09c6346d29e9088c8a0edb0fe915f915b8577a4b
-EBUILD monsterz-0.7.1_p11.ebuild 1287 BLAKE2B 4752dcc1e0b5a9463e76a7d4ce96ed61d7fb126d47139c092d13b3d967d7a4d4cd6ec4e3f2db2ed126ca308952582932425a73ab8cd57cae8a284e39a27bdd00 SHA512 01a743aa34c0ad6d1912671f3133655d2144df4fd18c84e2df15a60f7db46c4043d0c0ea85a8f232c0793af35acd41574b8a1627839df3779eea7dfbae9abb25
+EBUILD monsterz-0.7.1_p11.ebuild 1289 BLAKE2B 98b9af7e5df78dd24e2fc6c50b6cf27c638321f4cfd56941add2014e907670e2d6717d0205d9eb653f72fcdcc8a04870c5172a6d7ad91732b24f0e01755eeac6 SHA512 78d463b043de91fb9bf8ef918918ac1b5034f2878de56ca593dcd5f7f2907eaa7f7f364374f026a643ab608abdc294187a445298b5369dac140da8f4de8a9b90
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild b/games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild
index b31eb86fcec6..dff0f0c80f77 100644
--- a/games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild
+++ b/games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit desktop python-r1
 
 DESCRIPTION="A little puzzle game, similar to the famous Bejeweled or Zookeeper"
diff --git a/games-puzzle/pathological/Manifest b/games-puzzle/pathological/Manifest
index 632074acccaa..a32894b72615 100644
--- a/games-puzzle/pathological/Manifest
+++ b/games-puzzle/pathological/Manifest
@@ -1,5 +1,5 @@
 AUX pathological-1.1.3-build-r1.patch 294 BLAKE2B ca608731e0e25134f2ce66d8336e73fceb9a4201199a770857e6a5e8235ef387ab2bd9f7fb27f9434c8042131d09fb49eec39582d59bca3661a4ab489d181159 SHA512 ae7ba9c82cc51232b69fe5756ca5ae17d816c395b091f43c344f86439b3e08bdf2c4bcb9272f2b4e47ab1756432a9455c25c94dfe914ab2d2e5bfde99839483a
 DIST pathological-1.1.3.tar.gz 6995274 BLAKE2B 2fc891f1d0f15f68d2be3a210f04a64b73896cba92882e24fa60df09752b3235e025c4480510b7eebbf214d8ec4885ea556d76757888b85751a48432ea22709f SHA512 a64e0ca9a3bf86ade4a1abdd4f471c341838f690b2471f21c488471b7800da55f89f42c62a51c9be380cb9f265432db904a5de6f6bb3a9a7dde835da94baf566
 DIST pathological_1.1.3-16.debian.tar.xz 12992 BLAKE2B 3209f1d6b867f8d7baf83dda22f94829ba880a7aeff2a7587b883cac406e21b5c20d703a55599bc8692caa49553102ed1b4b0f7ac11c490b400ccbca7608d6cf SHA512 3d946a6d3c0daa4f0dac256c6e5fa053942a101aaae229836c8290dffc4556279169f71eff6bf4814d26ee30f466df9d7014b504c259aba139c3919c704db3ee
-EBUILD pathological-1.1.3_p16-r1.ebuild 2247 BLAKE2B 6a0b51e99c286039d5085e1a91c58c6a833cc0f5ae6fddd940610f8b65c6a85a56b46d867a4447fb9afdcb4ff3a3807adae899cab04eb8e3ce427ded5bcac2bb SHA512 e6a995a9c377640afb1e24525a87da574a08186d2794085e883401f2a872353976dc339f245846acfe30ba3b5538bed2d28bb434ee98b7771caed22e8f5312c7
+EBUILD pathological-1.1.3_p16-r1.ebuild 2278 BLAKE2B 9204987bdb5da3dc98d9324fe154cc321f801d7f97043d74f3544d4bbda9c316d72319ca6125a4b74af1c3923285dd2a93c934ad2e873fd39f0652c2337cb06e SHA512 56271d57f35448edde4196ee6b62ff0f289a89ed91abd4fd21c0553f57453558ebfccd3bab03cf3918bc76dce4fa588782983a0b0d2cebd7869139a458fa6f87
 MISC metadata.xml 335 BLAKE2B 775a6a1e8fcce8caa16099edfe9513a7dd1528584f8a54090e5064d9dc7b7c956caa585d90878f1f39148faf224fd941c04a2fe1be4cfdc3f1b1c27cf3a2a6c8 SHA512 d37783b18071c416deb0bbc6702ca086e84653bc7a54bc76283285eb0ece1f82a4f1b1a57ae6572b174c21a4d6d629d77f7edb8d2883cd2401f8cb0943646eaa
diff --git a/games-puzzle/pathological/pathological-1.1.3_p16-r1.ebuild b/games-puzzle/pathological/pathological-1.1.3_p16-r1.ebuild
index 85aff6751a6c..c41cdb26e8ec 100644
--- a/games-puzzle/pathological/pathological-1.1.3_p16-r1.ebuild
+++ b/games-puzzle/pathological/pathological-1.1.3_p16-r1.ebuild
@@ -1,10 +1,10 @@
-# 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} )
 
-inherit desktop python-single-r1
+inherit desktop python-single-r1 toolchain-funcs
 
 DESCRIPTION="An enriched clone of the game 'Logical' by Rainbow Arts"
 HOMEPAGE="http://pathological.sourceforge.net/"
@@ -70,6 +70,8 @@ src_prepare() {
 		${PN}.py || die
 
 	python_fix_shebang ${PN}.py
+
+	tc-export CC
 }
 
 src_install() {
diff --git a/games-puzzle/quadrapassel/Manifest b/games-puzzle/quadrapassel/Manifest
index 93460656f888..251a052513a8 100644
--- a/games-puzzle/quadrapassel/Manifest
+++ b/games-puzzle/quadrapassel/Manifest
@@ -1,7 +1,3 @@
-DIST quadrapassel-3.36.05.tar.xz 309160 BLAKE2B a9db4572a128ae0b965f29f83206dfa272ec6e5ad6316b0b0135d7424fdf6ea96c8ed602b4c6908b9ef7185c7821a658982398ea7a003de3c9714cbbb129fe59 SHA512 4219129a65d604e11cb1ef6ba38926311e7f32fb5bfebfc723236277fe0b779c5f1ddfca27db43f40d059291e2a4f9ff2552de6332002cb11b965136a946340e
-DIST quadrapassel-3.38.1.tar.xz 332316 BLAKE2B 5d1a1cb2c53653739e06818dd0ac1570b3a8f66ac4172ecec2e62e0afaa4054c604448c847600301dfd843d7d30c299691ca70b8568cf17921505ac16a5ba510 SHA512 4514b2ba0e53b5c9b6ce32fed850cdeac4d2fe9f848f87af61d51da18a94ff54da8c7126bd4df837452ba967dccf4dcd61c41c59402f1f0b76e2e19253bde8eb
 DIST quadrapassel-40.1.tar.xz 336740 BLAKE2B 71dfcbdaba846e8e199dce027034d2e3be7afc5ca3ffb67c508cbddc5bbdc15d4b93c95b5ff2a728e8e7da4e2034fd9eea76f6a160c0a62b9787ee8d0d34db23 SHA512 82817bde8a7ad9f782ad6a72825b5fccf21a7e5089a3a6c291239e55e268303f30d2bcfd85df0049c15c545a0f91a79eaed71b94a56371cb41dbf6089d8b22b3
-EBUILD quadrapassel-3.36.05.ebuild 953 BLAKE2B 76fca33db0bb3c34b0b9c2d8a3e2fed8f0510dd312d08987f38a52eb3c6bb10067f40409cf641fc4798499eb42f30aad0db3a5f26beb69f6f6a428a5006da3bb SHA512 eb3edd31e93aca93b74488371dcbe3900ce17f71421c6e221ee3dc0108edb76bfa41b06211e585de67d4e02e9e95209dd0172aa4e3a68d8588893da9c454e217
-EBUILD quadrapassel-3.38.1.ebuild 955 BLAKE2B d26d5582886e83f41a10b32233edc90cc7a13b36964b604ab3265a130842f5c320b5080457d67c7f951d68c4956b2fda3a7a2c7a1c5a26129cb686ea71f8df3d SHA512 450bf8e8a983fcbcba17d5f08c11d1dd91ad062065093ae67039888751287a48e858f70ecaa4b3dcad3791ad8cf3fb13cd7c6e7e052f4b7d3768eac0f563d14b
-EBUILD quadrapassel-40.1.ebuild 991 BLAKE2B 731c7709b8e7c60af65521bf564609868b0b84586caa9155a9c80a41a013c46ca5a68766d4d0e98e6bacc51a542b58698a51481dd9815bf25c98cb08b19d66b8 SHA512 033e073e9f1254a60a897d775036d8ddbf076e1dafc0d1c8063bbf2cb1b11d74776eeb56e98d702ce5fa30b190919cf7c6ab4de2c6b26d82e0822fd8582e0b83
+EBUILD quadrapassel-40.1.ebuild 989 BLAKE2B dd7d1fc07aac9cdaaf0d3af2c6c269fb39f984cc25c6a2209f85e40a82159fc2cab9777b6636f46f9a849c89c3c1d8cd6c628f122d72055c1087bc37e4bc7ace SHA512 cce18c626eff86e19af134e56094f856285456e2b71112cfa9824598a6e73a6cf01371e5fae123eb4b4d71ad0bbd0139ac63ad38b3e4f294b2a2ec45f598fa32
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/quadrapassel/quadrapassel-3.36.05.ebuild b/games-puzzle/quadrapassel/quadrapassel-3.36.05.ebuild
deleted file mode 100644
index 368d3a28e733..000000000000
--- a/games-puzzle/quadrapassel/quadrapassel-3.36.05.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Fit falling blocks together"
-HOMEPAGE="https://wiki.gnome.org/Apps/Quadrapassel"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/clutter-1:1.0
-	>=media-libs/clutter-gtk-0.91.6:1.0
-	media-libs/cogl:1.0=
-	>=media-libs/gsound-1.0.2
-	>=x11-libs/gtk+-3.12.0:3
-	>=dev-libs/libmanette-0.2.0
-	x11-libs/pango
-	>=gnome-base/librsvg-2.32.0:2
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	media-libs/gsound[vala]
-	dev-libs/libmanette[vala]
-	gnome-base/librsvg:2[vala]
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-puzzle/quadrapassel/quadrapassel-3.38.1.ebuild b/games-puzzle/quadrapassel/quadrapassel-3.38.1.ebuild
deleted file mode 100644
index 40282e16218e..000000000000
--- a/games-puzzle/quadrapassel/quadrapassel-3.38.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Fit falling blocks together"
-HOMEPAGE="https://wiki.gnome.org/Apps/Quadrapassel"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/clutter-1:1.0
-	>=media-libs/clutter-gtk-0.91.6:1.0
-	media-libs/cogl:1.0=
-	>=media-libs/gsound-1.0.2
-	>=x11-libs/gtk+-3.12.0:3
-	>=dev-libs/libmanette-0.2.0
-	x11-libs/pango
-	>=gnome-base/librsvg-2.32.0:2
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-	media-libs/gsound[vala]
-	dev-libs/libmanette[vala]
-	gnome-base/librsvg:2[vala]
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-puzzle/quadrapassel/quadrapassel-40.1.ebuild b/games-puzzle/quadrapassel/quadrapassel-40.1.ebuild
index 6e103d03a15f..8e453f2f5135 100644
--- a/games-puzzle/quadrapassel/quadrapassel-40.1.ebuild
+++ b/games-puzzle/quadrapassel/quadrapassel-40.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Quadrapassel https://gitlab.gnome.org/GNOM
 
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=media-libs/clutter-1:1.0
diff --git a/games-puzzle/sgt-puzzles/Manifest b/games-puzzle/sgt-puzzles/Manifest
index 90679039316b..895dedbed43b 100644
--- a/games-puzzle/sgt-puzzles/Manifest
+++ b/games-puzzle/sgt-puzzles/Manifest
@@ -2,7 +2,5 @@ AUX sgt-puzzles-20161207-builtin-help.patch 3086 BLAKE2B 80af8579911c9abd0932466
 AUX sgt-puzzles.directory 65 BLAKE2B c51b022658d8bcc7b004f953f58c9848a992e5f82cfe5354d5dd3399fb12f355f609a33f3216998398572efc328cb19dc2228b70f55fb3488d8f05be3b089eb7 SHA512 b6cada99b9afae8407b494e066ce271cd65980e2d225e512d55b1905e93e70af3763e7e6e76fcdf30314005dfa309a5daa7e2ac6d83d312edaf2f74869d8079c
 AUX sgt-puzzles.menu 556 BLAKE2B 3e7ca65d13dbdd2d54520d549728cbf5d53e59f7d6cd836fa5807d8b883de157dbc006a8023831e15bdcceaa5828f5ce5cb19bbf89e635a352cbe0e864b18691 SHA512 2b3d68ae2eef33199953fe85af08c87ba91cfc8c1ea92b535af90c5f07fcbbccec124a0b9701b8cafe92786d945f2ed499e046a55d1e6da1bbb02ae5f02e5ee9
 DIST puzzles-20190415.e2135d5.tar.gz 3286744 BLAKE2B 6b19cde3f95b5375bde74923a5f8e3deb9abb7d4d737ad5f2d18aa7895b973a9ca1ed4a495cf80da8390ed7fb63f1eb973c8053d52145e5752c56e38d3ac19d7 SHA512 5f38c96cff4e745a1c1615762c0e5f3f3dd056ff7dbf0f80a5953e658ae1460503c6394fe29301f5682485d6a6121869853a270dc60327821a3059ca6d971fa1
-DIST sgt-puzzles-icons-20160315.tar.xz 715536 BLAKE2B c50b3a6a0d0f8a052215dd9fba7c3eca5822bc7f866a825ad5e92391bb1867d141793877bc7c4545cc6da674bf273752612f7d3578a6a05b22cc2552ea798ce6 SHA512 2fe2c02984eb8c36ac6fb4195be7895b336b84f40ce8baeb23dc8a32aca9937ccf1d33050b4da3cfba3c87e124ecbdd940ee4e990b37eabe8e2af897c2e23b57
-EBUILD sgt-puzzles-20190415.ebuild 2455 BLAKE2B d1f6ee48d4a2ac94caf9bef15af2819135683bd46f77edea40d4402d93607f367be518d7bb10d44b5713465aba386acc4c85bee4a13bf286e6b5b1a3ed815451 SHA512 e0a51ab6924e3bb90a11bb2ae7328c55b19ac4ef29471ab397bdb89319891c45e24edc5a9d8f05dcef0f7b3a833d26b024ab7a05c5479287a7ebd80bcd97bd9d
-EBUILD sgt-puzzles-99999999.ebuild 2455 BLAKE2B d1f6ee48d4a2ac94caf9bef15af2819135683bd46f77edea40d4402d93607f367be518d7bb10d44b5713465aba386acc4c85bee4a13bf286e6b5b1a3ed815451 SHA512 e0a51ab6924e3bb90a11bb2ae7328c55b19ac4ef29471ab397bdb89319891c45e24edc5a9d8f05dcef0f7b3a833d26b024ab7a05c5479287a7ebd80bcd97bd9d
-MISC metadata.xml 452 BLAKE2B 09a78c3be305df1ea55191c08026c582615d9b066de3497af93e9207eea812e9cb609bdf2b34c8f938f3c066ceb89d7494a51af2096a332646612986e016ec89 SHA512 7ae57620feaf828ac60d169acdd5b6d57600dbf2671507e995d91791d288e2a9d2858d5b2b73df175fa891b9fe3f9b39b60051f64f13a27b06d5f54b9da4eb3c
+EBUILD sgt-puzzles-20190415.ebuild 2367 BLAKE2B 6305a6337800502058b6c6206a55476e5a30b6091feba72245096e077f0c88dd5387aed6f03dca44be51d3ac224b734f009cc45da13c11321ebc3bc841f204fc SHA512 6f87d0fb32b1ee19ec1cd69b21e5e0643542674c34fe897439f0ae0670fbed71377a5112cfce71c20f1143e13c73b15b8d107efe3e848fc5db588dc49b680fef
+MISC metadata.xml 363 BLAKE2B befdd0efc6674eb9ef882b1a94d2132164aaaf48fbebf9439a4e397f8542cc00e78dc05a69e927123b4cd890404787fa15afd5a071a4dd444dffd8af0e290117 SHA512 b8a999849f72770de7bed980e7341652b6c3ec0dc5ec8120c69aca114bd1d962c8ad85f339387651ac36a8158ee1eb732e1be168f1fc48c522e201704bd63184
diff --git a/games-puzzle/sgt-puzzles/metadata.xml b/games-puzzle/sgt-puzzles/metadata.xml
index 697024d76f6e..fa736384b59a 100644
--- a/games-puzzle/sgt-puzzles/metadata.xml
+++ b/games-puzzle/sgt-puzzles/metadata.xml
@@ -9,7 +9,4 @@
 		<email>np-hardass@gentoo.org</email>
 		<name>Adam Feldman</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Use x11-libs/gtk+:3 instead of x11-libs/gtk+:2</flag>
-	</use>
 </pkgmetadata>
diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-20190415.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-20190415.ebuild
index 2988d396d974..902b9c928920 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-20190415.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20190415.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils gnome2-utils toolchain-funcs autotools
+inherit autotools desktop toolchain-funcs xdg-utils
 
 if [[ ${PV} == "99999999" ]] ; then
 	inherit git-r3
@@ -22,16 +22,17 @@ HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="+doc gtk3"
+IUSE="+doc"
 
 COMMON_DEPEND="
-	!gtk3? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )"
+	x11-libs/gtk+:3"
 
 RDEPEND="${COMMON_DEPEND}
 	x11-misc/xdg-utils" # Used by builtin help patch
 
-DEPEND="${COMMON_DEPEND}
+DEPEND="${COMMON_DEPEND}"
+
+BDEPEND="
 	dev-lang/perl
 	virtual/pkgconfig
 	doc? ( >=app-doc/halibut-1.2 )"
@@ -67,7 +68,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		--program-prefix="${PN}_" \
-		--with-gtk=$(usex gtk3 3 2)
+		--with-gtk=3
 }
 
 src_compile() {
@@ -86,12 +87,12 @@ src_install() {
 		name=$(awk -F: '/exe:/ { print $3 }' "${file}")
 		file=${file%.R}
 		newicon -s 48 icons/${file}-48d24.png ${PN}_${file}.png
-		make_desktop_entry "${PN}_${file}" "${name}" "${PN}_${file}" "Game;LogicGame;X-${PN};"
+		make_desktop_entry "${PN}_${file}" "${name}" "${PN}_${file}" "LogicGame;X-${PN};"
 	done
 
 	if use doc ; then
-		DOCS=( puzzles.{pdf,ps,txt} )
-		HTML_DOCS=( *.html )
+		local DOCS=( puzzles.{pdf,ps,txt} )
+		local HTML_DOCS=( *.html )
 		einstalldocs
 		doinfo puzzles.info{,-1,-2,-3}
 	fi
@@ -102,14 +103,10 @@ src_install() {
 	doins "${FILESDIR}/${PN}.directory"
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
deleted file mode 100644
index 2988d396d974..000000000000
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnome2-utils toolchain-funcs autotools
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.tartarus.org/simon/puzzles.git"
-	GENTOO_ICONS="20160315"
-	SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz"
-else
-	MAGIC=e2135d5
-	SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz"
-	S=${WORKDIR}/puzzles-${PV}.${MAGIC}
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Simon Tatham's Portable Puzzle Collection"
-HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+doc gtk3"
-
-COMMON_DEPEND="
-	!gtk3? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )"
-
-RDEPEND="${COMMON_DEPEND}
-	x11-misc/xdg-utils" # Used by builtin help patch
-
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	virtual/pkgconfig
-	doc? ( >=app-doc/halibut-1.2 )"
-
-PATCHES=( "${FILESDIR}/${PN}-20161207-builtin-help.patch" )
-
-src_unpack() {
-	default
-	if [[ ${PV} == "99999999" ]]; then
-		git-r3_src_unpack
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's|-Werror||g' \
-		configure.ac || die
-	sed -i \
-		-e 's/-O2 -Wall .* -g/-Wall/' \
-		-e "s/libstr =/libstr = '\$(LDFLAGS) ' ./" \
-		mkfiles.pl || die
-	./mkfiles.pl || die
-	eautoreconf
-
-	# Import icons from latest Gentoo tarball for live
-	if [[ ${PV} == "99999999" ]]; then
-		cp -R ../${PN}-icons/icons . || die
-	fi
-}
-
-src_configure() {
-	econf \
-		--program-prefix="${PN}_" \
-		--with-gtk=$(usex gtk3 3 2)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-	if use doc ; then
-		halibut --text --html --info --pdf --ps puzzles.but || die
-	fi
-}
-
-src_install() {
-	default
-
-	local file name
-	for file in *.R ; do
-		[[ ${file} == "nullgame.R" ]] && continue
-		name=$(awk -F: '/exe:/ { print $3 }' "${file}")
-		file=${file%.R}
-		newicon -s 48 icons/${file}-48d24.png ${PN}_${file}.png
-		make_desktop_entry "${PN}_${file}" "${name}" "${PN}_${file}" "Game;LogicGame;X-${PN};"
-	done
-
-	if use doc ; then
-		DOCS=( puzzles.{pdf,ps,txt} )
-		HTML_DOCS=( *.html )
-		einstalldocs
-		doinfo puzzles.info{,-1,-2,-3}
-	fi
-
-	insinto /etc/xdg/menus/applications-merged
-	doins "${FILESDIR}/${PN}.menu"
-	insinto /usr/share/desktop-directories
-	doins "${FILESDIR}/${PN}.directory"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-puzzle/swell-foop/Manifest b/games-puzzle/swell-foop/Manifest
index 0e3405ace762..fcc7110fdf8e 100644
--- a/games-puzzle/swell-foop/Manifest
+++ b/games-puzzle/swell-foop/Manifest
@@ -1,8 +1,4 @@
 AUX 3.34.1-fix-vala-0.50.patch 757 BLAKE2B 47d92ba8487ed20161481abb7553f68043928dbe2a42f69635943f22c0d35006564a3b226d93b79ed0306572cb4d65b56e22fce5d40905015a421f25ba58aa5c SHA512 6c247e6c9d266f9fb3be929727cabdc3a5d0bca3214663dd87b22da68729dfbd53c2f9d21dee307fa4399eb912ee0ba0d15a0fda526f8abcf6b6bf9672de203f
-DIST swell-foop-3.34.1.tar.xz 732008 BLAKE2B e41527ce485fc7d41b3b8667fba1100fc79a1683adbe7948ecb0f73b418f5e8bcd8c5eeb15c1083cfcbb0237294016ea49510ae6103e2cfc6bc93b508a61a02f SHA512 53625882a755959349f259f5527a48f926e6b8e0493eb81ac257fed6869b87d48e789e4a2141bee7aa8910fb061ca9d7541ceef7f3bdb7a5138068cc6dd16b81
-DIST swell-foop-40.0.tar.xz 821796 BLAKE2B c831a3ed4fc2f53a85793f19dee2e481970784dca4b092db7f905123073b185608fbd8c0a4d8b0c2a74fc4f48e982c4d39b88132381b2a4155609398868825fd SHA512 018a51fdc0e54d9f011a90757fad9d568df33b33241cff9281a49306b8cc236e173e251e8b7ae769a8096f0c9893d496108e4183382ac2f116128fce99774a00
 DIST swell-foop-40.1.tar.xz 821744 BLAKE2B 598af5d5bdeab2b6c3aca849e8c0a1f0c9690d14bc859c4c89bdf0577868efd7450f88e0039925e3cb83c60cd9943965382592962dc49fca31dac933099b7321 SHA512 99a90030eec32163f84e238458fca74b8ba19c7b804dc3f65d7f8f50f3d7f45dfd1cf45d383e332cad6c18fdf5d4eb79bf3c7b9f406a02431ed787b23a1c8cb7
-EBUILD swell-foop-3.34.1.ebuild 861 BLAKE2B d20089e12c8fe6ecbe777dd4402bc48422be515e36799ce039f8c36affdc673960095e3b495e16487e2a8227ab04ecd5b929c81e59f3297c19637ead0fffabf4 SHA512 c26a7b69a1556a90233eae98a64435e29229be57db26628bceb9ac6800da076235e078b3a6d957961ca60fd80efbdf09d18371cea75aa2e048bb25b19cbdbdc0
-EBUILD swell-foop-40.0.ebuild 875 BLAKE2B 128392d94d1c55ef80de58f5a2f6ee522e3f51682f8f6b08af6713829b46e56dfe6ea8b811e35f1156aab92ee45cc069e9ef0bafe0e659821f1779ee365354f6 SHA512 db4f1a4508a72e1a16f7fb76be9b8c18b9c2748454a4c96867829724a43df025bd9d1cd1b549b09e3449f5714b350098646bae2db6f1b8cbada005b33d6f34eb
-EBUILD swell-foop-40.1.ebuild 875 BLAKE2B 128392d94d1c55ef80de58f5a2f6ee522e3f51682f8f6b08af6713829b46e56dfe6ea8b811e35f1156aab92ee45cc069e9ef0bafe0e659821f1779ee365354f6 SHA512 db4f1a4508a72e1a16f7fb76be9b8c18b9c2748454a4c96867829724a43df025bd9d1cd1b549b09e3449f5714b350098646bae2db6f1b8cbada005b33d6f34eb
+EBUILD swell-foop-40.1.ebuild 873 BLAKE2B afb45ae03f89af2386f6bb030152574908ab204d97143c47878fd495abc011767f41cd34f977cf8e6158cff9fc30b774d2581e8074f76c56b5824043cca7a85f SHA512 61ccbf3ca403820c6cad19c2f2efbb4d46a278a2bc00821a8e077d899eabb32c7fcc0c7174e189d2e31aff086f13e8f312df48d20e03b130f0db1c0d04617f06
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/swell-foop/swell-foop-3.34.1.ebuild b/games-puzzle/swell-foop/swell-foop-3.34.1.ebuild
deleted file mode 100644
index d3d72fffdb64..000000000000
--- a/games-puzzle/swell-foop/swell-foop-3.34.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Clear the screen by removing groups of colored and shaped tiles"
-HOMEPAGE="https://wiki.gnome.org/Apps/Swell%20Foop"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=x11-libs/gtk+-3.12:3
-	>=media-libs/clutter-1.14.0:1.0
-	>=media-libs/clutter-gtk-1.5.0:1.0
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-"
-
-PATCHES=(
-	"${FILESDIR}"/3.34.1-fix-vala-0.50.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-puzzle/swell-foop/swell-foop-40.0.ebuild b/games-puzzle/swell-foop/swell-foop-40.0.ebuild
deleted file mode 100644
index 763530ce1aca..000000000000
--- a/games-puzzle/swell-foop/swell-foop-40.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Clear the screen by removing groups of colored and shaped tiles"
-HOMEPAGE="https://wiki.gnome.org/Apps/Swell%20Foop"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=x11-libs/gtk+-3.24:3
-	>=media-libs/clutter-1.14.0:1.0
-	>=media-libs/clutter-gtk-1.5.0:1.0
-	>=dev-libs/libgnome-games-support-1.7.1:1=
-	>=dev-libs/libgee-0.14.0:0.8=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-libs/appstream-glib
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	$(vala_depend)
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/games-puzzle/swell-foop/swell-foop-40.1.ebuild b/games-puzzle/swell-foop/swell-foop-40.1.ebuild
index 763530ce1aca..fc264a49ff74 100644
--- a/games-puzzle/swell-foop/swell-foop-40.1.ebuild
+++ b/games-puzzle/swell-foop/swell-foop-40.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Swell%20Foop"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.36:2