gentoo resync : 25.04.2020

20 files changed, 32 insertions, 252 deletions

diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 9eadb38ec04f..9fcb69858efc 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/brainworkshop/Manifest b/games-puzzle/brainworkshop/Manifest
index f44cb6d493ff..ac390c845133 100644
--- a/games-puzzle/brainworkshop/Manifest
+++ b/games-puzzle/brainworkshop/Manifest
@@ -1,4 +1,4 @@
-AUX brainworkshop-5-fix-paths.patch 1190 BLAKE2B c340b1c218cfffd19e6c2845ef2f1a65600ecd5ab64570265f2749ac3beb4c9652bc7063aeba97cc4349cf8c45d21c7a5f284325ece7a52b39df1af5460d7ac4 SHA512 90cacbec87c731e539773f7c4dd4d4c5200259a41db7eba45d0e2f60f87d09868ee31c04ae693049e82286543f27494d33d28ea1701e39f27ce742eebc6d5183
-DIST brainworkshop-5_beta20180712.tar.gz 8001699 BLAKE2B 0bf6114d89ab39a79e7659f6fb76d1e1cb21624a014381fc73bf6ca56f2bd721c192bc89e42b147666dd6fb7d0f6df12c60230dc3bf17b75d68f3fba1ea58b99 SHA512 5733daefd79f77c0eadcf7cec03d1cd3658ca8f79b23705f763ba5b15cf44d2f67861852287a3998c101072a7dfae20304508bf68cd728f27e2051271a16464f
-EBUILD brainworkshop-5_beta20180712.ebuild 1295 BLAKE2B da3ddb6fa303ff4cec953303d30e913094b31d0ed333c76a5dff6589e414d5ab7f5dc5a749cf98b818e901333b282e1c5f49501e837a2c9beab0edffffc4e0b4 SHA512 7299aa61c91eb414c00f140bba38e76487f19f7bc3b0499d36575fc36c095b53f2708a328b1b41b31a1f08a7e6d8aa8f0c894cef7bf7fc55ea4ffe39196519fe
+AUX brainworkshop-5-fix-paths.patch 411 BLAKE2B e0243d2d6485ac0363505f604277adff228956591818333942b7a2c4e42f7392e49245fad58ff4f063fd25e2da9a6cfefe178e31566e737f18a1c79ab4a81a25 SHA512 2562fc3b436066c16cf3157ee4adc4ab390981eb5c3db8751848f4d30e1f780b74be78366ac578b5d44c553d488e51752ded6e5308503c7e5095a653881361f0
+DIST brainworkshop-5_beta20200310.tar.gz 8001718 BLAKE2B ec3ef92d169956cb9334230e60b5e2c370154c11640daa3201b56654cd402ecba37d3bd1e3ff95339b351bd8984fb84a6bab72bf9f752175d0fb3ae1d989ba10 SHA512 f061ef005ac5f1c8b3fe1f23d847852730a9402bfa6be83946b2cd1f3a352a7a6eb67b73c81506f082fe2ae590598435736a36c87513a11b87f3e8237a296669
+EBUILD brainworkshop-5_beta20200310.ebuild 1138 BLAKE2B 4aee5be97a1b54e103d67f2b1c8849b5847af7c0f4965408b30906ff60f87d04be1528e3a828c84fcff77c0f6553f6c0f80dbba4ce6f6789391ccd2167cc5326 SHA512 2719c00f51ad7f0abf6cd051b7416c96bcd041f88e1dcce6a998fb4804f711524b86915c9dc7682eae3e0a8f5f9d11009de8457af0f4e6231b5063b1a5820e03
 MISC metadata.xml 395 BLAKE2B a3f578a832b020cd1cb4f4dba3ce03e62081a44fa5402d66e907da7ec73462c6bc14932ca13222ea69ae3c38ef6c84790b793e0c992a617896a7f7dcbb348881 SHA512 b80e67f4bc7b85a5eeddc36d5a17b440a65f71422d42428ca95af5533243aa71bc5bda20e49404d03f7bb02d75752ec432fa80508f1bc0a59d295d146cf2b629
diff --git a/games-puzzle/brainworkshop/brainworkshop-5_beta20180712.ebuild b/games-puzzle/brainworkshop/brainworkshop-5_beta20200310.ebuild
index 2783a034d990..145e5021f07f 100644
--- a/games-puzzle/brainworkshop/brainworkshop-5_beta20180712.ebuild
+++ b/games-puzzle/brainworkshop/brainworkshop-5_beta20200310.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
-inherit eutils gnome2-utils python-r1
+PYTHON_COMPAT=( python3_{7,8} )
 
-COMMIT="c5343cb3d828e8181ffff8249f683fce2fcca6db"
+inherit desktop eutils python-single-r1 xdg
+
+COMMIT="ea817f7e163c4fb07a60b2066c694cba92d23818"
 DESCRIPTION="Short-term-memory training N-Back game"
 HOMEPAGE="https://github.com/samcv/brainworkshop"
 SRC_URI="https://github.com/samcv/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
@@ -15,9 +16,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}
-	|| ( >=dev-python/pyglet-1.1.4[${PYTHON_USEDEP},openal]
-		 >=dev-python/pyglet-1.1.4[${PYTHON_USEDEP},alsa] )"
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		>=dev-python/pyglet-1.5[${PYTHON_USEDEP},sound]
+	')
+"
+
+BDEPEND="
+	${PYTHON_DEPS}
+"
 
 S="${WORKDIR}/${PN}-${COMMIT}"
 
@@ -35,8 +43,7 @@ src_prepare() {
 }
 
 src_install() {
-	newbin ${PN}.pyw ${PN}
-	python_replicate_script "${ED}"usr/bin/${PN}
+	python_newscript ${PN}.pyw ${PN}
 
 	insinto /usr/share/${PN}
 	doins -r res/*
@@ -46,7 +53,3 @@ src_install() {
 	newicon -s 48 res/misc/brain/brain.png ${PN}.png
 	make_desktop_entry ${PN} "Brain Workshop"
 }
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/games-puzzle/brainworkshop/files/brainworkshop-5-fix-paths.patch b/games-puzzle/brainworkshop/files/brainworkshop-5-fix-paths.patch
index 0ecf099ff6b9..5e720d5cf8ba 100644
--- a/games-puzzle/brainworkshop/files/brainworkshop-5-fix-paths.patch
+++ b/games-puzzle/brainworkshop/files/brainworkshop-5-fix-paths.patch
@@ -1,15 +1,6 @@
 diff -Naur a/brainworkshop.pyw b/brainworkshop.pyw
 --- a/brainworkshop.pyw	2018-07-14 19:11:17.536581902 +0100
 +++ b/brainworkshop.pyw	2018-07-14 19:12:07.582695292 +0100
-@@ -41,7 +41,7 @@
-             error_msg("Expected an argument following %s" % arg)
-             exit(1)
- 
--import random, os, sys, imp, socket, webbrowser, time, math, traceback, datetime
-+import random, os, sys, imp, socket, webbrowser, time, math, traceback, datetime, errno
- if sys.version_info >= (3,0):
-     import urllib.request, configparser as ConfigParser
-     from io import StringIO
 @@ -173,7 +173,7 @@
      if rtrn:
          return rtrn
@@ -19,20 +10,3 @@ diff -Naur a/brainworkshop.pyw b/brainworkshop.pyw
  def edit_config_ini():
      if sys.platform == 'win32':
          cmd = 'notepad'
-@@ -823,7 +823,15 @@
-         f = open(os.path.join(get_data_dir(), STATS_BINARY), 'w')
-         f.close()
- 
--check_and_move_user_data()
-+try:
-+    path = get_data_dir()
-+    os.makedirs(path)
-+except OSError as exc:
-+    if exc.errno == errno.EEXIST and os.path.isdir(path):
-+        pass
-+    else:
-+        raise
-+
- load_last_user('defaults.ini')
- 
- cfg = parse_config(CONFIGFILE)
diff --git a/games-puzzle/five-or-more/Manifest b/games-puzzle/five-or-more/Manifest
index bd56785dfb3b..105e04ae8497 100644
--- a/games-puzzle/five-or-more/Manifest
+++ b/games-puzzle/five-or-more/Manifest
@@ -1,5 +1,3 @@
-DIST five-or-more-3.32.0.tar.xz 1238080 BLAKE2B ce810414ff58dff833560f1540f533aaa9fccf20af4a0b6ce42d6c4dafc21c72c210c0b710e1ae1ff04fa33f1e23ffbcc498a547169d216d26d02fd1fabbc1a4 SHA512 7a2eeed345754e8d27e626a63eb6ea00b22dd600e405899543c402490b953d3675597fa2c2df6f661108ac818664f82682f710652cfb2a0058c1da753d21df80
 DIST five-or-more-3.32.2.tar.xz 1238468 BLAKE2B 8d223df7933cc84751c173617540a3b725342e84669be22a865a6751be19671fbe269ddc00e4c3a32d78ce3313c71d3c7e1930beae7d1561f6b90a6f9cdc73b8 SHA512 bbca7ebca45eb0975a57accbd6d3648f3fa5ab6abfaaede04e038b7ea793b44a2e125dbfe65d3f53863e62fed36eb28bbd9180e8975c4988e0fc919a8708e4c3
-EBUILD five-or-more-3.32.0.ebuild 840 BLAKE2B 5ae7632efebcc62a260238a4732faa18829ac69cb1a037ddc5998101ef02206aa40815bf2f51cd3b703a6afdf86d788b4f74e7e4daad25126fe6574e7793a923 SHA512 f066834da1074eafe927bde8ebfe0a7e4e932b9399919425bc6aa872ff05da0f69d4d4fd988567a8b34cd769dcad64c35e9c863b6ca4ac12e8f1d5dc5a7c1505
-EBUILD five-or-more-3.32.2.ebuild 842 BLAKE2B 1f030f60d99123d30408f5a0735d0bfeb3036367c13671f9ec58e85b29ae59f9923950b15f2c6f6c774de32a5b521063c561f58335f3b828a68fd1591e9881de SHA512 e61ea2f955bcda781e886057419c7b161c1784b12b3213f7e1e5cf56f72e70243fed3029b8d67c4caaed10c6bcb93a4d84ef14a6c8a8b6ff4528ab0c82ace711
+EBUILD five-or-more-3.32.2.ebuild 840 BLAKE2B 5ae7632efebcc62a260238a4732faa18829ac69cb1a037ddc5998101ef02206aa40815bf2f51cd3b703a6afdf86d788b4f74e7e4daad25126fe6574e7793a923 SHA512 f066834da1074eafe927bde8ebfe0a7e4e932b9399919425bc6aa872ff05da0f69d4d4fd988567a8b34cd769dcad64c35e9c863b6ca4ac12e8f1d5dc5a7c1505
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/five-or-more/five-or-more-3.32.0.ebuild b/games-puzzle/five-or-more/five-or-more-3.32.0.ebuild
deleted file mode 100644
index e162e8369781..000000000000
--- a/games-puzzle/five-or-more/five-or-more-3.32.0.ebuild
+++ /dev/null
@@ -1,45 +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="Remove colored balls from the board by forming lines"
-HOMEPAGE="https://wiki.gnome.org/Apps/Five%20or%20more"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/libgee:0.8=
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-3.20:3
-	dev-libs/libgnome-games-support:=
-	>=gnome-base/librsvg-2.32:2
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	$(vala_depend)
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	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/five-or-more/five-or-more-3.32.2.ebuild b/games-puzzle/five-or-more/five-or-more-3.32.2.ebuild
index 9ff154a79caa..e162e8369781 100644
--- a/games-puzzle/five-or-more/five-or-more-3.32.2.ebuild
+++ b/games-puzzle/five-or-more/five-or-more-3.32.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Five%20or%20more"
 
 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/gnome-klotski/Manifest b/games-puzzle/gnome-klotski/Manifest
index fc44d5b054b6..404d0323b9a3 100644
--- a/games-puzzle/gnome-klotski/Manifest
+++ b/games-puzzle/gnome-klotski/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-klotski-3.34.0.tar.xz 846780 BLAKE2B 9928b79b0963078cb046eda5d776080fa61c6b2bf09af3da5da1e15ee7385771d792522dc44c63c1b4b3f0d218e4fe41b09fa35a86e90ae15b39a5fddf066667 SHA512 6a21588895594abe772d0a4cac3bc4049586078b35514647d1d9847472cae809c1a916a8bcd12775df5331a58058936e9723f0fd5e80844df2b362596e0694c5
 DIST gnome-klotski-3.34.4.tar.xz 847220 BLAKE2B d9abfcadfa770caa5fe7896b33a5e576022fd04dc6cb8eca49069988db16fbf50f36b296fc8cef985a42eb26e071595295e527dcbb04466c56bbe030af076914 SHA512 eccdfb40d386f873ccb49b9034807917b647338c339afacd419b3b83d8f3a5171427ac9dae8ce5e61c9484a726d009ec87819bd148d721d6d5cbcfcee5c57688
-EBUILD gnome-klotski-3.34.0.ebuild 847 BLAKE2B bdde8e9c2293814371dc410d54c58b67a9fa91aeb0f33f5fd9b563d27c083fba2b61218709322028d86f1c77e259afc23d1af2d2244defd680e6533a56df3e6f SHA512 326ec6fdb7050e926278f32a0c7b6b0be64488994a539efeebd079b942ce18e0fe31398460b93d0cc2b21cc5ca15b32a13b964272c0d0236a29114bb4a913a69
-EBUILD gnome-klotski-3.34.4.ebuild 849 BLAKE2B e4ff40ab9a902c1d870ca208e87bd15f7ac34ef812411baa68b6ea902268a744efc1bedbfadcc1d287a9088810693171478e2c652ca211799ed1bd3fa508f60f SHA512 3442bd40b4a06849606686a13ff88e801cd27e03a98783bbd2fe253b6bbe54e9752b6fca558c7961a5cd3f79b592ef3595c53bbe0da548da476f1458b6f1d6cd
+EBUILD gnome-klotski-3.34.4.ebuild 847 BLAKE2B 572b04dc75e7c9daf4b0d69e697ad6549c5f9cc0bf99b550eaf33ff6a0a6b3731c84400ed58a988568ef2ab11c57cea9b31ee934c3648ad15ff407bf81937707 SHA512 ffe275ceeb2f25a10eff881c86abe53198646d7dcb46d41b5309454b8ef93be7169db6c3c8b06f07972392f5210026c4190144198a7aa3dcc70472a3d69bfb5d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-klotski/gnome-klotski-3.34.0.ebuild b/games-puzzle/gnome-klotski/gnome-klotski-3.34.0.ebuild
deleted file mode 100644
index bb08a715fd0f..000000000000
--- a/games-puzzle/gnome-klotski/gnome-klotski-3.34.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MIN_API_VERSION="0.28"
-
-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.40.0:2
-	dev-libs/libgnome-games-support:1=
-	>=x11-libs/gtk+-3.19.0: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.34.4.ebuild b/games-puzzle/gnome-klotski/gnome-klotski-3.34.4.ebuild
index 8078c905919b..e8391bca376f 100644
--- a/games-puzzle/gnome-klotski/gnome-klotski-3.34.4.ebuild
+++ b/games-puzzle/gnome-klotski/gnome-klotski-3.34.4.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-taquin/Manifest b/games-puzzle/gnome-taquin/Manifest
index ab55753db647..65feba1a4be8 100644
--- a/games-puzzle/gnome-taquin/Manifest
+++ b/games-puzzle/gnome-taquin/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-taquin-3.32.0.tar.xz 5234188 BLAKE2B c302cc24385161d7cb12f77a8278399ef0e08322912d1afa0fce92a8064ccf8320de570f5995a84354db92179f697e31a600ad2144d44d9d006f539a1135428b SHA512 b874d38ca3a3d31fecabe0f0661d0410e69d744e06192c037f8a71da11e963e2a557780eb1a7fe9c75dd64a969b8d39c3ec1318ffe6a99c4248652ff5a416418
 DIST gnome-taquin-3.34.4.tar.xz 5242780 BLAKE2B 9763d77f77ddfc0c283663be22258b7baa2529f0d3efc05200f1735ca8766008451e648b6fb7b15e4f06887a6c040b5f25e5e63291b00036180a134854bcc57c SHA512 15da9ebc8c1aa89b350132efe034b977d96a62e686d01cfe8547b47541f1c2d30d564ba3eed35e3c80818835703cf4f33552d373908a2e8287c3982c041d7eef
-EBUILD gnome-taquin-3.32.0.ebuild 957 BLAKE2B b0b8f3f0c96dec67ddf2aa9263179da2eeb37b078ffe5c373776ea88c4de2ab7f482f902cb5a51e54923ecf6afa052b3092bafea0d65ce137986a8bdb5e6ab3b SHA512 d74e8e24fa39d8f8cb0bd0c39ad691a5db773c20c09cc4d73fc0bbc640c1c0e6119bfe5e6985f4b6bc85bc9a1720f2db42d1d805bba9c9e5cd1935d098223562
-EBUILD gnome-taquin-3.34.4.ebuild 949 BLAKE2B 9c6b1c74060070191c31194a240ae3591c0022fa1673ff972c19843da528939da7a15261ae974750760d25992f27af0188424bed42a86fc5bae7de0b864563af SHA512 cded8af6cc38f016cde0ee66c0b6e20116157f9469ec23d2610d3b0ff9a51ec0d2bd4d9992c8643998f8c0633a69013a00d2c688f615fb7ce7df7d5b60712d7d
+EBUILD gnome-taquin-3.34.4.ebuild 947 BLAKE2B 938f0107e1a52579c401f91ab825bbf77cd4bedee88aecc97cf26f22cc1bb53b021884298a808d8be31362f7ea7afc6db4e364defce59b3c903933877abffe59 SHA512 908cf16167004a5a07687a8f230bfcb7252434e6d44e2b5e8b9c2afbd6fd69d39895dc85703b3e691f8f0a30939057a0eb2e7d19da194360a76665fd66e60c52
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-taquin/gnome-taquin-3.32.0.ebuild b/games-puzzle/gnome-taquin/gnome-taquin-3.32.0.ebuild
deleted file mode 100644
index 7accbefeaeb3..000000000000
--- a/games-puzzle/gnome-taquin/gnome-taquin-3.32.0.ebuild
+++ /dev/null
@@ -1,48 +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="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.40.0:2
-	>=x11-libs/gtk+-3.22.23:3
-	>=gnome-base/librsvg-2.32.0:2
-	>=media-libs/libcanberra-0.26[gtk3]
-"
-# libxml2+gdk-pixbuf required for glib-compile-resources (xml-stripblanks and to-pixdata)
-DEPEND="${RDEPEND}"
-BDEPEND="
-	$(vala_depend)
-	gnome-base/librsvg:2[vala]
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	x11-libs/gdk-pixbuf:2
-"
-
-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.34.4.ebuild b/games-puzzle/gnome-taquin/gnome-taquin-3.34.4.ebuild
index 7d6067208a3b..2bf04a590c03 100644
--- a/games-puzzle/gnome-taquin/gnome-taquin-3.34.4.ebuild
+++ b/games-puzzle/gnome-taquin/gnome-taquin-3.34.4.ebuild
@@ -10,7 +10,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 6a2d0a9ca0c2..c620fe698049 100644
--- a/games-puzzle/gnome-tetravex/Manifest
+++ b/games-puzzle/gnome-tetravex/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-tetravex-3.34.1.tar.xz 914192 BLAKE2B 2bf9dd70d3c8bd71d7f6f4cc8412ad0ef1f89191890910253b8986b633a8d02660867d4be088d27ff50551c5de14448f4026689230984de213cd2c46d69a091b SHA512 bdf39318b093b10e4a018cd7ef4d8acc65013325bb5406347024f870be2758a42b6b9cdd01d6098d06372cef8967eb948857453f951f8fb54f469bb534642059
 DIST gnome-tetravex-3.34.4.tar.xz 914456 BLAKE2B 93fb2711c750feff80af8fb671e69aacb10241009855f268b90e333870f71a82a73344486fdb5612aec69b7c1f5d0a628fc31094fd3aee97bb6c5f68cbc825ac SHA512 4affa8823482d901cd2accc9cab43ebf7054f9550778e3b460ea4915e4eef5937ff74430399610101f1e8c06d8e6aa111e9ae240a19043c0907d0a1d013f5f67
-EBUILD gnome-tetravex-3.34.1.ebuild 712 BLAKE2B 8e128566a327df50f28213bfa3dc10ee5fe2d25271552d384db13258ffba16d9f5844ec39f30e56c9fec57d308de28dc74391a3acc65d68289874ce8d865463f SHA512 bbf43f9a65575981a30d8328c0990d61bbf27b1c7b39089fc48b03ff3d58b94e0f045fa7f5a8e24d02d865a5d06698f494f155b1f060104f1c2e201cee001eb0
-EBUILD gnome-tetravex-3.34.4.ebuild 714 BLAKE2B 0a5988e6ff5ece98527bef1ba18f9db885b2900a650c966ed87e3e720ae56ed2f3a3558b4937ed8e9ccb88bdd15271147dd201da19b5b6a29d23bedf468e1796 SHA512 9aba553013eb49f108103f153c4140483280795b2fc34516e8da911e6cd06d121d7b44873731846b8c7e6836dc5631ed89a952505a5eac3d461fd527e317f35c
+EBUILD gnome-tetravex-3.34.4.ebuild 712 BLAKE2B 116fd266617e835966a202702e913583fa4cd98f08e69a35acf84b24a74b449bddcf8bfa5e5d3ef48927a6d2b108e7638dbf70c22e704f21358b1b27cf3b73ae SHA512 f91a2ee8eb48e59189cbfe05ea30043c87c6640699a015b24aa53095001adbe5ba5b0e0dc73d50caa0097e6745f19cf0385b274b8e1251bed28898ec86cc389f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-tetravex/gnome-tetravex-3.34.1.ebuild b/games-puzzle/gnome-tetravex/gnome-tetravex-3.34.1.ebuild
deleted file mode 100644
index f0d6efec3ea9..000000000000
--- a/games-puzzle/gnome-tetravex/gnome-tetravex-3.34.1.ebuild
+++ /dev/null
@@ -1,41 +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="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=""
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2
-	>=x11-libs/gtk+-3.14:3
-"
-DEPEND="${RDEPEND}
-	$(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-tetravex/gnome-tetravex-3.34.4.ebuild b/games-puzzle/gnome-tetravex/gnome-tetravex-3.34.4.ebuild
index 7484562eeba3..536d552045ce 100644
--- a/games-puzzle/gnome-tetravex/gnome-tetravex-3.34.4.ebuild
+++ b/games-puzzle/gnome-tetravex/gnome-tetravex-3.34.4.ebuild
@@ -10,7 +10,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=""
 
 RDEPEND="
diff --git a/games-puzzle/nudoku/Manifest b/games-puzzle/nudoku/Manifest
index 548fcef53538..4500adc65b89 100644
--- a/games-puzzle/nudoku/Manifest
+++ b/games-puzzle/nudoku/Manifest
@@ -1,3 +1,3 @@
 DIST nudoku-1.0.0.tar.gz 20442 BLAKE2B b258362012b889a0756bc8cdbfbcdc9aba09e1162f6dc8a593061689e81d02935111bac8561648e89e7287af4702f110ea86fb20ae4e18bfba09f3578f0909cb SHA512 f29a698eec076729ce065633bb05e0146e229774ff1eb3f2bd5cd5733698e30b91085b55d871657d42f2d3d8bcf7bb45918f4a127d6a0464ebc8b90ccc384ec3
 EBUILD nudoku-1.0.0.ebuild 485 BLAKE2B 02f2a94050b3be4b5c76df209b536855752492fa5b484961f5e6446aa9f4b6472822313a285af551a24fbc8d76aa792d268bf0bbd53cc425fdeaea173f623f99 SHA512 0dd5d960c1d2314c7eed00fdd82c6d3e209ef4bb95f2bfb50a24959fd91171751ce7dd47c4ed501bc504f2604dc6f112c209d3abbecd3d9aed68bf36f98c2649
-MISC metadata.xml 442 BLAKE2B f41c2981dcecd90c3855fe81f16cb9fa07dea3416543e0459b75cf726e45796e5d8c186e9a1cdfe2640433d19e8478fda4649c3e6c82ef1fd6d0653bbe10d55e SHA512 43aaba52d460b3130d82e47f08c04253416ffe885e280d8beb03a8a750ab4367b01bd58caf0c83916c0e69115c629a48b5e0138229ba471a023171bb3e254a60
+MISC metadata.xml 245 BLAKE2B 8fb3a3f2774de770fb66ef326ffa556ccb999f87ee12603b1491c67ac6576d70894f70122c1ebacf82338d8908884aee6b8a908487f742aee61281096ce8f06c SHA512 c085edc6403259d8375f348dbb0f80c6a7cfc49e05e6266c458d0dd9e9e4c680583f73f8dda5badfd5be648640956dc4fa55d4dff39447582edd7d30a487cc4b
diff --git a/games-puzzle/nudoku/metadata.xml b/games-puzzle/nudoku/metadata.xml
index 3f5e183bc801..0310d268946d 100644
--- a/games-puzzle/nudoku/metadata.xml
+++ b/games-puzzle/nudoku/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jubalh@iodoru.org</email>
-		<name>Michael Vetter</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">jubalh/nudoku</remote-id>
 	</upstream>
diff --git a/games-puzzle/quadrapassel/Manifest b/games-puzzle/quadrapassel/Manifest
index fcf1187f20a3..351470871890 100644
--- a/games-puzzle/quadrapassel/Manifest
+++ b/games-puzzle/quadrapassel/Manifest
@@ -1,5 +1,5 @@
 DIST quadrapassel-3.32.0.tar.xz 478332 BLAKE2B c685ecdc542ea29dea145fb93409d951a058a7451cc0f6795a6c7e61387d891f6941e8569f4e61b4f473f72b4045d348669920d5847ba6165e891fac58bfa42c SHA512 c618d4b35888122fcdecb6085773d30198907d09dd234283650c96f1e7a5994f51e1ef33f7df2732c1ab28cf73f5fb3a4e35bd8780e782714c3faeb0eb46d24d
 DIST quadrapassel-3.36.00.tar.xz 308000 BLAKE2B 9decfce3573cd301d716cd0e5433113869118efc6935bcf1f1ed38a2c8cd26aec3b84d782f1b907a972cf9aeaf940d10c85de45e2d111e19c215a06e49aced15 SHA512 4e27011855e29b4703d5d1b82d9cc5a334ee60bd8e2a9ee8cdebd931a029df76407da02edffc9c1bdf5e845aee92291d09fe3c17fd0622a4e77d6eddd2ed5a4e
 EBUILD quadrapassel-3.32.0.ebuild 938 BLAKE2B 077a7dd4a6ed7413090298ee134e54114abf41bb6dfcf52c46f88c4644d6afa3c411ce47dcbbe798293a2eccd837441da024888221fed5cd363ef62aa13826c9 SHA512 575353193a9aa6ea200edae46e73b97dfeb207bdca8b946c7d8cc22ef728805cf9e088a631ff2149cf76a8c5d013039ffc94e6902705591d278d4d7643b12eba
-EBUILD quadrapassel-3.36.00.ebuild 950 BLAKE2B 1e6d0f84b079c6f82507376d29a789723996181adbb2e431a08ff94af547058f9e7e130cd18251a339f52ee060ef7eec0d995734dd70be13aefcc93b5b40f82d SHA512 93e49bf210138b9aa301baadb4c675495ebd8726ed0bc0e23538d64c431e37341bb2decfacdda0092f5a2df0a501aa9a2e5877bc763c04d56724e24a8c15d079
+EBUILD quadrapassel-3.36.00.ebuild 948 BLAKE2B e730f34451e2117f4d0ef628cd871f3a38eedfa460e4c4e9f684506011ce9e54ee3c5b71b7546e78236567bf7475ae646f44379144ab43d2886dc0b81a6f7754 SHA512 374f474eab0176d7f114609d30d31e3b553b67904aceb40bc682f5956f7d5303631b929f9eb2411fc8b6b3191a87e0ac5c57cdf833d66f9fe7adb1f7d1aad6cd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/quadrapassel/quadrapassel-3.36.00.ebuild b/games-puzzle/quadrapassel/quadrapassel-3.36.00.ebuild
index 4eb018429f50..45a88d8f0990 100644
--- a/games-puzzle/quadrapassel/quadrapassel-3.36.00.ebuild
+++ b/games-puzzle/quadrapassel/quadrapassel-3.36.00.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Quadrapassel"
 
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="