gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /games-puzzle
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
85 files changed, 1006 insertions, 524 deletions
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 89c367119840..9da17a314f33 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/bff-or-die/Manifest b/games-puzzle/bff-or-die/Manifest
index 41ff81201390..b7583154f582 100644
--- a/games-puzzle/bff-or-die/Manifest
+++ b/games-puzzle/bff-or-die/Manifest
@@ -1,3 +1,3 @@
 DIST BffOrDie_Linux.zip 194773335 BLAKE2B a32d6b26e446d84110db13340d527ad1ccc423ddb1dfcdacabaf80c0b326f7c7c3d8315b26cc3a8cf4c403b4943e94cd954c77d01edc1963e4fc3b773a4f1042 SHA512 4767fea4c3a94fcf4ad6ca2a313ba1c10d9e6d0d593a63aa336f90f38599f1c43064f56c3e8fd18615ff08bd01dbc0cabe0bd01a798276075c160143f6102650
-EBUILD bff-or-die-20200614.ebuild 1195 BLAKE2B 4abecb0838a6b8365b0b33f35e310bac6bb0c939ec7780cdaef946f63360fa3d8cae67602cf28171a8e9e31d0db90abea100e288d7f1803e28b01ea01ee28a7a SHA512 e1d5cc3f4bd2ecbe3479d1b678756d9a8e39d8428203d73c181de1ba97cb0e6609d6eaa27e07d57a9c5948d4d9a9a5d06c61e3a5cf7a98493edc38288ff792a0
+EBUILD bff-or-die-20200614.ebuild 1195 BLAKE2B facfb922e7adeac0508dd51b4779eaa775fbe5aa94f6e051f0d9faa070c03e68e68ad375ebe9e115710f832a872cb8a370d3002cbf9297071608a0373d3947dd SHA512 0c00c567a20563072ae589f33f08369f9fc2223b7e94abb50f580b94d20cfceac60975da7898ba049e98c38cdb260b585f13ef784c31d6d3943c070bd7a960cf
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-puzzle/bff-or-die/bff-or-die-20200614.ebuild b/games-puzzle/bff-or-die/bff-or-die-20200614.ebuild
index 1f5014cfab27..5d5a60d2416c 100644
--- a/games-puzzle/bff-or-die/bff-or-die-20200614.ebuild
+++ b/games-puzzle/bff-or-die/bff-or-die-20200614.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils desktop xdg
+inherit desktop wrapper xdg
 
 MY_PN="BffOrDie"
 DESCRIPTION="Time travelling alien couch co-op puzzle game for 1-4 players"
 HOMEPAGE="https://www.bffordie.com/"
 SRC_URI="${MY_PN}_Linux.zip"
+S="${WORKDIR}/${MY_PN}_Linux"
+
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
@@ -18,13 +20,10 @@ RDEPEND="
 	sys-libs/zlib
 	virtual/opengl
 "
-
 BDEPEND="
 	app-arch/unzip
 "
 
-S="${WORKDIR}/${MY_PN}_Linux"
-
 DIR="/opt/${PN}"
 QA_PREBUILT="${DIR#/}/*"
 
diff --git a/games-puzzle/braincurses/Manifest b/games-puzzle/braincurses/Manifest
index b8390c738157..0898ec061e46 100644
--- a/games-puzzle/braincurses/Manifest
+++ b/games-puzzle/braincurses/Manifest
@@ -3,5 +3,5 @@ AUX braincurses-0.5b-gcc43.patch 192 BLAKE2B 4f557c7666e4d1b772feb1de5a793868aaf
 DIST braincurses-0.5b.tar.gz 18487 BLAKE2B 4d3874eb6625781e866ba2250da45ff165d662abaeabda2c4525bb300479b33e1efb91f997165310b7a4edc61f81ac841b00b940d319ef0c18b8684dd5355d60 SHA512 7f90da3a5c480e0bf736dd4a53efc08abeb85969e727882e3d06f888b2a4b6002f9fd9bc1554ac2256c9821dea5fabf2638eba4a672046a09c1adb8690803a0e
 DIST braincurses-1.1.0.tar.gz 12996 BLAKE2B 3f0c5edabd65175e581280413f7fea841d4d4b7ff9f4b39c4c3a0084e0e4c0a159605fe9ed320769a9bc85d671845af115456df33305e20f1eef6c53626c01a4 SHA512 7f27512c321ca2f2c3b38a891fc4e1ab0e2371412ada827f69dc262e27abbf750861b7ab859d0d8407ba25e4814ea6c33bc36a2c8ccdeda4977fa4bebb5457cd
 EBUILD braincurses-0.5b-r1.ebuild 643 BLAKE2B cdec155c182c713d4d603ccf1f258f22961243bbc7e5765d86ea0b0a02e4e0a2b70d3bfa3ce466987d7231b3113afab3df78387cb19ea57da0e1bedab3544c43 SHA512 a369e231f9a396d5c019ae0741cd4f980cfd1655ae68f357293740fd65a11a9452fe494ecc3e003059a41e8bcaca70b2e2dbac2f00f82c5871e5a6dfad496208
-EBUILD braincurses-1.1.0.ebuild 558 BLAKE2B 5b1a24a0829a14aa2e7e379a543d9e84dd1edef5ab336ff8e82f8e33ac59eed7e4849dfa0641b6463e516d9270ea5743162c57dfaf40fcf1c5530b2bade2874e SHA512 61e780d9d20ec31c8cfc87389c00dfcfe63cf35c119c6112039cf5e0caa0fa6d7d30da718a0d6ae4efe513456abb88ba62641320eee29eae791e9d0330f868b4
+EBUILD braincurses-1.1.0.ebuild 606 BLAKE2B 90987817255b907f1122f715406200f1a0409c6bae245eaf1cbff0929782bba0b4b6cd0f47610e58f9437e13de7ffc8edeec7b3b22f05e5f1c7a1162a88b2aca SHA512 6e967e3945475a756c8455e01c2e286ea5930c986f81b2e750c4846540f57286fb60973f8a1ee302dcd7f91fdf4d7e1723f566281100ec13bace619651b4dd64
 MISC metadata.xml 337 BLAKE2B d32672d3c35740ec028a8cf238945686d62c66a374eaf02e785a098505d5b3533a40dd3d90d0c20c7544ee50253aab1e7db89adf4e156726f524d2ca44a9e409 SHA512 90b46ca1664d9f5b6f4f51f0c988a258293c3d60f0ec0a0708da360df1e21872d603f5dc5a84ff1dbff52d8b1146b5248f8ce42ee47313dc86f1a47ec03a9c7b
diff --git a/games-puzzle/braincurses/braincurses-1.1.0.ebuild b/games-puzzle/braincurses/braincurses-1.1.0.ebuild
index 94f0c4ab55b1..4a313b35b8a0 100644
--- a/games-puzzle/braincurses/braincurses-1.1.0.ebuild
+++ b/games-puzzle/braincurses/braincurses-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,10 +12,10 @@ SRC_URI="https://github.com/bderrly/braincurses/archive/${PV}.tar.gz -> ${P}.tar
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
 
-DEPEND=""
-RDEPEND=""
+RDEPEND="sys-libs/ncurses:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_compile() {
 	emake CXX=$(tc-getCXX) LDLIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
diff --git a/games-puzzle/brainparty/Manifest b/games-puzzle/brainparty/Manifest
index 1b26e6bc9d42..852bdb72ef2a 100644
--- a/games-puzzle/brainparty/Manifest
+++ b/games-puzzle/brainparty/Manifest
@@ -4,5 +4,5 @@ AUX brainparty-0.61-gcc49.patch 489 BLAKE2B f4f317679669fca33429e19a967945691e8b
 AUX brainparty-0.61-gnu_cxx-hash.patch 219 BLAKE2B 8a0570732bc55c2a0fe5b703e947650fe92200582581bc39857eb5a4898bdd9925ebd5e8568efc0e0c1765db26b4c9d5c15afab7fba49aa2a2016573e56be539 SHA512 d42cb49d0c320d91fc9c31706e2fb3e8cffcd0b08803b1a016ff30e283f35f86bbbdaae98a1f0ee3cece82d027dd767ce0a30ca8565887a2d2d619789ce51e30
 AUX brainparty-0.61-savegame.patch 674 BLAKE2B 051698e4fde8dab50ff591657705c32e5926d74ca83833ed0e901c6cc11bf82c66a6b7b5ef201d3e0ec2e27be0e8e0991c41216cfe34ece92ad21933606aaf0e SHA512 9e158b97ff15cfb4b6b8e4f6eb8006335841c48ff94b5da8bbb0cba03868b8ead92d2520bc8adae887d4baabac93c8104e44b46d87b6c4258792ab64376ce34a
 DIST brainparty0.61.tar.gz 40676905 BLAKE2B cfa1a408a66438491e6053be0e76ca64d1d78724be86379cb06e750fc842e9835b624af7b98163c232ee6e205a4c2f9478f9d42fe0eaa28d18b45e218db75971 SHA512 bc8578a551ce4b7f40e212d9ab9910b2435b88d8b7b7e90a1c088e37d5f26b5c6126fcb9ffee7e39981eff34c13144c8f3204e020532b5abf1c4815cc8074eb9
-EBUILD brainparty-0.61-r1.ebuild 1320 BLAKE2B c937cc1f04628ed768bdd6c99eb399d1d78b97fcfaf5ee34056a537c7efebf38aab345fdae7bb5fc485413fd6a3b15a8f4669526467ab256b6173a0bf69b4538 SHA512 cc36a6ad2439142594e82cb8a01e8d9331116563737838598a92def51aa8681d389c64d3a38f5d48b8626ebae1dc1b0bd96ab259da0c6bd3c7b2c8ea73972c7d
+EBUILD brainparty-0.61-r2.ebuild 1344 BLAKE2B d69c6af7df133bdc1ab976a18e2a8f3452fa60f11a01668d6274bb5f220ee7e3be82973c97e72eb54888bc8ad77b04944f9c050d4f78280f37094f9dd8b861c7 SHA512 afdc862c277669e31bab6834fdec5b8ffbae957c058605e8d4d3f261794412cfde513ba8ea97430a244e5af41cf30525422acc4853ca378f7170947f4ce1b6fd
 MISC metadata.xml 331 BLAKE2B e2ed6c3f26c4637f2ca40dd55ecda347ffd596dc9c55db194668bd546f362bf37e41e52ba94a6777da6bcfa4d53513b865a6acb615b60b2a6ce8f6e6634087ac SHA512 bcea1853cf01102eb88c58723e585f81c55b4208be24b46bc421b62afa84405539116b33289e94c7b1da5c259ca91d0fc6553e6441e59ec5d41326525742a404
diff --git a/games-puzzle/brainparty/brainparty-0.61-r1.ebuild b/games-puzzle/brainparty/brainparty-0.61-r2.ebuild
index 6f6b8eeb9c5a..ea625a5d9849 100644
--- a/games-puzzle/brainparty/brainparty-0.61-r1.ebuild
+++ b/games-puzzle/brainparty/brainparty-0.61-r2.ebuild
@@ -1,29 +1,30 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit desktop toolchain-funcs
 
 DESCRIPTION="A puzzle-solving, brain-stretching game for all ages"
 HOMEPAGE="http://www.tuxradar.com/brainparty"
 SRC_URI="https://launchpad.net/brainparty/trunk/${PV}/+download/${PN}${PV}.tar.gz"
+S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	media-libs/libsdl[sound,opengl,video]
 	media-libs/sdl-gfx
 	media-libs/sdl-image[png]
 	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-ttf"
+	media-libs/sdl-ttf
+	virtual/opengl
+	virtual/glu
+"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PN}
-
 PATCHES=(
 	"${FILESDIR}"/${P}-savegame.patch
 	"${FILESDIR}"/${P}-gcc49.patch
diff --git a/games-puzzle/brainworkshop/Manifest b/games-puzzle/brainworkshop/Manifest
index ac390c845133..d15f2a4fa3d6 100644
--- a/games-puzzle/brainworkshop/Manifest
+++ b/games-puzzle/brainworkshop/Manifest
@@ -1,4 +1,4 @@
 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
+EBUILD brainworkshop-5_beta20200310.ebuild 1142 BLAKE2B 91e9568b20e489ac8666a172b6d6027d9f49fa66719e6b5dcded2e453187e40521e39bd0437e9544ccc36579fbef5bdc80f0c2f52db5200c7e01a59bea5b9bb1 SHA512 a0368690526275ea41390268e4dc37bd15614c4f6538830fbd47f1b5f5e1d1760c68f96b873babc36122bb56366a456178a42ec6a9035469d54206f66988e0b1
 MISC metadata.xml 395 BLAKE2B a3f578a832b020cd1cb4f4dba3ce03e62081a44fa5402d66e907da7ec73462c6bc14932ca13222ea69ae3c38ef6c84790b793e0c992a617896a7f7dcbb348881 SHA512 b80e67f4bc7b85a5eeddc36d5a17b440a65f71422d42428ca95af5533243aa71bc5bda20e49404d03f7bb02d75752ec432fa80508f1bc0a59d295d146cf2b629
diff --git a/games-puzzle/brainworkshop/brainworkshop-5_beta20200310.ebuild b/games-puzzle/brainworkshop/brainworkshop-5_beta20200310.ebuild
index 145e5021f07f..c0ec2a730ce8 100644
--- a/games-puzzle/brainworkshop/brainworkshop-5_beta20200310.ebuild
+++ b/games-puzzle/brainworkshop/brainworkshop-5_beta20200310.ebuild
@@ -1,16 +1,17 @@
-# 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 eutils python-single-r1 xdg
+inherit desktop edos2unix 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"
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
diff --git a/games-puzzle/enigma/Manifest b/games-puzzle/enigma/Manifest
index 95e29c1ff023..295dfc52a94e 100644
--- a/games-puzzle/enigma/Manifest
+++ b/games-puzzle/enigma/Manifest
@@ -1,5 +1,5 @@
-AUX enigma-1.21-build.patch 3543 BLAKE2B bb4cd5fc8105b15cf913e8a5f6baeb58cba93965a422a7bd514fc4eea848f73f65853595da023e3458a48f861d7a42f1300dfd90418600f4432c327114ab4f17 SHA512 accfb31abaadbee476961f38cc2f76a1fceac4befbf4721d4e08061a3509d05f2e534b4f8f69f1765e082a4ed4f70ccbba0c73c4479a49ee1cfde4c1ae1cdcc4
+AUX enigma-1.21-build.patch 3720 BLAKE2B 508ed523ac95a0cb2c111ff518cd2c2ca51891c3f841b9bca1c7e8efefaa673a51a6074e6cfdc38d144475628c20b881b8f3f4bc25ca06285501549f9143e9bd SHA512 6fd279e38f3793fa73543cf5b7b6ead34c429eac620b5e5c4b33616bfd12913993e8e6eac22d93fb2d1f18507c810dcd026281f3cb9f0a4f2bfcddb7a3b813b9
 AUX enigma-1.21-gcc6.patch 927 BLAKE2B 279415c5cf96e9f4db37b29b4555fe2d66ce82c3c04199281c175176bab812351a342633888c524558d4f9362ccd1b1602fd7fc100e062e45bbac85fe966e06f SHA512 d0eb1f356370431e3b3b96c7fa3a56ca52ed15fa94286d1b5075ba8a4b4b349deb676479bd8e045a7463f65a3885c44aab90166549850e19c510d606aed2e746
 DIST enigma-1.21.tar.gz 56409951 BLAKE2B c03cf3c66cb1df771671c6c92d5a64e66ab78c2abbf25008285dedb5db10fb1c8daf2053c15a09147e00f0a22a7882e47b1c6ed66588b2397deec084456af1b9 SHA512 0cca56a193f0f416e0fde02caf2e30b61eef506b6c62e151ff575f5c130f1e2e778d77149007b114ebaeec3a3e793434328555cb5190954a0ae13ed6cee229f0
-EBUILD enigma-1.21-r3.ebuild 1503 BLAKE2B 3e1a2bc825ed265e7cb362c9d42b73e01157123c48552406ed6ce52844759189292da998da668c6791f96eb18900d40f26aad125ec482a0a100e79e44ab352ed SHA512 052f053424ddafe241002e78a8107eafe412048113bd0d97f8ca0351d7fb3fd0fb30d021ec2b76ebc57ec9ed1a176559128afdfd517d59c95f25c3ebf1010ae2
+EBUILD enigma-1.21-r3.ebuild 1244 BLAKE2B a4583aa421ae6aa3fb5ca337434234a8b4e216c5a814f65a3597554fdd103966185b6368c0a2a930aaccd6e694b0d201e49c0f49ae31eb496471de4639c34585 SHA512 afbaa15e0aa927ebf92bb6c9a1ec956b7bea9fe8432fc8b3ab110c03bb38540cc98a38bd4530b7f894a778be40dd7918bda6e7942195670a8931e847f423fe7c
 MISC metadata.xml 334 BLAKE2B 8e61a1119a930895b0773b8865550fde4bf532532ea4e904d537a6f4f93a27580841d121ff246bc4f9f60849a2224bedaf91bcb2e8ce3aa0b2a6ebee51dff1a8 SHA512 885fc4263252767f8861f2d45dc11a319cb5b0a7a9eccdf073a0433ba4908d97f7a590a96ae542372e53f16780a41cee4ee80556c0cedffbf34f6e4bcadeacc6
diff --git a/games-puzzle/enigma/enigma-1.21-r3.ebuild b/games-puzzle/enigma/enigma-1.21-r3.ebuild
index bdecef930251..a073345f7235 100644
--- a/games-puzzle/enigma/enigma-1.21-r3.ebuild
+++ b/games-puzzle/enigma/enigma-1.21-r3.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools gnome2-utils
+EAPI=7
+
+inherit autotools xdg
 
 DESCRIPTION="Puzzle game similar to Oxyd"
 HOMEPAGE="http://www.nongnu.org/enigma/"
@@ -13,7 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
-COMMON_DEPS="
+RDEPEND="
+	media-fonts/dejavu
 	media-libs/sdl-ttf
 	media-libs/libsdl[video]
 	media-libs/sdl-mixer
@@ -23,25 +25,22 @@ COMMON_DEPS="
 	net-misc/curl
 	|| ( >=dev-libs/xerces-c-3[icu] >=dev-libs/xerces-c-3[-icu,-iconv] )
 	net-libs/enet:=
-	nls? ( virtual/libintl )
-"
-DEPEND="${COMMON_DEPS}
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPS}
-	media-fonts/dejavu
-	x11-misc/xdg-utils
-"
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+)
 
 src_prepare() {
 	default
-	cp /usr/share/gettext/config.rpath .
-	eapply "${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-gcc6.patch
-	sed -i \
-		-e "s:DOCDIR:\"/usr/share/doc/${P}/html\":" \
-		src/main.cc || die
+
 	eautoreconf
+	config_rpath_update .
 }
 
 src_configure() {
@@ -51,25 +50,15 @@ src_configure() {
 }
 
 src_install() {
-	HTML_DOCS="doc/*" DOCS="ACKNOWLEDGEMENTS AUTHORS CHANGES README doc/HACKING" \
-		default
-	dosym \
-		/usr/share/fonts/dejavu/DejaVuSansCondensed.ttf \
-		/usr/share/${PN}/fonts/DejaVuSansCondensed.ttf
-	dosym \
-		/usr/share/fonts/dejavu/DejaVuSans.ttf \
-		/usr/share/${PN}/fonts/vera_sans.ttf
+	HTML_DOCS=( doc/.  )
+	DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES README doc/HACKING )
+	default
 	doman doc/enigma.6
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
 
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
+	dosym \
+		../../fonts/dejavu/DejaVuSansCondensed.ttf \
+		/usr/share/enigma/fonts/DejaVuSansCondensed.ttf
+	dosym \
+		../../fonts/dejavu/DejaVuSans.ttf \
+		/usr/share/enigma/fonts/vera_sans.ttf
 }
diff --git a/games-puzzle/enigma/files/enigma-1.21-build.patch b/games-puzzle/enigma/files/enigma-1.21-build.patch
index 6d5e91ca76e4..421ac8b7ae75 100644
--- a/games-puzzle/enigma/files/enigma-1.21-build.patch
+++ b/games-puzzle/enigma/files/enigma-1.21-build.patch
@@ -1,24 +1,14 @@
-diff -ru enigma-1.21.orig/Makefile.am enigma-1.21/Makefile.am
---- enigma-1.21.orig/Makefile.am	2014-12-19 16:26:06.000000000 -0500
-+++ enigma-1.21/Makefile.am	2015-02-06 18:20:22.239518323 -0500
-@@ -3,12 +3,9 @@
- #   tools -> lib-src/lua
- #   src   -> tools, lib-src
- #
--SUBDIRS = m4 lib-src tools intl src data doc po etc
-+SUBDIRS = m4 lib-src tools intl src data po etc
- EXTRA_DIST = enigma CHANGES ACKNOWLEDGEMENTS
+--- a/configure.ac
++++ b/configure.ac
+@@ -67,6 +67,7 @@
+ AC_PROG_CXX
+ AC_PROG_CPP
+ AC_PROG_RANLIB
++AM_PROG_AR
+ PKG_PROG_PKG_CONFIG
  
--docdir = @datadir@/doc/enigma
--doc_DATA = README CHANGES COPYING ACKNOWLEDGEMENTS
--
- ACLOCAL_AMFLAGS = -I m4
- 
- .PHONY: tolua
-diff -ru enigma-1.21.orig/configure.ac enigma-1.21/configure.ac
---- enigma-1.21.orig/configure.ac	2014-12-19 16:26:06.000000000 -0500
-+++ enigma-1.21/configure.ac	2015-02-06 18:20:22.282516643 -0500
-@@ -342,7 +342,6 @@
+ dnl do not add the AC_PROG_CXX default CXXFLAGS
+@@ -342,7 +343,6 @@
  	CXXFLAGS="$CXXFLAGS -O2 -ffast-math -fomit-frame-pointer"
  	AC_MSG_RESULT(yes)
  else
@@ -26,9 +16,49 @@ diff -ru enigma-1.21.orig/configure.ac enigma-1.21/configure.ac
  	AC_MSG_RESULT(no)
  fi
  
-diff -ru enigma-1.21.orig/etc/Makefile.am enigma-1.21/etc/Makefile.am
---- enigma-1.21.orig/etc/Makefile.am	2014-12-19 16:26:05.000000000 -0500
-+++ enigma-1.21/etc/Makefile.am	2015-02-06 18:25:44.131945494 -0500
+@@ -421,14 +421,17 @@
+ dnl ----------------------------------------------------------
+ 
+ AC_MSG_CHECKING(whether to use system enet)
+-AC_ARG_WITH(system-enet,
+-  AS_HELP_STRING(--with-system-enet, Use system enet), system_enet=$withval,
+-  system_enet=no
+-)
++AC_ARG_WITH([system-enet], [
++  AS_HELP_STRING([--with-system-enet], [Use system enet])], [
++  system_enet=$withval], [
++  system_enet=no])
++AC_MSG_RESULT([${system_enet}])
++
+ AM_CONDITIONAL([SYSTEM_ENET], [test "x$system_enet" = xyes])
+-AM_COND_IF([SYSTEM_ENET],
+-		   PKG_CHECK_MODULES(LIBENET, [libenet], ,AC_MSG_ERROR([libenet not found!])),
+-		   AC_CONFIG_SUBDIRS([lib-src/enet]))
++AM_COND_IF([SYSTEM_ENET], [
++  PKG_CHECK_MODULES([LIBENET], [libenet])], [
++  AC_CONFIG_SUBDIRS([lib-src/enet])
++])
+ 
+ 
+ 
+--- a/etc/enigma.desktop
++++ b/etc/enigma.desktop
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Version=1.21
++Version=1.0
+ Name=Enigma
+ Name[be]=Enigma
+ Name[cs]=Enigma
+@@ -44,5 +44,5 @@
+ StartupNotify=false
+ Icon=enigma
+ Type=Application
+-Categories=Application;Game;PuzzleGame;
++Categories=Game;X-PuzzleGame;
+ 
+--- a/etc/Makefile.am
++++ b/etc/Makefile.am
 @@ -1,18 +1,18 @@
  # if !MINGW32
  # Comply with xdg icon theme specification
@@ -52,26 +82,34 @@ diff -ru enigma-1.21.orig/etc/Makefile.am enigma-1.21/etc/Makefile.am
  dist_appdata_DATA = enigma.appdata.xml
  # endif !MINGW32
  
-diff -ru enigma-1.21.orig/etc/enigma.desktop enigma-1.21/etc/enigma.desktop
---- enigma-1.21.orig/etc/enigma.desktop	2014-12-19 16:26:05.000000000 -0500
-+++ enigma-1.21/etc/enigma.desktop	2015-02-06 18:20:22.282516643 -0500
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Version=1.21
-+Version=1.0
- Name=Enigma
- Name[be]=Enigma
- Name[cs]=Enigma
-@@ -44,5 +44,5 @@
- StartupNotify=false
- Icon=enigma
- Type=Application
--Categories=Application;Game;PuzzleGame;
-+Categories=Game;X-PuzzleGame;
+--- a/lib-src/zipios++/configure.ac
++++ b/lib-src/zipios++/configure.ac
+@@ -37,6 +37,7 @@
+ AC_PROG_CPP
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
++AM_PROG_AR
  
-diff -ru enigma-1.21.orig/po/Makefile.in.in enigma-1.21/po/Makefile.in.in
---- enigma-1.21.orig/po/Makefile.in.in	2014-12-19 16:26:06.000000000 -0500
-+++ enigma-1.21/po/Makefile.in.in	2015-02-06 18:20:22.283516604 -0500
+ dnl Checks for libraries.
+ AC_CHECK_LIB(z, inflate, [cv_libz=yes], [cv_libz=no])
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,12 +3,9 @@
+ #   tools -> lib-src/lua
+ #   src   -> tools, lib-src
+ #
+-SUBDIRS = m4 lib-src tools intl src data doc po etc
++SUBDIRS = m4 lib-src tools intl src data po etc
+ EXTRA_DIST = enigma CHANGES ACKNOWLEDGEMENTS
+ 
+-docdir = @datadir@/doc/enigma
+-doc_DATA = README CHANGES COPYING ACKNOWLEDGEMENTS
+-
+ ACLOCAL_AMFLAGS = -I m4
+ 
+ .PHONY: tolua
+--- a/po/Makefile.in.in
++++ b/po/Makefile.in.in
 @@ -25,12 +25,12 @@
  exec_prefix = @exec_prefix@
  datarootdir = @datarootdir@
@@ -87,14 +125,15 @@ diff -ru enigma-1.21.orig/po/Makefile.in.in enigma-1.21/po/Makefile.in.in
  #install_sh@ -d
  mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
  
-diff -ru enigma-1.21.orig/src/Makefile.am enigma-1.21/src/Makefile.am
---- enigma-1.21.orig/src/Makefile.am	2014-12-19 16:24:38.000000000 -0500
-+++ enigma-1.21/src/Makefile.am	2015-02-06 18:20:22.283516604 -0500
-@@ -12,7 +12,7 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -11,8 +11,8 @@
+ 
  CXXFLAGS = @CXXFLAGS@\
  	-DSYSTEM_DATA_DIR=\"$(datadir)/enigma\" \
- 	-DDOCDIR=\"$(docdir)\" \
+-	-DDOCDIR=\"$(docdir)\" \
 -	-DLOCALEDIR=\"$(localedir_enigma)\" \
++	-DDOCDIR=\"$(htmldir)\" \
 +	-DLOCALEDIR=\"/usr/share/locale\" \
  	-I$(top_srcdir)/lib-src/zipios++  \
  	-I$(top_builddir)/lib-src/zipios++ \
diff --git a/games-puzzle/fish-fillets/Manifest b/games-puzzle/fish-fillets/Manifest
index c7a02db77ccf..9c84eb7ae8f0 100644
--- a/games-puzzle/fish-fillets/Manifest
+++ b/games-puzzle/fish-fillets/Manifest
@@ -1,4 +1,5 @@
+AUX fish-fillets-1.0.1-respect-AR.patch 229 BLAKE2B cc1230c0ac1736b28987219eb52b1b82a98e98eb56ffb2ccb7f648009aa621021cb94bb9567daf1f7292bf5bf40fa03fb84b73b71247c472c177c99a14378497 SHA512 7ea42c3ddfe78c07068847f7662155b29c10e1e70f3f867ce99f9d9b6c754a9c8e3b1fcffa038a70a49b45de317bf79d6d70c263c4b6065adef0c523099ef823
 DIST fillets-ng-1.0.1.tar.gz 380290 BLAKE2B 675839cb451686c35611120b0b8e1044bc6511ce2369157f7d7c934eb0477b10e925268ffb35d5415070f25d7469da249027f148ac06ba65bd139fbddfb20a03 SHA512 fe4a5186f94e953cbc85fe8b0ce804c881c96feda385cfc36e1840e448cf094c3d815fdbe32976a6697a855038951f97a384c277a1c52a048520e8da71136718
 DIST fillets-ng-data-1.0.0.tar.gz 146418413 BLAKE2B 0359cee1db5d54a124f76520c4c416d954969bd9fc79eb9305613549722133684c2f6696b754729316ca4f4ebcc3aff63db845fd71ffc955d5e9584d89a50999 SHA512 61c7fe3980510a7dbd85f4c246e7e42a0f79d8e2aacd96a0c7a14189c5dee92292efb030ac92299474162995039073288283fee0f352cf08be6975a2c86703e7
-EBUILD fish-fillets-1.0.1-r100.ebuild 1351 BLAKE2B 51ba3f69f88854f500d7f317b2436fe4d705696239d32c88379eae206a52d7bb70f823f7d106b41480f52cf3bb725d0340cfc686798a2d18ddd62fbecd23afdb SHA512 73f695e1d79c557a781c2be67f9e24a31361e84399919ea72b1c72f6d544050da6772c24effecfd507bb2492c7596aec0bc26df57a81c31e2eb731d390dc802c
+EBUILD fish-fillets-1.0.1-r100.ebuild 1410 BLAKE2B 188d94a1f1943a07c2543fd14dc8dae82d7390b5eff02e37da669b5a82d39812ce3e379119eb11988126d58eb5ed629b90901888846713272486a7cb60a755ac SHA512 ec39693410696969b955b340fa46ee30ee2cdbdedfa53bcf55e6fafa72c5c5278dbc9b30c6ce821834f832d263d92b3de1381b883da5bb21e0fc9b16de848160
 MISC metadata.xml 330 BLAKE2B 47ef211faf9977fbf1b3f58ead7b59c2b025e3b731433586d948d82b3f25b95470beb1904981bc001cd4f086deb133c809ac4676c553135502f0b00699c6b996 SHA512 dbe794bba7ca2d4414f5ea3b4ef5b8958268abf2f8bd45705300baddcca5cbb485ddc24b3328e25568b9aa741c50251417ee4100f3f118827fcc5c1a285dba66
diff --git a/games-puzzle/fish-fillets/files/fish-fillets-1.0.1-respect-AR.patch b/games-puzzle/fish-fillets/files/fish-fillets-1.0.1-respect-AR.patch
new file mode 100644
index 000000000000..6fb973b0d461
--- /dev/null
+++ b/games-puzzle/fish-fillets/files/fish-fillets-1.0.1-respect-AR.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/778590
+--- a/configure.in
++++ b/configure.in
+@@ -12,6 +12,7 @@ AC_PROG_CXX
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
++AM_PROG_AR
+ 
+ ###################################################
+ # Check for libm
diff --git a/games-puzzle/fish-fillets/fish-fillets-1.0.1-r100.ebuild b/games-puzzle/fish-fillets/fish-fillets-1.0.1-r100.ebuild
index 196ab712fb4d..6dc60e4f3df2 100644
--- a/games-puzzle/fish-fillets/fish-fillets-1.0.1-r100.ebuild
+++ b/games-puzzle/fish-fillets/fish-fillets-1.0.1-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,6 +12,7 @@ DESCRIPTION="Underwater puzzle game - find a safe way out"
 HOMEPAGE="http://fillets.sourceforge.net/"
 SRC_URI="mirror://sourceforge/fillets/fillets-ng-${PV}.tar.gz
 	mirror://sourceforge/fillets/fillets-ng-data-${DATA_PV}.tar.gz"
+S="${WORKDIR}/fillets-ng-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,42 +20,49 @@ KEYWORDS="~amd64 ~x86"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
-RDEPEND="${LUA_DEPS}
+RDEPEND="
+	${LUA_DEPS}
+	dev-libs/fribidi
 	>=media-libs/libsdl-1.2[sound,video]
 	>=media-libs/sdl-mixer-1.2.5[vorbis]
 	>=media-libs/sdl-image-1.2.2[png]
+	media-libs/sdl-ttf
 	media-libs/smpeg
 	x11-libs/libX11
-	media-libs/sdl-ttf
-	dev-libs/fribidi
 "
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/fillets-ng-${PV}"
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.1-respect-AR.patch"
+)
 
 src_prepare() {
 	default
+
 	#.mod was renamed to .fmod in lua 5.1.3 - bug #223271
 	sed -i \
 		-e 's/\.mod(/.fmod(/' \
 		$(grep -rl "\.mod\>" "${WORKDIR}"/fillets-ng-data-${DATA_PV}) \
 		|| die "sed failed"
-	rm -f missing
+
+	rm -f missing || die
 	mv configure.in configure.ac || die
 	eautoreconf
 }
 
 src_configure() {
-	econf --datadir="/usr/share/${PN}"
+	econf --datadir=/usr/share/${PN}
 }
 
 src_install() {
+	rm -f COPYING || die
+
 	default
-	insinto "/usr/share/${PN}"
+
+	insinto /usr/share/${PN}
 	cd "${WORKDIR}"/fillets-ng-data-${DATA_PV} || die
-	rm -f COPYING
-	einstalldocs
+
 	doins -r *
 	newicon images/icon.png ${PN}.png
 	make_desktop_entry fillets "Fish Fillets NG"
diff --git a/games-puzzle/glightoff/Manifest b/games-puzzle/glightoff/Manifest
index bb5b21bcc743..c62639e98e99 100644
--- a/games-puzzle/glightoff/Manifest
+++ b/games-puzzle/glightoff/Manifest
@@ -1,4 +1,4 @@
-AUX glightoff-1.0.0-desktop.patch 402 BLAKE2B 7963509566d34f84f6850385093774cd1829b6791e63494eaf774a2ec634288c68f57746046e47d76a8978dbf7dc9d6d4c6199a9c9358418a93d509892ac1c83 SHA512 4571865a471d210b5218775a09076bdc4003880e6683a245efeeba47a7e128822c11c6b1198fdfae21460900dce5fd747166c30f75c75d0322b1e8a68f7daa27
+AUX glightoff-1.0.0-desktop.patch 330 BLAKE2B 5bdeac9f9d8fe9aed9d80b3483775afee35b57f174f67c9b6cf1a368a309a1f01640982147f1b347abd7dbbccc46d901a230a6c7dbd2a7af20be2c8f517b8288 SHA512 53f637623de641a9948a45998edeb513a448dd12ce9bc264318dccdc7505fdb450ca1ca7926319bc505dfb1ab399b5ab9f087673e9137642765d4c38ac964e3c
 DIST glightoff-1.0.0.tar.gz 349274 BLAKE2B 1c8198215ad1b5229f7ca9ef55df2858cf61474d18343ab0d506ace2104807573b29a3e570c5b88149fa788601c4f2fda872f2f36948cbd8f0de3dc2c5193293 SHA512 b3be7f65bfbb6b3affbddd20a12321ee401defb2bc0b64e58b5aed05d319e6ac51100cfa8dfb4beddb3c919deb9ee6931235dbc4183c12d3e501da5eb748ae94
-EBUILD glightoff-1.0.0-r1.ebuild 703 BLAKE2B 03d9201fa1b7dcc37f33affeb79add8924fe982e218f6ee652d5ec352eec2e9ba0b4cb42ddfe87abab8c1d3cee95488710dc9cd3080b4cc8d3a940e99ea0ef25 SHA512 2ea4bc1971fe1352c5c3e94a8150e20000ac5a8ffec0e295f3f39a645416c340d6470c2ebfc4499f218e47a0661d66d5092a51e223d4b61015416aa7084b3433
+EBUILD glightoff-1.0.0-r1.ebuild 702 BLAKE2B 5c580c494e6bdf708150a1e14eb4549dd09847563dab61aaa1c450722a97817a0c54e80c99ab6e845b7a1d8a7391c89cd563b637f89b9b6151a0354d8f10c3cf SHA512 7aa53a6ce6c8fe24a116be2d197d8ce77d3e37d595fe24ca9ede571cc27dafb399430eb5a6928566216852ae6a2b78d73cb67adfd704a0c666e8c8aab7e83b26
 MISC metadata.xml 332 BLAKE2B 31bf81162a12c4192ab3fcf74e2e72c1f0f188c163e74b6db1de3986de1c335d641250c125732172fd7a2412edad4a97f01e53dd0f7e9470163fae5e3947210a SHA512 83debe37911969e2b45ad0ca5ff90684a7d7e3dc3fd4bb504aa537c3c7823b68131f8e919075c9e5806d6b29a8874086f3c69fbfbb1335898d241d8b46f70e70
diff --git a/games-puzzle/glightoff/files/glightoff-1.0.0-desktop.patch b/games-puzzle/glightoff/files/glightoff-1.0.0-desktop.patch
index 0d087d78df9f..503735eb168f 100644
--- a/games-puzzle/glightoff/files/glightoff-1.0.0-desktop.patch
+++ b/games-puzzle/glightoff/files/glightoff-1.0.0-desktop.patch
@@ -1,5 +1,5 @@
---- glightoff.desktop.in.old	2014-11-22 17:57:47.019838007 +0100
-+++ glightoff.desktop.in	2014-11-22 17:58:15.484321664 +0100
+--- a/glightoff.desktop.in
++++ b/glightoff.desktop.in
 @@ -1,10 +1,9 @@
  [Desktop Entry]
 -Encoding=UTF-8
diff --git a/games-puzzle/glightoff/glightoff-1.0.0-r1.ebuild b/games-puzzle/glightoff/glightoff-1.0.0-r1.ebuild
index 5a209fa62cf1..5ef63e773900 100644
--- a/games-puzzle/glightoff/glightoff-1.0.0-r1.ebuild
+++ b/games-puzzle/glightoff/glightoff-1.0.0-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-GCONF_DEBUG="yes"
+EAPI=7
 
-inherit eutils gnome2
+inherit gnome2
 
 DESCRIPTION="A simple (but not so easy to solve!) puzzle game"
 HOMEPAGE="http://glightoff.sourceforge.net/"
@@ -13,24 +12,27 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	gnome-base/librsvg
 	media-libs/libpng:0=
 	>=x11-libs/gtk+-2.6:2
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	>=dev-util/intltool-0.29
+	media-libs/libpng
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.0-desktop.patch
+)
+
 src_prepare() {
 	# Fix broken png files
 	pngfix -q --out=out.png glightoff.png
 	mv -f out.png glightoff.png || die
 
-	epatch "${FILESDIR}/${PN}-1.0.0-desktop.patch"
-
 	gnome2_src_prepare
 }
diff --git a/games-puzzle/gnome-klotski/Manifest b/games-puzzle/gnome-klotski/Manifest
index b1d55961c9c6..dd9ec07fcc5c 100644
--- a/games-puzzle/gnome-klotski/Manifest
+++ b/games-puzzle/gnome-klotski/Manifest
@@ -1,3 +1,5 @@
 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
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome2048/gnome2048-3.36.4.ebuild b/games-puzzle/gnome-klotski/gnome-klotski-3.38.2.ebuild
index 5eae653dcd4c..84a764921058 100644
--- a/games-puzzle/gnome2048/gnome2048-3.36.4.ebuild
+++ b/games-puzzle/gnome-klotski/gnome-klotski-3.38.2.ebuild
@@ -1,34 +1,35 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-GNOME_ORG_MODULE="gnome-2048"
+VALA_MIN_API_VERSION="0.40"
 
 inherit gnome.org gnome2-utils meson vala xdg
 
-DESCRIPTION="Move the tiles until you obtain the 2048 tile"
-HOMEPAGE="https://wiki.gnome.org/Apps/2048"
+DESCRIPTION="Slide blocks to solve the puzzle"
+HOMEPAGE="https://wiki.gnome.org/Apps/Klotski"
 
-LICENSE="GPL-3+"
+LICENSE="GPL-3+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 RDEPEND="
+	dev-libs/libgee:0.8=
 	>=dev-libs/glib-2.42.0:2
-	>=x11-libs/gtk+-3.22.23:3
-	>=media-libs/clutter-1.12.0:1.0
-	>=media-libs/clutter-gtk-1.6.0:1.0
-	>=dev-libs/libgee-0.14.0:0.8
-	dev-libs/libgnome-games-support:1=
+	>=dev-libs/libgnome-games-support-1.7.1:1=
+	>=x11-libs/gtk+-3.24.0:3
+	>=gnome-base/librsvg-2.32.0:2
+"
+DEPEND="${RDEPEND}
+	gnome-base/librsvg:2[vala]
 "
-DEPEND="${RDEPEND}"
 BDEPEND="
-	dev-libs/libxml2:2
+	$(vala_depend)
+	dev-libs/appstream-glib
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
-	$(vala_depend)
 "
 
 src_prepare() {
diff --git a/games-puzzle/gnome-sudoku/Manifest b/games-puzzle/gnome-sudoku/Manifest
index ab777d247d4f..8411f759456c 100644
--- a/games-puzzle/gnome-sudoku/Manifest
+++ b/games-puzzle/gnome-sudoku/Manifest
@@ -1,3 +1,5 @@
 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
 EBUILD gnome-sudoku-3.36.0.ebuild 918 BLAKE2B 5710e04a013be7ea5231a035a9da54f825500bad59d9218a366b53cbd932954a47983bf9bc4943d87ff3990accd6fd7996e9983795a1d48cca2b7f6fee1ccb97 SHA512 8045e2ca7de7f188c703c143ba830f1d95d432bd4342248a2129968b1be5728ecbda8c4d83ad44160d92e6570ec7724df288aeef90fd7179fba1fd465c258670
+EBUILD gnome-sudoku-40.0.ebuild 1070 BLAKE2B d3a9ac318697373cb00943258c91994e94b37b261c41615e120768b10d07ade078c39996880d6df79adde0233bac70854716a994f30c67d5f603ed65ce8eca56 SHA512 cb859d7e677c51fd72d98167f9179e13c6fed24ea3ea5a813c50d48ebbec00f2c96087377a1d9e807c805197d33357569443de19c0159dd5e379eb5f955ad8b8
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-40.0.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-40.0.ebuild
new file mode 100644
index 000000000000..bec42402e4f8
--- /dev/null
+++ b/games-puzzle/gnome-sudoku/gnome-sudoku-40.0.ebuild
@@ -0,0 +1,52 @@
+# 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-taquin/Manifest b/games-puzzle/gnome-taquin/Manifest
index 59d4ed1921bd..fd33e772da02 100644
--- a/games-puzzle/gnome-taquin/Manifest
+++ b/games-puzzle/gnome-taquin/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-taquin-3.36.4.tar.xz 5253972 BLAKE2B ddeacc57e52e434c5f3f7956226c4dc3c25416c61d8e920116dafebd89a3b442c01c54840bacdb93d5ee6ca4b6428c36f77c56f53651fe90ee8fda9026b23db5 SHA512 72e28698e292ec198c77f4f56624bafd88220157582d220ace363e29bb2f3bdbe7198c30348a6aef12e07dce275be6280fd4dc8a6bcc58f31d1e5ef54d0f3f7d
-EBUILD gnome-taquin-3.36.4.ebuild 975 BLAKE2B 5241680fe5dae9b5a31f7ba90efd7a62de324c3ac9541c39d8673edd1564974e8da94f32c6139003466aca6348af7e1fbbacae1c3c539ca09cd54c186c2c7f8c SHA512 76d933e6948b16a8022a64dab6e4bdc8ee4f0e0a184a7437ff8aac9a02552de3014f14a27400fc509bd7f610587b43ac4444527eb0e9346028c1868bd0d30a26
+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 1004 BLAKE2B 2e611f4503e79f57c14154bdef1e8082d89e5232a3ab29249b5eaf3b9d6f2391b09736856035c826351e0fd22d7fc2fe4827d6afdd6a0c7295791331d10f7c06 SHA512 52cd3472415b43613790b2a760a795e468b6251add02e66c0f4a1c46dfef46a846ae83a6f6e88751e74c2fa0a1baf5ce757a0faf11263d18047ddd46c0234737
 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
index 748ebb0c5716..47db03401bc7 100644
--- a/games-puzzle/gnome-taquin/gnome-taquin-3.36.4.ebuild
+++ b/games-puzzle/gnome-taquin/gnome-taquin-3.36.4.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 VALA_MIN_API_VERSION="0.44"
+VALA_MAX_API_VERSION="0.50"
 
 inherit gnome.org gnome2-utils meson vala xdg
 
diff --git a/games-puzzle/gnome-taquin/gnome-taquin-3.38.1.ebuild b/games-puzzle/gnome-taquin/gnome-taquin-3.38.1.ebuild
new file mode 100644
index 000000000000..67015ac256dc
--- /dev/null
+++ b/games-puzzle/gnome-taquin/gnome-taquin-3.38.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 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.24.0: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-tetravex/Manifest b/games-puzzle/gnome-tetravex/Manifest
index 4c45fda652b8..9a7360f76909 100644
--- a/games-puzzle/gnome-tetravex/Manifest
+++ b/games-puzzle/gnome-tetravex/Manifest
@@ -1,3 +1,5 @@
 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
 MISC metadata.xml 418 BLAKE2B 9722632bf30d5cd8920572c229e6344ebb73aee42104644351f8a512db0cfe890203328d063f6108a75cfaced93c7f680f296a2993b2ee0a7335ea483a9baaf3 SHA512 4cad964a8d4e4b0fa2c8161d867ba9683eaa591069b29a0aba877ab8deec55ab2d3a5d4b36aa37fa8314b93a31dde799e87cc0c54a7edde2aec139e567bd6913
diff --git a/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild b/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild
new file mode 100644
index 000000000000..040bddac9007
--- /dev/null
+++ b/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild
@@ -0,0 +1,53 @@
+# 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="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}"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(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/gnome2048/Manifest b/games-puzzle/gnome2048/Manifest
index 8288b2c4c58e..4836aea1fc6d 100644
--- a/games-puzzle/gnome2048/Manifest
+++ b/games-puzzle/gnome2048/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-2048-3.36.0.tar.xz 117764 BLAKE2B cf8f1fab6c218921a1ca1e3d568a0ea3cea9d7e39cb6631c79a82540c2152f09f3b29726a6af03720c84f6973d8f1371d32819bfec077f08b0803184fc1cf256 SHA512 a61907f7d1fb728ded21b61c74cc5d20f56b19ac4a82d4e068c5b5a8bddc6bd69b5aea1e48b08a83a7942482983981171cf9a73421c98f45dd7aa47e3cee3cf0
-DIST gnome-2048-3.36.4.tar.xz 121084 BLAKE2B 2dc8ae415d246780781cee624ff54047534e8d7b25681f6b6ae1e5cd6b8b71668f405a6f78c1a53857def9eabd3f80ff4dbaf415f22432b1251dd2373d511a6f SHA512 4b2e564aaf304e8e97e364a02eb8faf3a0169eab7fe73e8d716f03fd0156fe2796dca1332f257f335c1e7574774d2eb7ed0b97c13925d3300598b34c96fcd561
-EBUILD gnome2048-3.36.0.ebuild 853 BLAKE2B 119cf937531fd4f1e845121dfaf1f0ca2ceaebf257051937960b44c97f7af13e007f5836d6e22b401a9c4ba928d043631656d4b76151949f5c905e4e6914c9e8 SHA512 dc53657402b8b0d5b0ac0afe1479f372ce4bb8e78651e223bca1fcc3eb5e0f4173fd0640bf8e0dddb51f9a244e0e7cb28415b4845bbbbf31b9d7c674ff33a8e6
-EBUILD gnome2048-3.36.4.ebuild 853 BLAKE2B 119cf937531fd4f1e845121dfaf1f0ca2ceaebf257051937960b44c97f7af13e007f5836d6e22b401a9c4ba928d043631656d4b76151949f5c905e4e6914c9e8 SHA512 dc53657402b8b0d5b0ac0afe1479f372ce4bb8e78651e223bca1fcc3eb5e0f4173fd0640bf8e0dddb51f9a244e0e7cb28415b4845bbbbf31b9d7c674ff33a8e6
+DIST gnome-2048-3.38.2.tar.xz 126780 BLAKE2B 8d6eeb63927b49db6ff4cd4f0cf4da73233aa4b916bfb94b994e17417814c004bdbeaa913eee43dbb965e0723d0ef20682df62655138620cd0ba0ce42ad8be1c SHA512 9063c31ef2a1126b92b6f52950237ac3878a8cbe4b1304e2c56e4bc7f8b99320f45ad27b3d7be3fb4cd2a1856bd11a171facc98bc917076118b83380668e4df8
+EBUILD gnome2048-3.38.2.ebuild 860 BLAKE2B 65f97681abc0e10d494555b58df12f7acbeccf1ddb0825bf67346a0bf51f23d4591459b4c912ffa0b09da8ccc8c030d69f541170762e2533c06967677f4e05ca SHA512 c9d3a43893ccf2f9b99639650476b9b558aac7a2e1d48cb6154e350d4002a8d54993d57c4ed70f972bcc92464163824144af281b114113ada8ce41f8e99094c0
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome2048/gnome2048-3.36.0.ebuild b/games-puzzle/gnome2048/gnome2048-3.38.2.ebuild
index 5eae653dcd4c..6e94bd1f38df 100644
--- a/games-puzzle/gnome2048/gnome2048-3.36.0.ebuild
+++ b/games-puzzle/gnome2048/gnome2048-3.38.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,11 +16,11 @@ IUSE=""
 
 RDEPEND="
 	>=dev-libs/glib-2.42.0:2
-	>=x11-libs/gtk+-3.22.23:3
+	>=x11-libs/gtk+-3.24.0:3
 	>=media-libs/clutter-1.12.0:1.0
 	>=media-libs/clutter-gtk-1.6.0:1.0
 	>=dev-libs/libgee-0.14.0:0.8
-	dev-libs/libgnome-games-support:1=
+	>=dev-libs/libgnome-games-support-1.7.1:1=
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/games-puzzle/gnurobbo/Manifest b/games-puzzle/gnurobbo/Manifest
index d2df9d38f3fe..18d403518d72 100644
--- a/games-puzzle/gnurobbo/Manifest
+++ b/games-puzzle/gnurobbo/Manifest
@@ -1,5 +1,5 @@
 AUX gnurobbo-0.68-flags.patch 1105 BLAKE2B 4174fd00e12df7140516a1aa792a759e475b8b80c3c0c83c89c084daf8e7b96d74cacfeda6392f4df50760c5a87fe3a94676354bd24c6a9c904c88c1bf7058f5 SHA512 42a1e647fca531a952116859bc5804b27c1587510850a0800fbcd28c39239a4b3c8ca2aa14de37d4d710f92a50a2308c837677b59b803460a40b803a2ff98bfa
 DIST gnurobbo-0.68-single-variable-declarations.patch 41708 BLAKE2B 05de30e26be4c927c0ec23b2e2b9ce40dd4ef115928fc297235f10740286e9668ac67ac48d78e9ec5b52ce4c61b196407e1a0c5cac3af4d65e7031a9c69246ea SHA512 e8a498983bd5a8174e851f317088852e3f1ea510efa2377b71b9fe43005403a163c468ff7fdbaca2bd15524f51234de595d87b7791d24d0e9b871d1772f06854
 DIST gnurobbo-0.68-source.tar.gz 2400364 BLAKE2B bfc97fef53b8dc35fd21131557ab7f679890f20b1635268241ff0364262d2fdf7070fd889b6ebc62af8ae8740f5520de3d411acb91158382d6be0ff19c62aaeb SHA512 cf2ebfa556bf9852142c83f9d6fc304ed973d02983179fda0a7db8af0951116b6327ec7bbb462541f2678d32d4d9760e80b1c82c98a64138b25596cf1e3d52f6
-EBUILD gnurobbo-0.68.ebuild 1192 BLAKE2B ec21f80a0fa6fce69946ded40a4dc0250f1838ed8b9ed4f7789d51e5b88e471e5a7ce4e800cd9e22111049e0c7954b9056611779989976b198216756ca14bcd9 SHA512 2fd08d974c6d3d2f7349aa0a838f3c619077f24562645b919464c83b412399e97958758ca80becd9e7cbf4f21c8705101b407dff2fbe595f1f696d2ab3d7b0c2
+EBUILD gnurobbo-0.68.ebuild 1220 BLAKE2B ab8637f282c31506d0db358307c86b87fa263391bfebdf336ebe4b27a146df1463c73e200a648a14e48de8ed4a45635f00e7fc11a9c15a9ecea50b3162235be8 SHA512 e613f035090b62fd216203fb1c05e7881d61c357c38a31f8cd1f0e0ad65ed725af7fe2c2d5be238238dc8a2f2bfa005704e69e7050c99312f58eb9c7adeaf78c
 MISC metadata.xml 331 BLAKE2B 9e3cb9283f67936d5be789e0c65509547ddbfee86c3695ded8ff72310458e7937710915e82b2f9c9f50102b0a78ab08d3d78e5da7e05923bc53bdb69bf8b75e1 SHA512 56663c15b5d9135317f5cfdef851959613abd44ced462fc3429540a76be55970f831bfc284d2fe06ace79ea98586109bc64489ba9d12fab9a0909186f40365da
diff --git a/games-puzzle/gnurobbo/gnurobbo-0.68.ebuild b/games-puzzle/gnurobbo/gnurobbo-0.68.ebuild
index fded8903934c..2d1ba0468719 100644
--- a/games-puzzle/gnurobbo/gnurobbo-0.68.ebuild
+++ b/games-puzzle/gnurobbo/gnurobbo-0.68.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,6 +24,7 @@ RDEPEND="
 	media-libs/sdl-ttf
 "
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${P}-flags.patch"
diff --git a/games-puzzle/greedy/Manifest b/games-puzzle/greedy/Manifest
index 29a80e311f6d..15e42fb639ae 100644
--- a/games-puzzle/greedy/Manifest
+++ b/games-puzzle/greedy/Manifest
@@ -1,3 +1,4 @@
+AUX greedy-0.2.0-missing-include.patch 204 BLAKE2B 61c2524f1aeedb6951b34ba739ce868327638917a22e81c0a15333d31c50d8eba6c4179b0b4137f09a80592c6de440c2d8b99da770f2926690ff552eaa388ad2 SHA512 dc000d4f2c13f3cf88316ce637e1b80958a5f6368ded7f91e4e56092e341139f652f19bf6b14ef65c46de5a9e3f25b12b4b2664524110f995b04ab21f34ce5ca
 DIST greedy-0.2.0.tar.gz 13152 BLAKE2B e31aa4965a3347ae86c2c598e7eb9cfb3a24657fd24cb49f6d1a925a77e67d162b64647a3f0ea74ff40ac14aa996faaafa305a47991b2a40cd46d3e293ee5859 SHA512 07376d003193244d336909f6336d68c4ce0f1e15388f28cc8e50121856b1f341f46f2aeba6e09118063b27d572916b4f596b75354543df3a72930a44b6b6f8ac
-EBUILD greedy-0.2.0-r1.ebuild 896 BLAKE2B c7983666a3718b661cc7b0385729eb1e069d472b2fc2405847fa743a0816a385f29eb8ce1c84b767802125f9d158cc597ef3c4ba45dcc3df81150b149b8cb57f SHA512 548171eafbf6a19ca223d98387e82935898142a5ef453c382c3731994d3fc5734772ef9435b33cb429a95e95f252907878fe15a541611e5342119ee1f8af708b
+EBUILD greedy-0.2.0-r2.ebuild 914 BLAKE2B 31fb982594cbdd84371ba15a18c2a8798ab93089641a23b6b6dbb2174ce552ffe3c9b9f664856810cec8811f817db59c5a6132c591c0d5aa4d82e3135dca773e SHA512 108ff3a655783c76aa34eb60a90ef9a2e8a3b83278dc9cc2994556b4e040f61d6f63e4df0ba07656012a893ac6ed42683ef1c99ca93db1f1d63eca372d80055d
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/greedy/files/greedy-0.2.0-missing-include.patch b/games-puzzle/greedy/files/greedy-0.2.0-missing-include.patch
new file mode 100644
index 000000000000..a728cde5b34e
--- /dev/null
+++ b/games-puzzle/greedy/files/greedy-0.2.0-missing-include.patch
@@ -0,0 +1,12 @@
+--- a/greedy.c
++++ b/greedy.c
+@@ -13,6 +13,9 @@
+ 
+ #include <ncurses.h>
+ #include <stdlib.h>
++#include <time.h>
++#include <unistd.h>
++#include <string.h>
+ #include "playmodes.h"
+ #include "playmodes.c"
+ 
diff --git a/games-puzzle/greedy/greedy-0.2.0-r1.ebuild b/games-puzzle/greedy/greedy-0.2.0-r2.ebuild
index dffb899aebff..aea669387c16 100644
--- a/games-puzzle/greedy/greedy-0.2.0-r1.ebuild
+++ b/games-puzzle/greedy/greedy-0.2.0-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit toolchain-funcs games
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="fun little ncurses puzzle game"
 HOMEPAGE="http://www.kotinet.com/juhamattin/linux/index.html"
@@ -11,30 +12,31 @@ SRC_URI="http://www.kotinet.com/juhamattin/linux/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
 
-RDEPEND="sys-libs/ncurses:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-missing-include.patch )
 
 src_prepare() {
-	rm -f Makefile
+	default
+
+	rm Makefile || die
 	# It wants a scores file.  We need to touch one and install it.
-	touch greedy.scores
+	touch greedy.scores || die
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" LDLIBS="$($(tc-getPKG_CONFIG) ncurses --libs)" ${PN}
+	emake CC="$(tc-getCC)" LDLIBS="$($(tc-getPKG_CONFIG) ncurses --libs)" greedy
 }
 
 src_install() {
-	insinto "${GAMES_STATEDIR}"
-	doins greedy.scores
-
-	dogamesbin greedy
-	dodoc CHANGES README TODO
+	dobin greedy
+	einstalldocs
 
-	prepgamesdirs
+	insinto /var/games
+	doins greedy.scores
 	# We need to set the permissions correctly
-	fperms 664 "${GAMES_STATEDIR}/greedy.scores"
+	fperms 664 /var/games/greedy.scores
 }
diff --git a/games-puzzle/groundhog/Manifest b/games-puzzle/groundhog/Manifest
index b0bc9139eefb..ab2cce75f046 100644
--- a/games-puzzle/groundhog/Manifest
+++ b/games-puzzle/groundhog/Manifest
@@ -1,5 +1,5 @@
 AUX groundhog-1.4-flags.patch 608 BLAKE2B aec098b6453a3541a087d382f93e4aa1c9ba9deb6435118836cef9825c617e417981a25040ca2b36268de6c688a29d71f62c8e1bab197e824aee9bec81da0d1d SHA512 ee6e08ead434e9285ee6d2b8580effd33528a8c4c13635e9ecf1973ca25a7869a98ed6231f95e4e789867bfa56e8b57e2a939ebf35107f15959eb643df880862
 DIST groundhog-1.4.tar.gz 221871 BLAKE2B e9b7dd2c7498b6320ee4fe396679ba76831c13357b1e7fc9cd14578f387de6d1ca38fa0f5aa4fb3461afb3c27080751de45e3b26ded281dcb59475d85eccbe35 SHA512 9d1cf9073658cd325c4dceb6009825f50d8d4c55d0cca1b762cfdd066663257958d92e0e67ad49593add5821ce202e19c1106793ae8c77e4776c3b2e1fdc093c
 DIST groundhog_1.4-9.diff.gz 8613 BLAKE2B 5bbfd5deaa0f7579369baea93be40e5b2ced14d9356417b0aaef595df830bb29abb4b3676878f49005e68ec81c5ec762ab418fce55c26fbbd2af062263757335 SHA512 ddbb7c8b51fe63a1d318e080133737a851276ab55324875e5d68650d2399ac141667c62ab79ee41ababd2b5426e7bee5f158e7aa4edfe8ee82c6c3b6fb8179b8
-EBUILD groundhog-1.4-r1.ebuild 1221 BLAKE2B c282f82e888dadf7330bce1e4b99018e17fcb3713894ff27591320de9a167b86bebdb93a7ddd9b29545eb205946f61c38b64f5614b958ea554299e9a3b9a6410 SHA512 982cefcc7b8b5df623a5d7e49531334c7453072569efdb9304b7a8445109c0051733c92f88a15c0f6a2b2cce9c00a6c8a4d71828336868776ecfd661f61cf72f
+EBUILD groundhog-1.4-r1.ebuild 1270 BLAKE2B 4bff7749f11ef6de95e23380e3513c922fdbe66e6be4ffab0832c76c2303f23cbdaa6feb026953ae1acdb16ae96fbe59261454f9be2a563975a31a5c2dac7d77 SHA512 84337f732e3225c07366f1820257deca236b271d11648db0a3f8804eaa3b524e1bb7f4ac91e1348ba1e598c6ef0a1d4058b509d09b170e3513a4bbc2f73c21fb
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/groundhog/groundhog-1.4-r1.ebuild b/games-puzzle/groundhog/groundhog-1.4-r1.ebuild
index ba93616b6702..5fc37b168a5d 100644
--- a/games-puzzle/groundhog/groundhog-1.4-r1.ebuild
+++ b/games-puzzle/groundhog/groundhog-1.4-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit desktop epatch autotools
+EAPI=7
+
+inherit autotools desktop
 
 DEB_VER="9"
 DESCRIPTION="Put the balls in the pockets of the same color by manipulating a maze of tubes"
@@ -26,16 +27,22 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	default
-	cd "${WORKDIR}"
-	epatch groundhog_${PV}-${DEB_VER}.diff
-	cd "${S}"
+
+	cd "${WORKDIR}" || die
+	eapply groundhog_${PV}-${DEB_VER}.diff
+
+	cd "${S}" || die
 	sed -e "s:groundhog-1.4/::" -i \
-		debian/patches/sv.po.patch || die
+		"${WORKDIR}"/debian/patches/sv.po.patch || die
+
 	eapply \
-		$(sed -e 's:^:debian/patches/:' debian/patches/series) \
+		$(sed -e "s:^:${WORKDIR}/debian/patches/:" "${WORKDIR}"/debian/patches/series) \
 		"${FILESDIR}"/${P}-flags.patch
+
 	mv configure.in configure.ac || die
+
 	AT_M4DIR="m4" eautoreconf
+
 	sed -i 's:$(localedir):/usr/share/locale:' \
 		$(find . -name 'Makefile.in*') || die
 }
@@ -46,6 +53,7 @@ src_configure() {
 
 src_install() {
 	default
+
 	doicon src/pixmaps/${PN}.xpm
 	make_desktop_entry ${PN} "Groundhog" /usr/share/pixmaps/${PN}.xpm
 }
diff --git a/games-puzzle/lightsoff/Manifest b/games-puzzle/lightsoff/Manifest
index 1df4035a9917..fef9135a491b 100644
--- a/games-puzzle/lightsoff/Manifest
+++ b/games-puzzle/lightsoff/Manifest
@@ -1,3 +1,5 @@
 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
 MISC metadata.xml 501 BLAKE2B 0bb4f0ee48a733ac3da0c979642015df17a1c4628d857e1374b25678f1c0f8d585b26d455c037617233c8fc6cdf1dea190c1a4ad1ec383b398481a5f37df1076 SHA512 6248a8562c08d902ba2c078157c84111b46d7ddfa79dc76ee98405894f80cd9cad9f97d6ae9d071ca1b43aa9310834acee6f0d2a27e32e547d657cebbbc47ad6
diff --git a/games-puzzle/lightsoff/lightsoff-40.0.1.ebuild b/games-puzzle/lightsoff/lightsoff-40.0.1.ebuild
new file mode 100644
index 000000000000..211499a9c37f
--- /dev/null
+++ b/games-puzzle/lightsoff/lightsoff-40.0.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 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.24.0:3
+	>=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
+
+	# Bug #778845
+	sed -i \
+		-e 's:40\.rc:40~rc:' \
+		-e 's:40\.beta:40~beta:' \
+		-e 's:40\.alpha:40~alpha:' \
+		data/org.gnome.LightsOff.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/nightsky/Manifest b/games-puzzle/nightsky/Manifest
index a1d02e7f1a24..f8ff58f9a497 100644
--- a/games-puzzle/nightsky/Manifest
+++ b/games-puzzle/nightsky/Manifest
@@ -1,4 +1,4 @@
 AUX nightsky-wrapper 540 BLAKE2B 19eb62deb97cc4383e5b33920446278d369ec0c725dfa2a33709d7112cea8f97816724ee5976f7638b7610d110a4c3ff744ed23d248116c52113da141634e17d SHA512 6ecb52d390757bb6b1ffcd7b06c1a154d5a3253822e989d7b9276ede8627d241b203afb88afff731f33967a3e380d1fcaf3feeef61713485848f654df3855248
 DIST nightskyhd-linux-1324519044.tar.gz 123971537 BLAKE2B 52aafe22177ff3266bcff10a9de0b6a120f92c9dda0176a17c71140436b7ba6c13cab1775dd2406f8560ff0f8bfc2c4a38de4be40ef195535d9636edfb6005ba SHA512 a1d4ec588fa67c3dfbefe563d37df7bd93ce6a7580e7fcedda6567f6f05f362fc478fbd6ac921854fa5fe26270a037c49f9bce2df5527a6490ff0984b9bb671e
-EBUILD nightsky-20111222.ebuild 1888 BLAKE2B 5a3cc9f150e92859e8b354bc1e0574fa348afc397bbae3406258773e067c9e06b8e353625e9edc7a65411e20e4efd2759a6c0e2618480a7fd6ddd8404b259a46 SHA512 b5d1f627b1dd34e2e5d014d23b30e31d20df1959a1bbd6c46eee69105ff7f1f8401e24b50573d0b85dac1bec74fac02ceac74508c2a0d88267ef8412654c2612
+EBUILD nightsky-20111222-r1.ebuild 1808 BLAKE2B 7b3ebb26f4a009915a5c84cb9bf7cdfc49be9551d1dd99f35561049cf1f463cf25952f2d22b9463ea5d7c43c41e419930b0041c4ca1ff4db85545a51d6b752a5 SHA512 1951dfe40296e805bea858af9a117a9bc82b95e06483f0084cd64d7357b0cd6a02c181a28b46f047b68c552fc7bc5d3614ad59bad08e6b46ff97e6aa6fbe8852
 MISC metadata.xml 355 BLAKE2B 2ebe0923f754bb09445457bb7f266a9fb673682281d31d70b39a05f1cd0beb682fa26e89861c46e9dab0f77428b916f9f99d8324b3780c795f317b6e06efde84 SHA512 78f8cc8f1f1be915da206e4b8be196a21b58a6f209023594755e481136a1b86ee31c8d0dfedd516d756a47db624e89728875b073b71c3b08ac94a5cde8ff3b83
diff --git a/games-puzzle/nightsky/nightsky-20111222.ebuild b/games-puzzle/nightsky/nightsky-20111222-r1.ebuild
index d4876d52ef43..f74d7895b84c 100644
--- a/games-puzzle/nightsky/nightsky-20111222.ebuild
+++ b/games-puzzle/nightsky/nightsky-20111222-r1.ebuild
@@ -1,24 +1,28 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils gnome2-utils games
+inherit desktop gnome2-utils
 
 DESCRIPTION="Puzzle game that puts you inside and ambient and mysterious universe"
 HOMEPAGE="http://www.nicalis.com/nightsky/"
 SRC_URI="nightskyhd-linux-1324519044.tar.gz"
+S="${WORKDIR}"/NightSky
 
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="bundled-libs"
+
 RESTRICT="bindist fetch splitdebug"
 
-MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${MYGAMEDIR#/}/NightSky*
+MYGAMEDIR=opt/${PN}
+QA_PREBUILT="
+	${MYGAMEDIR#/}/NightSky*
 	${MYGAMEDIR#/}/lib/*
-	${MYGAMEDIR#/}/lib64/*"
+	${MYGAMEDIR#/}/lib64/*
+"
 
 RDEPEND="
 	virtual/glu
@@ -36,8 +40,6 @@ RDEPEND="
 		sys-libs/zlib
 	)"
 
-S=${WORKDIR}/NightSky
-
 pkg_nofetch() {
 	einfo "Please buy & download ${SRC_URI} from:"
 	einfo "  ${HOMEPAGE}"
@@ -45,12 +47,14 @@ pkg_nofetch() {
 }
 
 src_prepare() {
-	einfo "removing ${ARCH} unrelated files..."
+	default
+
+	einfo "Removing ${ARCH} unrelated files..."
 	rm -v NightSkyHD$(usex amd64 "" "_64") || die
 	rm -rv lib$(usex amd64 "" "64") || die
 
 	if ! use bundled-libs ; then
-		einfo "removing bundled libs..."
+		einfo "Removing bundled libs..."
 		rm -rv lib* || die
 	fi
 
@@ -58,12 +62,12 @@ src_prepare() {
 	rm -r Settings || die
 
 	sed \
-		-e "s#@GAMES_PREFIX_OPT@#${GAMES_PREFIX_OPT}#" \
+		-e "s#@GAMES_PREFIX_OPT@#/opt#" \
 		"${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die
 }
 
 src_install() {
-	dogamesbin "${T}"/${PN}
+	dobin "${T}"/${PN}
 
 	insinto "${MYGAMEDIR}"
 	doins -r *
@@ -72,16 +76,13 @@ src_install() {
 	make_desktop_entry ${PN}
 
 	fperms +x "${MYGAMEDIR}"/NightSkyHD$(usex amd64 "_64" "")
-	prepgamesdirs
 }
 
 pkg_preinst() {
-	games_pkg_preinst
 	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	games_pkg_postinst
 	gnome2_icon_cache_update
 
 	echo
diff --git a/games-puzzle/numptyphysics/Manifest b/games-puzzle/numptyphysics/Manifest
index b8f1faa7c50a..0c3bd7a619ac 100644
--- a/games-puzzle/numptyphysics/Manifest
+++ b/games-puzzle/numptyphysics/Manifest
@@ -1,4 +1,4 @@
-AUX numptyphysics-0.3.4-gentoo.patch 1087 BLAKE2B 354c6a2e692ba0f75684696c77c6fb170a02cc258d49a248918baf4483754f846aade1eacab7aa879eaf7c53bf914cc1d4a87307f6bcc18b826beaa66b4bcd0d SHA512 84279382cf5f8faf1f77a44d87a49b4d9ef3adf11c3c3fbfe11c77cfd7aa7c4eaf7a6917f09ee4ac67e0e8bf8584406e7afb8ab86db11b2fd269e2cf7c0e6a13
+AUX numptyphysics-0.3.5-gentoo.patch 365 BLAKE2B 1281844bb72c77ddadc9b42f46cb444da4153bab872973ecc845e77bc065d49b7be9024c0b9aaee458cc3cb1a63d6089e7f86552308c6ec5d9c1f0d74e422297 SHA512 7554f725d18d5a800ac47d6c51c585ee05554d32df31be2c911de51c9146059c9090e2de95cc4ebb2a76c24a745c1858e5716485f4a3f7dd97bd76c70164ee34
 DIST butelo.npz 7209 BLAKE2B bfcc1e56d0bde0762db0253ea85d669cbd06295f037357e21d6b192710db36b767cc7932030f37ab18f60d35c1232d32c0c8f2af7a06f5911764acdfa14fc0a7 SHA512 a1f6ce15c0a921969a0e6c96d2e354aa666e760275a86d45b85db833731273e16ac9cdb4975beca71c1abcfe5dd64a0181f74bbc3e3aba1c2bb541c3bbe80090
 DIST catalyst.npz 8778 BLAKE2B e36c1651306af2cf2f43d300f674a665fd13aace71244173537165ddf5cb91bb150fb4370d15ecea28f83a79678626e501874efad30be59928a214781a76080d SHA512 ad2c02721e1b2ded3621a5a5217f78ed1022a86472f4de030c9b3d258f0b7b580e953fc2d017519477cea4df1b482e61fca565a3d98d511e894805e6683e6830
 DIST christeck.npz 4868 BLAKE2B c3a3a9416bea3160cdd16a5184b1923e3daedf369f973d0160b4683ab9c41b297ffea6a1fed025c3e296eb620d99fc30eef8f3978d385dcad2f8647ead9e2036 SHA512 562ed1fe6caa026dcc897aa914c5cad648aa191127714c888f5d1fbf82bbac15477928e49e02a5ab8940a84a085afb6e282e04ac1478a0ace5449541137f89fc
@@ -12,7 +12,7 @@ DIST jhoff80.npz 4612 BLAKE2B 167174fe7e7ed9a765964a4325ac7478d1f60b7e5ea22c55b0
 DIST leonet.npz 4885 BLAKE2B 94355b22e995ba91c2c57afa6572d5a669f600d7a21b890a11150c88145727914595d39fb2ee2a8c1d3f21320ed69b06991bf7db521ff68984fae04600b18487 SHA512 789cdde6313b7cc9e8616c7969d86ed44866baa9ae88befa605d7066ca8134f167aac9490afa3918305929dbbc0acaf46708e02be4353f98ebeb3dbe3b0eefa1
 DIST melvin.npz 18147 BLAKE2B 285580aa6561e4842aee385f349c77fc8bc05ffb645f623a3fd586ad9737e6248c6a742835c2d17eca4a467f3933b16fc9278315f4d04e98f07b0532762016bf SHA512 391a82b4c42cd2597dd06b299f15cf41302ec593658929d320b66caa69cd73e7cbe3128a18c811017c3b73c435a6f42b763c6e531c8fd193715bc41f85a6b5c2
 DIST noodleman.npz 46574 BLAKE2B 408ec52adc0b65965858e54c9b281e418cdfce46fd125d30736719fd181fc0a2543f5bb486868b949db740c4a08d07b3f8abf7f3525daff2348e2eb0d24d7080 SHA512 a088c2c86303985e7d8beec34809f09fcf8e510f7c2af2530620774d1f6579ac1e5ac73989b8e423079c1171a79c92a0cb6e6e01dca950fc519007c91b86ea82
-DIST numptyphysics-0.3.4.tar.gz 1646818 BLAKE2B a78b68437bf446036b227dd9e37bcc3b7e3098f9998aa4a6172e68736b5b840db153538c063a20a02b3a1e7e2d5b0c9b3e976f5ffa8b631a44b8544e9c34bb24 SHA512 2934303737309c058f64ba9dc24a292553e065c7604c8f0964365a9ca2ef68356a68515df5d71b2d3a0f59d115ebcc8b052a17f66ca2cfd5ffa80b68a38ca407
+DIST numptyphysics-0.3.5.tar.gz 1647220 BLAKE2B 90a82f05b7a725a88ddf40b7369341319ce999f6a167a1c817e53614a9cc57bbd15d4ea6a251e5d389c4e9516d319ccee046bbb5a78606be4263ffd5223372e6 SHA512 d80eb929fc5af7b4a241169e833858f1436ec86818f6c6d8d9280254a4c5f113ec9123adda319b22410a4ac259732e95ca1af057b542bc3e9d6b784668435fd0
 DIST papky.npz 2075 BLAKE2B f638dfae861027a7c89fdfdb305b273cc07aef26ae16e1e2b11bac467d0b13a663d700ca0c6aa1c3630c0b20eb453c27c87b700182e701754f25b0be3b3c16e5 SHA512 69733167ef00f64c19e4f8805e1a881332698e26950f996fc5d41e9e5580f5578b2b9d3f9781bacc9293519e139b7d531891b91f36c45031ac06da6e8e78fbfa
 DIST perli.npz 15452 BLAKE2B 9c57af22a31eead27a3e48605c362a4018a3bc9e6227ac1e9e813a9ca2f8c3e2f771d6bbfc7fe1f7415989a14852105802ea054d12ddb5c6ce2697b47dadec03 SHA512 cee513ed0e728334f0e60571e38dc68e476681bad8a22497ac01f790c6975bbffba727ede054bfc6f594f289c9bf6346c3e9b3537145707c3ed6f4d6c21136c8
 DIST qole.npz 6533 BLAKE2B 35b24ea2a5462c079099ed511abbca8abf6e7362646574726027187166cac817509ff6c1bce3ef0e57d5e086adf9585edf9e00421a0a4954e755a8b056f718da SHA512 dc624c5ffdcb0f9f18c20db7a08d7e9d9d4fa5314e3fabfa730e21bb0a27d4b415432ec66eab64d8252c7fe4793a2cff231e856ca06d85c61558a867bf2fb03b
@@ -21,6 +21,6 @@ DIST szymanowski.npz 2577 BLAKE2B 827b5e15d6c1d6003d311cdf58b02b70a0986ab3232d19
 DIST therealbubba.npz 6684 BLAKE2B debdb3a6788425726101a5368d27ade150edd1c0badcbf19903c6e9ae688adfce51c17ce276dd7c477d4d816526fe33541b34d0398563bfd0be6da5ded928c0a SHA512 c71a84345f0c6e0cde87e76b3084d89b2222d33b512458efd98d91c099b54e817b8421ea70001de6e5556c0e28be1c9fc1c19ad1411dd1b2bf194f987cdbdec6
 DIST werre.npz 7739 BLAKE2B 09f6ebfa4ffb3cc39149b39ce70940ba0437fbfd8e6ec1c905096c0d8093874d4caa7bde92b90ab4100472339b068218f75d1b64425d06f6910d1f32c39e0f90 SHA512 1caac7964cc51c6300648fa6be21f7ac3c0d585288ea2e18e725f5575a732b461b77bfd0ddf3118f5d4c922f16a30466e168bb38e81498291214597fd4442bcd
 DIST zeez.npz 8633 BLAKE2B 758382345615f942a095399e15faf8ed98e467e4454e0cc156b55d38f1cf994a23cf4bbe7895b3a276da7516758ea7bc0e7983595f77a784eca078b347590b36 SHA512 8f1945d79dc43e0bc6e2b814640d1587fc38bf8ca19f6b949821d3095eb22e9837a3f82433e452ce851b97e29d90440045866dfc6a28f9f5b31ffcf35f467e41
-EBUILD numptyphysics-0.3.4.ebuild 2294 BLAKE2B 7475c812f49a3799b50ba1568ecfcd9cb4f65aecd64de731e6093edc1be8a71686a73649a8ae87699d875ab82b69624ec8f4658edbae46121ddbad0e7624cfe6 SHA512 16d2b66c143d6f7d8bc78dd4884b4e4c99db07fc77b9581ad9a6503edd2ed8360013eab2f16314bce77936e07778f7ab0a4acd143a693a37ad3cffa26c729268
-EBUILD numptyphysics-9999.ebuild 2582 BLAKE2B 4d72ce01297bb7473f6d1809df05a6b3ca1c3f5ba47bad3c7df1f879a5ebf9063ec4b44c1634014182d834510af67ea17ce9d874fa97ee5ec1c1db2d41c191dd SHA512 4b09987f37bf36dab6d4605860d5f8d73255cdccc52bab37f5724a4a7e8dc9b846d69aa659b1502b984d081169401e2aa4f6e39d294a4099419a506ab205ecbf
+EBUILD numptyphysics-0.3.5.ebuild 2296 BLAKE2B edaab618325ae81d97dac53e662acdc165dbb88121f5c23013ba308b0dba76451a7fc994d6a409374c26db820849e899bde332aa15b812d14ae73bb6a4506e4d SHA512 a66230e1c25bc2d6c84b4b8c00625c718e4f2b38d97b13cc349dad45ce9a64912efae53eb975ab04182329842698846be7cb8671ac50289c4e9c361a0ed948d2
+EBUILD numptyphysics-9999.ebuild 2263 BLAKE2B 89b943d77c93c4208dc4adc16a6feae0a317dd7dadc26aaecc40a45ed36da94ab73b13800c7795a049a34d32b3df04f1d6b57ea519d23bf2d76ed6d3ceff7284 SHA512 98f0af5e679eb7d295f22d40cf010dc64e4e5e4a7651edb5b3b976443d92730a4bc15d07bd8db0630a6f73f702cea804063e9fa56dbd75fcc7f88c0cb4511319
 MISC metadata.xml 339 BLAKE2B 9e41c9460f243a37e945b14949cd7b4d46cde5ac5df468fddb8d3752d47cc19583d1a63d8b6287952f15bdf4cdc24e8bebb328ff0f37b895719f27805dc2d470 SHA512 a007e8ee484f70548c0348d35bf1c616da363968370ccdf30693eacef552d552e7b839e8d32d81aec1c452aeb184f3cc2af79992c2f0cd73c1fdcc010f13d29f
diff --git a/games-puzzle/numptyphysics/files/numptyphysics-0.3.4-gentoo.patch b/games-puzzle/numptyphysics/files/numptyphysics-0.3.4-gentoo.patch
deleted file mode 100644
index e3a7b2ee372f..000000000000
--- a/games-puzzle/numptyphysics/files/numptyphysics-0.3.4-gentoo.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/external/glaserl/makefile b/external/glaserl/makefile
-index 4120459..f49d9e7 100644
---- a/external/glaserl/makefile
-+++ b/external/glaserl/makefile
-@@ -1,7 +1,5 @@
- TARGET := libglaserl.a
- 
--CFLAGS += -g -O2
--
- SOURCES := $(wildcard *.c)
- OBJECTS := $(SOURCES:.c=.o)
- 
-diff --git a/makefile b/makefile
-index 0f9a9b6..292b759 100644
---- a/makefile
-+++ b/makefile
-@@ -1,7 +1,6 @@
- APP := numptyphysics
- 
- SOURCES := $(wildcard src/*.cpp)
--CXXFLAGS += -std=c++11 -Isrc -Wall -Wno-sign-compare
- 
- all: app
- 
-@@ -13,7 +12,7 @@ app: $(TARGET)
- 
- $(TARGET): $(OBJECTS) $(LOCAL_LIBS)
- 	$(SILENTMSG) "\tLD\t$@\n"
--	$(SILENTCMD) $(CXX) -o $@ $^ $(LIBS)
-+	$(SILENTCMD) $(CXX) -o $@ $^ $(LDFLAGS) $(LIBS)
- 
- clean: $(ADDITIONAL_CLEAN_TARGETS)
- 	$(SILENTMSG) "\tCLEAN\n"
-diff --git a/src/Os.cpp b/src/Os.cpp
-index b5d7fb9..6a0ccf4 100644
---- a/src/Os.cpp
-+++ b/src/Os.cpp
-@@ -262,5 +262,5 @@ Os::globalDataDir()
-     }
- 
-     // System-wide installation
--    return thp::format("%s/../share/%s/data", g_appDir.c_str(), appName().c_str());
-+    return "/usr/share/numptyphysics/data";
- }
diff --git a/games-puzzle/numptyphysics/files/numptyphysics-0.3.5-gentoo.patch b/games-puzzle/numptyphysics/files/numptyphysics-0.3.5-gentoo.patch
new file mode 100644
index 000000000000..9a739ed5227c
--- /dev/null
+++ b/games-puzzle/numptyphysics/files/numptyphysics-0.3.5-gentoo.patch
@@ -0,0 +1,13 @@
+diff --git a/makefile b/makefile
+index 8125a48..0ee4942 100644
+--- a/makefile
++++ b/makefile
+@@ -37,7 +37,7 @@ $(OBJECTS): $(GENERATED_HEADERS)
+ 
+ $(TARGET): $(OBJECTS) $(LOCAL_LIBS)
+ 	$(SILENTMSG) "\tLD\t$@\n"
+-	$(SILENTCMD) $(CXX) -o $@ $^ $(LIBS)
++	$(SILENTCMD) $(CXX) -o $@ $^ $(LDFLAGS) $(LIBS)
+ 
+ clean: $(ADDITIONAL_CLEAN_TARGETS)
+ 	$(SILENTMSG) "\tCLEAN\n"
diff --git a/games-puzzle/numptyphysics/numptyphysics-0.3.4.ebuild b/games-puzzle/numptyphysics/numptyphysics-0.3.5.ebuild
index f06dc622d84b..aed95f6655cd 100644
--- a/games-puzzle/numptyphysics/numptyphysics-0.3.4.ebuild
+++ b/games-puzzle/numptyphysics/numptyphysics-0.3.5.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils gnome2-utils flag-o-matic
+EAPI=7
+
+inherit gnome2-utils toolchain-funcs
 
 DESCRIPTION="Crayon Physics-like drawing puzzle game using the same excellent Box2D engine"
-HOMEPAGE="http://thp.io/2015/numptyphysics/"
+HOMEPAGE="https://github.com/thp/numptyphysics"
 
 # This is only the SRC_URI for the user levels. The code is in git repo.
 SRC_URI="user-levels? (
-	https://github.com/thp/numptyphysics/archive/0.3.4.tar.gz -> ${P}.tar.gz
+	https://github.com/thp/numptyphysics/archive/${PV}.tar.gz -> ${P}.tar.gz
 	http://numptyphysics.garage.maemo.org/levels/butelo/butelo.npz
 	http://numptyphysics.garage.maemo.org/levels/catalyst/catalyst.npz
 	http://numptyphysics.garage.maemo.org/levels/christeck/christeck.npz
@@ -33,26 +34,28 @@ SRC_URI="user-levels? (
 	http://numptyphysics.garage.maemo.org/levels/zeez/zeez.npz
 )"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="+user-levels"
 
 RDEPEND="
+	dev-libs/glib:2
 	media-libs/libsdl2[opengl,video]
 	media-libs/sdl2-image[png]
 	media-libs/sdl2-ttf
 	virtual/opengl
-	dev-libs/glib:2
-"
-DEPEND="${DEPEND}
-	virtual/pkgconfig
 "
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.5-gentoo.patch
+)
 
-src_prepare() {
-	default
-	append-cxxflags -std=c++11 -Isrc
-	eapply "${FILESDIR}"/${P}-gentoo.patch
+src_compile() {
+	tc-export CC CXX
+	emake
 }
 
 pkg_preinst() {
diff --git a/games-puzzle/numptyphysics/numptyphysics-9999.ebuild b/games-puzzle/numptyphysics/numptyphysics-9999.ebuild
index 01e05708917e..e9ab6b1a7e7d 100644
--- a/games-puzzle/numptyphysics/numptyphysics-9999.ebuild
+++ b/games-puzzle/numptyphysics/numptyphysics-9999.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils gnome2-utils flag-o-matic git-r3
+EAPI=7
 
-DESCRIPTION="Crayon Physics-like drawing puzzle game using the same excellent Box2D engine"
-HOMEPAGE="http://thp.io/2015/numptyphysics/"
+inherit git-r3 gnome2-utils toolchain-funcs
 
+DESCRIPTION="Crayon Physics-like drawing puzzle game using the same excellent Box2D engine"
+HOMEPAGE="https://github.com/thp/numptyphysics"
+EGIT_REPO_URI="https://github.com/thp/numptyphysics"
 # This is only the SRC_URI for the user levels. The code is in git repo.
 SRC_URI="user-levels? (
 	http://numptyphysics.garage.maemo.org/levels/butelo/butelo.npz
@@ -32,35 +33,27 @@ SRC_URI="user-levels? (
 	http://numptyphysics.garage.maemo.org/levels/zeez/zeez.npz
 )"
 
-EGIT_REPO_URI="https://github.com/thp/numptyphysics"
-
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS=""
 IUSE="+user-levels"
 
-RDEPEND="media-libs/libsdl2[opengl,video]
+RDEPEND="
+	dev-libs/glib:2
+	media-libs/libsdl2[opengl,video]
 	media-libs/sdl2-image[png]
 	media-libs/sdl2-ttf
 	virtual/opengl
-	dev-libs/glib:2"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-src_unpack() {
-	git-r3_src_unpack
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.5-gentoo.patch
+)
 
-src_prepare() {
-	append-cxxflags -std=c++11 -Isrc
-	sed -i '/-g -O2/d' external/Box2D/Source/Makefile \
-		external/glaserl/makefile || die
-	sed -i "/return thp::/s% thp::.*$%\"/usr/share/${PN}/data\";%" \
-		src/Os.cpp || die
-	sed -e '/CXXFLAGS +=/s/\(CXXFLAGS +=\).*\( -DAPP=.*\)/\1\2/' \
-		-e '/SILENTCMD/s/$(LIBS)$/$(LDFLAGS) $(LIBS)/' \
-		-i makefile || die
-	eapply_user
+src_compile() {
+	tc-export CC CXX
+	emake
 }
 
 pkg_preinst() {
diff --git a/games-puzzle/picpuz/Manifest b/games-puzzle/picpuz/Manifest
index 5d66c15f6100..8d5f48efe9d4 100644
--- a/games-puzzle/picpuz/Manifest
+++ b/games-puzzle/picpuz/Manifest
@@ -1,5 +1,5 @@
-AUX picpuz-2.5-build.patch 5499 BLAKE2B cb568f817502eef15695e5f1cdaad837127e6004616b63596125b3538421c51e11edafc9421b173809cc22fb166d636eb47467d23ad12b5a7446a21638e5d9ea SHA512 49486aa996419da06fa7a14ac61c89930c1ca79f97615253bc1c4a96c7bc0af405d52661e1dd4b5186cf00877cde5b698070bbb9229d50e27a1a981de03d2f11
-AUX picpuz-2.5-pthread-underlinking.patch 842 BLAKE2B c347703e5b8d069872c34b7af776ea5e5e27967683db9fa7834c876482e22dd41e36d3c16b7da31235bd0e5f5228dccf1e279be80969757a69acc8bc1b215532 SHA512 12c5d7e46d9db2312b24524c33877d9fcf2c6f94bf822d03bd24f021d91496b1759af078582311663e28c98405d274ee30179140b92e44b9ddaca4b40a05e658
+AUX picpuz-2.5-build.patch 5466 BLAKE2B c99edcd74cfdd606f10b8b579ab9daf718e43618a331251c5fbecd0e4166cc959e4eead0bc6a292c875b73126cb4602cf5f23fec75bdcbfe4c61d3d44cc00f8d SHA512 5029124dfc9ed9a338cbe8899831dff38bea28b44cee612bfc95cd1ea434a4f942d53a832a4769229e7f31244a278d6ceae27e499108d4fe3b9e7c7e3a518622
+AUX picpuz-2.5-pthread-underlinking.patch 785 BLAKE2B 6b25d10b1c545a96965667032fa0c39b892b634e069d13079c8993f3b0a3ba1e7d0c7ccf74ac40dd10aa3663f2d06fe017d8f6b7cb3241d5d7b16a0244699999 SHA512 d2dfc2c44599bd125124709f6ecbc24b02c24cf8d3129a54d5f4ad434044689953606e062c784ba8200f40bec3175d8fa8f4d1e3643a925884374ccca394c424
 DIST picpuz-2.5.tar.gz 267452 BLAKE2B c99126cb38611ad2e7013f0108631d6d5c7a51add0927be3fe45c6225a03db655770b05cc47626d5fe80680530527dcd5acc39495be7666fe9ec6959a2e5f0ca SHA512 598507b29b1218f05ca8a0d1a5788607cd3db899cad83ce84606d268d513c75b863986d518f0ec134cac0a5879515a13cb794f87a59bf55b48217fc6b1f5c386
-EBUILD picpuz-2.5-r1.ebuild 1044 BLAKE2B eb75be02e73ea8f0c4d0faa9f062a3b8591ce1c6a388f7a92b661dd1d0274c59accc2d3c3183139554ec7e83e9538e98d18b1e7dcb0b079aa9945dd53ac0b654 SHA512 32bd76f61cd94c14bdb3f6c831896249f4b657522eff6d8a7cc7e42c05bc28584bd772d080f50c5555293dcd448068b17eef3f59d130393873a29ce9c5e1cf17
+EBUILD picpuz-2.5-r1.ebuild 1081 BLAKE2B 198d039674871dcbb37bdf217b9b3a45711d29b169c7de3667c561a09a141505b90f151ec53b16c47104beededba8b53da85056402f09195e86b0f0e28df1754 SHA512 aeb931c5a26d595cb475af3293cd4651e869ddf6e65982a6a840e32de23a9359a1985363be1fa8fce28ef87da4f6ea01851c3661ef7f074a7f0df047a2d256c0
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/picpuz/files/picpuz-2.5-build.patch b/games-puzzle/picpuz/files/picpuz-2.5-build.patch
index dfec57fe6ec0..6ca26e178bbf 100644
--- a/games-puzzle/picpuz/files/picpuz-2.5-build.patch
+++ b/games-puzzle/picpuz/files/picpuz-2.5-build.patch
@@ -1,8 +1,8 @@
 From: Julian Ospald <hasufell@gentoo.org>
 Date: Sat Jul 21 17:03:11 UTC 2012
 
---- picpuz-2.5/Makefile
-+++ picpuz-2.5/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -11,24 +11,26 @@
  
  # target install directories
@@ -18,7 +18,7 @@ Date: Sat Jul 21 17:03:11 UTC 2012
  MENUFILE = $(PREFIX)/share/applications/kornelix-$(PROGRAM).desktop
  
 -CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0`
-+CXXFLAGS += -c `pkg-config --cflags gtk+-3.0`
++CXXFLAGS += -c `${PKG_CONFIG} --cflags gtk+-3.0`
  LIBS = `pkg-config --libs gtk+-3.0`
  
  $(PROGRAM): $(PROGRAM).o zfuncs.o
@@ -46,8 +46,8 @@ Date: Sat Jul 21 17:03:11 UTC 2012
  	rm -R -f  $(DESTDIR)$(DOCDIR)
  	rm -f  $(DESTDIR)$(MANDIR)/$(PROGRAM).1.gz
  	xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE)
---- picpuz-2.5/zfuncs.cc
-+++ picpuz-2.5/zfuncs.cc
+--- a/zfuncs.cc
++++ b/zfuncs.cc
 @@ -3111,7 +3111,6 @@
           /prefix/share/appname/locales/         translations: appname-de.po  etc.
           /home/user/.appname/                   parameters etc. are copied here
diff --git a/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch b/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch
index 652231f1d4ff..f11f95cbf72b 100644
--- a/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch
+++ b/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch
@@ -3,16 +3,14 @@ Fix underlinking on recent binutils:
 > x86_64-pc-linux-gnu-g++ -Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu picpuz.o zfuncs.o `pkg-config --libs gtk+-3.0` -o picpuz
 > /usr/lib/gcc/x86_64-pc-linux-gnu/4.8.2/../../../../x86_64-pc-linux-gnu/bin/ld: zfuncs.o: undefined reference to symbol 'pthread_create@@GLIBC_2.2.5'
 > /lib64/libpthread.so.0: error adding symbols: DSO missing from command line
-diff --git a/Makefile b/Makefile
-index 28638de..700b610 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -19,7 +19,7 @@ MANDIR = $(PREFIX)/share/man/man1
  MENUFILE = $(PREFIX)/share/applications/kornelix-$(PROGRAM).desktop
  
- CXXFLAGS += -c `pkg-config --cflags gtk+-3.0`
+ CXXFLAGS += -c `${PKG_CONFIG} --cflags gtk+-3.0`
 -LIBS = `pkg-config --libs gtk+-3.0`
-+LIBS = -pthread `pkg-config --libs gtk+-3.0`
++LIBS = -pthread `${PKG_CONFIG} --libs gtk+-3.0`
  
  $(PROGRAM): $(PROGRAM).o zfuncs.o
  	$(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o $(LIBS) -o $(PROGRAM)
diff --git a/games-puzzle/picpuz/picpuz-2.5-r1.ebuild b/games-puzzle/picpuz/picpuz-2.5-r1.ebuild
index 5da7fe0df616..2b1863eb8bbe 100644
--- a/games-puzzle/picpuz/picpuz-2.5-r1.ebuild
+++ b/games-puzzle/picpuz/picpuz-2.5-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit desktop gnome2-utils
+
+inherit desktop gnome2-utils toolchain-funcs
 
 DESCRIPTION="A jigsaw puzzle program"
 HOMEPAGE="http://kornelix.squarespace.com/picpuz/"
@@ -11,7 +12,6 @@ SRC_URI="http://kornelix.squarespace.com/storage/downloads/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="x11-libs/gtk+:3"
 DEPEND="${RDEPEND}
@@ -24,6 +24,8 @@ PATCHES=(
 )
 
 src_compile() {
+	tc-export CXX PKG_CONFIG
+
 	emake \
 		BINDIR="/usr/bin" \
 		DATADIR=/usr/share/${PN} \
@@ -32,11 +34,15 @@ src_compile() {
 
 src_install() {
 	dobin ${PN}
+
 	insinto /usr/share/${PN}
 	doins -r icons locales
+
 	doicon -s 48 icons/${PN}.png
 	make_desktop_entry ${PN} Picpuz
+
 	HTML_DOCS="doc/userguide-en.html doc/images" einstalldocs
+
 	dodoc doc/{changelog,README,translations}
 	newman doc/${PN}.man ${PN}.1
 }
diff --git a/games-puzzle/pingus/Manifest b/games-puzzle/pingus/Manifest
index 28f965618285..28ef72a1847c 100644
--- a/games-puzzle/pingus/Manifest
+++ b/games-puzzle/pingus/Manifest
@@ -7,5 +7,5 @@ AUX pingus-0.7.6-python3.patch 553 BLAKE2B aa15a12e8e4d578a91ff1b96aceb51a529595
 AUX pingus-9999-no_libexec.patch 895 BLAKE2B 2cdbf1faffe66c4b6a9fe3518cbecbfce292995cc08f28ef4929a72d1df00a4f937a0c270d932ab724946986104f59a00af58676496950a429d14b1436386f39 SHA512 91bdecf06f47dca2ff3c019b6bafdbdba560ac05c49389b1fd9d59ab89f20b7251c3cfea62857b6f6de4720a2cba405e1c7bb8df5b36c76b2e2c0bf36fc7a5e4
 DIST pingus-0.7.6.tar.bz2 12622268 BLAKE2B 5ea1bbea7191919897bdedcda06f956d9b6cc0cda2ab11e475ef497ef8ba0c0de5a739ac334e2a5c9a0c138e6bfc44a23363dc59d3e4cfaea2b5388bbe57cc85 SHA512 6c8c2ace1a9229b4e3b506aee76aa94c0dd906a64fa2c817902c2cd3854df390cf675c8c6ddd3ba1926a467348b2103818bd44bc095378cc7bf3f2ff7af27188
 EBUILD pingus-0.7.6-r3.ebuild 1283 BLAKE2B 00c962037144ae945a566f7c0f7f9beee6b17c3b05740aa0415c404700e8c0ae9a34226c9c870a24c437b9d1203d5b95019373919db1f08788a57fc27b9453d7 SHA512 80926aeb99b05783497a2e1db5f30a7e4302eddcf53e8072ee55da144694146df47c2c683e7067d2b9a66c8860f368e07ed2975f953246fb654364fa25493a7b
-EBUILD pingus-9999.ebuild 924 BLAKE2B c5ccb474cf9f56d636605c9826e0285519734ab0af9e0c3893de762f15ed5ae3495449e2ccf70e2e9f3540b0c95a0dce7552c7b92de8806cdbd6d96a4a6b0c54 SHA512 2d405c9c64afd9e3a0e2ff7bea2b84505bd4eb3bf2855f2203bf804b3637c0e79c2b0f6022aff1b985c6ace37fe5515d2168c0caa7c880397594dd66c8bca436
+EBUILD pingus-9999.ebuild 908 BLAKE2B 4b46851176ab8ecfd078d3d52401c3f5ac8c17f0ef5afe0f6b74daa590dc675c3d7d4b29b8712b4a9fb6a92403486c08d3c9c47f43f89b815c0160429161c4fd SHA512 baf30d488bfd4da6a6b7623b7ece35cbd9d9084730719e35623248762787d5233cdd2d23dcdd9bd8504c06bc5c1153aa2cb8227c9f9c1e99da48092be2c23d94
 MISC metadata.xml 1283 BLAKE2B 971b7c831e81413f71e70c7f66ef01b493296d33ff6bbb2997690b60c10eb1a4ffa29c47f335bbd4c57c178e35aef3d59586bbe06199bc50df34501f56b3be2d SHA512 04c0f4cb00f8b50e5f589d6bfa48389fb7fb2ff0ac2343c625f98383ec41ea77d63dbdc14d12325f3837e4961c544503f1a76a4298fa061458a71b1e198c8219
diff --git a/games-puzzle/pingus/pingus-9999.ebuild b/games-puzzle/pingus/pingus-9999.ebuild
index a69c1c22fc72..b0083c14fd54 100644
--- a/games-puzzle/pingus/pingus-9999.ebuild
+++ b/games-puzzle/pingus/pingus-9999.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
-inherit cmake toolchain-funcs flag-o-matic xdg
+inherit cmake flag-o-matic xdg
 
 DESCRIPTION="free Lemmings clone"
 HOMEPAGE="https://pingus.gitlab.io/"
diff --git a/games-puzzle/pipepanic/Manifest b/games-puzzle/pipepanic/Manifest
index 422d4981cf64..39101c9b2670 100644
--- a/games-puzzle/pipepanic/Manifest
+++ b/games-puzzle/pipepanic/Manifest
@@ -1,4 +1,4 @@
 AUX pipepanic-0.1.3-gentoo.patch 584 BLAKE2B 7a785fc5494f71c14d2298caa87168a52d695e3b5c450c6f1395b9dee8f911fd35e28d23db4c14b252e337b203727647a48c4113b0b6349289a7044ed3c4145f SHA512 0fef3b79063bcae38412679ce5644d8d119ba3a86b8a752234d97b7009044373f6cda8e983b53864f266e5c00203fb278c61fa44af432014b1aba5a402d41bab
 DIST pipepanic-0.1.3-source.tar.gz 232200 BLAKE2B 25a344d0a78196d8416d7da663e4400acfe010b6020c3b64764c1dcf6f07d7a434add6d5c2c607a17ca356eb67fb0c8572d72410ea8ca5df915f9802792400d9 SHA512 468f3194976c7030c2fa3d8f30eaa13cc25e0b04feeb48a5d1267d119eb991618bad14ddba0a8268e6b92f38f2a17bc5b119728b222b0ee50494807832ad2ab7
-EBUILD pipepanic-0.1.3-r1.ebuild 869 BLAKE2B 8b4700bf2865b09dcf6f865e8cafdb5c5af4143bc986743c995042ed4b7d8f6e2e19eeb947911ef2aa557f3541656421e00aa7b8b303e7959c4c77b1eec2f5a5 SHA512 f1e1fb22f5c701a5e0a488c3610ec44f5ff540eb4e5f75d83b8b227add221b1986bcf15f2754ac430cd6045690edb958974ab12bbc94121965bab04c924543ce
+EBUILD pipepanic-0.1.3-r2.ebuild 853 BLAKE2B d2370d617befc56d698506536ad0672a9befdd11c19fe74cb16760a8e086d736509e52570d6ede19aa70f62117729afe4fed4b8670631300a9c1c1cebba0b84f SHA512 2e2aca8b11bbd35ffe58eebbb2c72c9ea79642543a07945c006612dbacb3b611d1b2cf978bd6fe00a752502f628b07f8405f0f4cc787d88e22ead211453465b4
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/pipepanic/pipepanic-0.1.3-r1.ebuild b/games-puzzle/pipepanic/pipepanic-0.1.3-r2.ebuild
index bc849e724279..126465820912 100644
--- a/games-puzzle/pipepanic/pipepanic-0.1.3-r1.ebuild
+++ b/games-puzzle/pipepanic/pipepanic-0.1.3-r2.ebuild
@@ -1,22 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit desktop
 
 DESCRIPTION="A simple pipe connecting game"
 HOMEPAGE="http://www.users.waitrose.com/~thunor/pipepanic/"
 SRC_URI="http://www.users.waitrose.com/~thunor/pipepanic/dload/${P}-source.tar.gz"
+S="${WORKDIR}"/${P}-source
 
 LICENSE="GPL-2 FreeArt"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="media-libs/libsdl[video]"
-RDEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}-source"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	default
@@ -29,9 +28,9 @@ src_prepare() {
 }
 
 src_install() {
-	dobin "${PN}"
+	dobin ${PN}
 
-	insinto "/usr/share/${PN}"
+	insinto /usr/share/${PN}
 	doins *.bmp
 	newicon PipepanicIcon64.png ${PN}.png
 	make_desktop_entry ${PN} "Pipepanic"
diff --git a/games-puzzle/quadrapassel/Manifest b/games-puzzle/quadrapassel/Manifest
index 725e5f86aa9e..0a60c8131ab2 100644
--- a/games-puzzle/quadrapassel/Manifest
+++ b/games-puzzle/quadrapassel/Manifest
@@ -1,3 +1,5 @@
 DIST quadrapassel-3.36.05.tar.xz 309160 BLAKE2B a9db4572a128ae0b965f29f83206dfa272ec6e5ad6316b0b0135d7424fdf6ea96c8ed602b4c6908b9ef7185c7821a658982398ea7a003de3c9714cbbb129fe59 SHA512 4219129a65d604e11cb1ef6ba38926311e7f32fb5bfebfc723236277fe0b779c5f1ddfca27db43f40d059291e2a4f9ff2552de6332002cb11b965136a946340e
+DIST quadrapassel-3.38.1.tar.xz 332316 BLAKE2B 5d1a1cb2c53653739e06818dd0ac1570b3a8f66ac4172ecec2e62e0afaa4054c604448c847600301dfd843d7d30c299691ca70b8568cf17921505ac16a5ba510 SHA512 4514b2ba0e53b5c9b6ce32fed850cdeac4d2fe9f848f87af61d51da18a94ff54da8c7126bd4df837452ba967dccf4dcd61c41c59402f1f0b76e2e19253bde8eb
 EBUILD quadrapassel-3.36.05.ebuild 953 BLAKE2B 76fca33db0bb3c34b0b9c2d8a3e2fed8f0510dd312d08987f38a52eb3c6bb10067f40409cf641fc4798499eb42f30aad0db3a5f26beb69f6f6a428a5006da3bb SHA512 eb3edd31e93aca93b74488371dcbe3900ce17f71421c6e221ee3dc0108edb76bfa41b06211e585de67d4e02e9e95209dd0172aa4e3a68d8588893da9c454e217
+EBUILD quadrapassel-3.38.1.ebuild 955 BLAKE2B d26d5582886e83f41a10b32233edc90cc7a13b36964b604ab3265a130842f5c320b5080457d67c7f951d68c4956b2fda3a7a2c7a1c5a26129cb686ea71f8df3d SHA512 450bf8e8a983fcbcba17d5f08c11d1dd91ad062065093ae67039888751287a48e858f70ecaa4b3dcad3791ad8cf3fb13cd7c6e7e052f4b7d3768eac0f563d14b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/quadrapassel/quadrapassel-3.38.1.ebuild b/games-puzzle/quadrapassel/quadrapassel-3.38.1.ebuild
new file mode 100644
index 000000000000..40282e16218e
--- /dev/null
+++ b/games-puzzle/quadrapassel/quadrapassel-3.38.1.ebuild
@@ -0,0 +1,50 @@
+# 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/seatris/Manifest b/games-puzzle/seatris/Manifest
index 740b8ac30545..5d5cc5a6186f 100644
--- a/games-puzzle/seatris/Manifest
+++ b/games-puzzle/seatris/Manifest
@@ -1,4 +1,4 @@
 AUX seatris-0.0.14-as-needed.patch 215 BLAKE2B 3d2ea91214f6f00ec767aa00bfce6c77c7a42132a94f0e394d0a7f89c1eeaa3ff9d8638cce1321f6fb97bec614fbdb0f07fcbc68a2cd65fbd48373887aaa5846 SHA512 587f8f4f555b6a97d38a0c7bb8069674e6612ff5e3027b7c7327a02178aabdc20a6d32f63b7a667eac31480e435f575844afdd79523707d0fcf586417d8fd38b
 DIST seatris-0.0.14.tar.gz 53056 BLAKE2B 8efbc4531f98f06857815c86e2833ede03de3206bfc89efe387e2b388252c05d11b404e4a72fe6b33f215908cf03bc5687c627fa61943cb549c59bfb82455939 SHA512 105722ddbeaa8ae3863331126cf816e7d590ebe4ca244b32d3275071c2537c2865183a90f60f8dbf46cfacbcee4e811b653ff9cc6d2eae51c9ed6efa9263fac2
-EBUILD seatris-0.0.14.ebuild 912 BLAKE2B 8d64cfe1eaf2152baacfefaef54a78d3eb09f2b20ca92bc794d1a30671e4122ba85c9016797adc4ebd855ec6c175ea125d7c603a4b31c0aeafaf42cfcef699bf SHA512 0662065d8e7ba815074e0609078833aaa549f6a6e1370cced0bad5cf4604bdc54aae9ea0627c3db4d2e3bd91106716badbce6e786cec62c02d5551c90b60ebd7
+EBUILD seatris-0.0.14-r1.ebuild 1035 BLAKE2B 46798ab77c0e9e2e95dea9e0230676d6fbd8374986884741d5af0eb2bd9cd6c2f1ec7b2d2d493777dcd3b0471b175a2588858620d0dd368eb56765211c4b634b SHA512 5e23a56a154a3202fab51cb8a8a1c4c9c9306d854fb8677c13385efe1cb7c2393a2101a11ab98d9eb52b20d62979dcdaf662d22c20fd563ad0e24fc3a0b9aff5
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/seatris/seatris-0.0.14.ebuild b/games-puzzle/seatris/seatris-0.0.14-r1.ebuild
index d13a963fa7c4..6669683f0a9d 100644
--- a/games-puzzle/seatris/seatris-0.0.14.ebuild
+++ b/games-puzzle/seatris/seatris-0.0.14-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs games
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="A color ncurses tetris clone"
 HOMEPAGE="http://www.earth.li/projectpurple/progs/seatris.html"
@@ -12,16 +13,28 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 
-RDEPEND="sys-libs/ncurses"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
+DEPEND="sys-libs/ncurses:="
+RDEPEND="
+	${DEPEND}
+	acct-group/gamestat
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-as-needed.patch
+)
 
 src_prepare() {
+	default
+
 	sed -i \
-		-e "s:/var/lib/games:${GAMES_STATEDIR}:" \
+		-e "s:/var/lib/games:/var/lib/${PN}:" \
 		scoring.h seatris.6 || die
+}
 
-	epatch "${FILESDIR}"/${P}-as-needed.patch
+src_configure() {
+	tc-export CC
+	econf
 }
 
 src_compile() {
@@ -29,11 +42,15 @@ src_compile() {
 }
 
 src_install() {
-	dogamesbin seatris
+	dobin seatris
+
 	doman seatris.6
 	dodoc ACKNOWLEDGEMENTS HISTORY README TODO example.seatrisrc
-	dodir "${GAMES_STATEDIR}"
-	touch "${D}${GAMES_STATEDIR}/seatris.score"
-	fperms 660 "${GAMES_STATEDIR}/seatris.score"
-	prepgamesdirs
+
+	dodir /var/lib/${PN}
+	touch "${ED}"/var/lib/${PN}/seatris.score || die
+	fperms 660 /var/lib/${PN}/seatris.score
+
+	fowners -R root:gamestat /var/lib/${PN}
+	fperms g+s /usr/bin/${PN}
 }
diff --git a/games-puzzle/splice/Manifest b/games-puzzle/splice/Manifest
index 20f6ee0142a1..32a360002edf 100644
--- a/games-puzzle/splice/Manifest
+++ b/games-puzzle/splice/Manifest
@@ -1,3 +1,3 @@
 DIST splice-linux-1353389454.tar.gz 305838859 BLAKE2B ef8c6ae70b48f6c1860e3d6591876063abea77fe0f9a7597f91e32295bee8e517fed1bf6fa3fa5e491ea11e8da7faffa26ad9d9329d960269e29dda7adf8a14d SHA512 67a83a30bdb8ff0eecf9097bb4615053fcdb073daada4a24b61ae239ed56b7d2192247e80989c67554dcfcc1069c2105a6083f9fafffa4bbd66bbf29edad6a44
-EBUILD splice-20121120.ebuild 1305 BLAKE2B 06964a2d0e4bd19bf8d929338bb2c1872abe7c26b697fbfd70780130a43579cd2c7a2713fd12f905d79aefcbb823aa34337b25b687ad2f731a6f61977853314d SHA512 39d586c843086d28e382d5baa65056b6b1b49bf90f1f9af1e39443c05f721a1aaf89e3d8caab7e37bc2c6fc6c08461df6543024e1dd99d69ce76eaf21b76aac3
+EBUILD splice-20121120-r1.ebuild 1273 BLAKE2B 033e4fbfe1e329c9e63fd596a7e7f8a501c046ee9bb7b62ecaf4916d6bd90223c0a14c8fedb1b6a6093bf2991c9542bbef59418f9f30f08d83234ab081b4d762 SHA512 e481a2c2469a1d40259f1b65f7a8ab5af7dd883b6d4abb0cc956c52e946d83ec66c85ba2c18fde3632d7c5b125a37173b4d00039a9adf2b2d2fddcbab8e4ea35
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-puzzle/splice/splice-20121120.ebuild b/games-puzzle/splice/splice-20121120-r1.ebuild
index d9b15617e47f..2a420c4413f1 100644
--- a/games-puzzle/splice/splice-20121120.ebuild
+++ b/games-puzzle/splice/splice-20121120-r1.ebuild
@@ -1,27 +1,29 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# TODO: unbundle mono? (seems hardcoded)
-#       icon
+EAPI=7
 
-EAPI=5
-
-inherit eutils games
+inherit desktop wrapper
 
 DESCRIPTION="An experimental and artistic puzzler set in a microbial world"
 HOMEPAGE="http://www.cipherprime.com/games/splice/"
 SRC_URI="splice-linux-1353389454.tar.gz"
+S="${WORKDIR}"/Linux
 
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
+
 RESTRICT="bindist fetch splitdebug"
 
-MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${MYGAMEDIR#/}/Splice*
-	${MYGAMEDIR#/}/Splice_Data/Mono/*"
+MYGAMEDIR=opt/${PN}
+QA_PREBUILT="
+	${MYGAMEDIR#/}/Splice*
+	${MYGAMEDIR#/}/Splice_Data/Mono/*
+"
 
+# TODO: unbundle mono? (seems hardcoded)
+#       icon
 RDEPEND="
 	virtual/glu
 	virtual/opengl
@@ -29,8 +31,6 @@ RDEPEND="
 	x11-libs/libXcursor
 	x11-libs/libXext"
 
-S=${WORKDIR}/Linux
-
 pkg_nofetch() {
 	einfo "Please buy & download ${SRC_URI} from:"
 	einfo "  ${HOMEPAGE}"
@@ -38,7 +38,9 @@ pkg_nofetch() {
 }
 
 src_prepare() {
-	einfo "removing ${ARCH} unrelated files..."
+	default
+
+	einfo "Removing ${ARCH} unrelated files..."
 	rm -v Splice.x86$(usex amd64 "" "_64") || die
 	rm -rv Splice_Data/Mono/x86$(usex amd64 "" "_64") || die
 
@@ -49,12 +51,11 @@ src_prepare() {
 src_install() {
 	dodoc "${T}"/README
 
-	insinto "${MYGAMEDIR}"
+	insinto ${MYGAMEDIR}
 	doins -r *
 
 	make_desktop_entry ${PN}
-	games_make_wrapper ${PN} "./Splice.x86$(usex amd64 "_64" "")" "${MYGAMEDIR}"
+	make_wrapper ${PN} "./Splice.x86$(usex amd64 "_64" "")" "${MYGAMEDIR}"
 
-	fperms +x "${MYGAMEDIR}"/Splice.x86$(usex amd64 "_64" "")
-	prepgamesdirs
+	fperms +x ${MYGAMEDIR}/Splice.x86$(usex amd64 "_64" "")
 }
diff --git a/games-puzzle/swell-foop/Manifest b/games-puzzle/swell-foop/Manifest
index 61cca005e673..2ce6221b5549 100644
--- a/games-puzzle/swell-foop/Manifest
+++ b/games-puzzle/swell-foop/Manifest
@@ -1,3 +1,6 @@
+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
-EBUILD swell-foop-3.34.1.ebuild 806 BLAKE2B 06d62d325011ef75b857bc92cf0240bf14fcfd7203dc969458e2c472df31c1a4afe8296d73d97d73030141b1bac0de9918729fb9089999d706c1406008f72b72 SHA512 edb409ca716211e2646c19d6eca82f738161e1b264b5b8c1f8ae7d5614e345544a6a9ad29d53bbc7164d0070e741edfb456eadc84f4f62efa62837d5c6df1a0c
+DIST swell-foop-40.0.tar.xz 821796 BLAKE2B c831a3ed4fc2f53a85793f19dee2e481970784dca4b092db7f905123073b185608fbd8c0a4d8b0c2a74fc4f48e982c4d39b88132381b2a4155609398868825fd SHA512 018a51fdc0e54d9f011a90757fad9d568df33b33241cff9281a49306b8cc236e173e251e8b7ae769a8096f0c9893d496108e4183382ac2f116128fce99774a00
+EBUILD swell-foop-3.34.1.ebuild 861 BLAKE2B d20089e12c8fe6ecbe777dd4402bc48422be515e36799ce039f8c36affdc673960095e3b495e16487e2a8227ab04ecd5b929c81e59f3297c19637ead0fffabf4 SHA512 c26a7b69a1556a90233eae98a64435e29229be57db26628bceb9ac6800da076235e078b3a6d957961ca60fd80efbdf09d18371cea75aa2e048bb25b19cbdbdc0
+EBUILD swell-foop-40.0.ebuild 875 BLAKE2B 128392d94d1c55ef80de58f5a2f6ee522e3f51682f8f6b08af6713829b46e56dfe6ea8b811e35f1156aab92ee45cc069e9ef0bafe0e659821f1779ee365354f6 SHA512 db4f1a4508a72e1a16f7fb76be9b8c18b9c2748454a4c96867829724a43df025bd9d1cd1b549b09e3449f5714b350098646bae2db6f1b8cbada005b33d6f34eb
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/swell-foop/files/3.34.1-fix-vala-0.50.patch b/games-puzzle/swell-foop/files/3.34.1-fix-vala-0.50.patch
new file mode 100644
index 000000000000..ddc189ff54da
--- /dev/null
+++ b/games-puzzle/swell-foop/files/3.34.1-fix-vala-0.50.patch
@@ -0,0 +1,25 @@
+From a366bf649c032c56f52138d14e2b96b4a48525de Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Thu, 2 Jul 2020 15:28:02 +0200
+Subject: [PATCH] Don't use unsupported vala syntax
+
+---
+ src/game-view.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/game-view.vala b/src/game-view.vala
+index 1fb0c4b..69b50b8 100644
+--- a/src/game-view.vala
++++ b/src/game-view.vala
+@@ -451,7 +451,7 @@ private class Theme : Object
+     internal Theme (string name)
+     {
+         textures = new Clutter.Image [4];
+-        string[4] colors = {"blue", "green", "yellow", "red"};
++        string[] colors = {"blue", "green", "yellow", "red"};
+ 
+         /* Create the textures required to render */
+         try
+-- 
+2.26.3
+
diff --git a/games-puzzle/swell-foop/swell-foop-3.34.1.ebuild b/games-puzzle/swell-foop/swell-foop-3.34.1.ebuild
index 1073712ed558..d3d72fffdb64 100644
--- a/games-puzzle/swell-foop/swell-foop-3.34.1.ebuild
+++ b/games-puzzle/swell-foop/swell-foop-3.34.1.ebuild
@@ -27,6 +27,10 @@ BDEPEND="
 	$(vala_depend)
 "
 
+PATCHES=(
+	"${FILESDIR}"/3.34.1-fix-vala-0.50.patch
+)
+
 src_prepare() {
 	xdg_src_prepare
 	vala_src_prepare
diff --git a/games-puzzle/swell-foop/swell-foop-40.0.ebuild b/games-puzzle/swell-foop/swell-foop-40.0.ebuild
new file mode 100644
index 000000000000..763530ce1aca
--- /dev/null
+++ b/games-puzzle/swell-foop/swell-foop-40.0.ebuild
@@ -0,0 +1,44 @@
+# 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/tiny-and-big/Manifest b/games-puzzle/tiny-and-big/Manifest
index 0559bb517747..6e3782cbc0ce 100644
--- a/games-puzzle/tiny-and-big/Manifest
+++ b/games-puzzle/tiny-and-big/Manifest
@@ -1,3 +1,3 @@
 DIST tinyandbig_grandpasleftovers-retail-linux-1.4.1_1370968537.tar.bz2 1170058011 BLAKE2B 2c1845165408cca68fd791b2d6f91c49e1131c25c29a49ab8512e82cf0664d52fcb8526741693e045e3ea1560ace47ed3d8a8e51a4851d6ce57adce6f2bcd445 SHA512 3dbf6ebbe6047f5258f482e776809c6817df8d14cfc20014fb6e4a6accc3db3e93051270ce29371bc0ef56d380bd382dbf8eb75b592c3f0097ca3546d889193e
-EBUILD tiny-and-big-1.4.1.ebuild 1399 BLAKE2B b52e47b8cc5d60da40f31741b123a869cc0fdbff9cf784e7aa95fc78e167c973102362b1d53518b1cf06d2e4decb2a19219215171e1bd65ef89dc401c8a40904 SHA512 9bf6f8281672618581cb4f404f4d25a653e0236a5754ee3c550f16a9d9cdf841892f06a1332ad8f2ea27d937e409de6661b91e2dde331132554cfe197f7e56ad
+EBUILD tiny-and-big-1.4.1-r1.ebuild 1375 BLAKE2B 618b2908e89079db3751a3616045b3a1b9cb0fab6dbe032850b765bcbac76a4d89165d450fa5f9bcff640ae841511c7ea8b992b52243924fec36d716bd058b2f SHA512 9a37ef2ba2747ba922cfc3e5bd78a5240ec72adac6b6b1a2bd8c4ecefd3d67096b039d4839fc8b370d286a27eabce9974736a9867e26bc680507f3a984d934be
 MISC metadata.xml 355 BLAKE2B 2ebe0923f754bb09445457bb7f266a9fb673682281d31d70b39a05f1cd0beb682fa26e89861c46e9dab0f77428b916f9f99d8324b3780c795f317b6e06efde84 SHA512 78f8cc8f1f1be915da206e4b8be196a21b58a6f209023594755e481136a1b86ee31c8d0dfedd516d756a47db624e89728875b073b71c3b08ac94a5cde8ff3b83
diff --git a/games-puzzle/tiny-and-big/tiny-and-big-1.4.1.ebuild b/games-puzzle/tiny-and-big/tiny-and-big-1.4.1-r1.ebuild
index d8b650922b2f..e0c90bcce700 100644
--- a/games-puzzle/tiny-and-big/tiny-and-big-1.4.1.ebuild
+++ b/games-puzzle/tiny-and-big/tiny-and-big-1.4.1-r1.ebuild
@@ -1,36 +1,36 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# TODO: unbundle media-libs/cal3d, lib hacked or old version
-
-EAPI=5
+EAPI=7
 
-inherit eutils games
+inherit desktop wrapper
 
 DESCRIPTION="Combines elements of adventure, jump&run and physical puzzles"
 HOMEPAGE="http://www.tinyandbig.com/"
 SRC_URI="tinyandbig_grandpasleftovers-retail-linux-${PV}_1370968537.tar.bz2"
+S="${WORKDIR}"/tinyandbig
 
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="bundled-libs"
+
 RESTRICT="bindist fetch bundled-libs? ( splitdebug )"
 
-MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
+MYGAMEDIR=opt/${PN}
 QA_PREBUILT="${MYGAMEDIR#/}/bin32/*
 	${MYGAMEDIR#/}/bin64/*"
 
-DEPEND="app-arch/bzip2"
+# TODO: unbundle media-libs/cal3d, lib hacked or old version
 RDEPEND="
-	virtual/opengl
 	media-libs/openal
+	virtual/opengl
 	x11-libs/libX11
 	!bundled-libs? (
 		media-gfx/nvidia-cg-toolkit
-	)"
-
-S=${WORKDIR}/tinyandbig
+	)
+"
+BDEPEND="app-arch/bzip2"
 
 pkg_nofetch() {
 	einfo "Please buy & download ${SRC_URI} from:"
@@ -40,7 +40,9 @@ pkg_nofetch() {
 }
 
 src_prepare() {
-	if use !bundled-libs ; then
+	default
+
+	if ! use bundled-libs ; then
 		rm -v $(usex amd64 "bin64" "bin32")/libCg{,GL}.so || die "unbundling libs failed!"
 	fi
 }
@@ -48,13 +50,12 @@ src_prepare() {
 src_install() {
 	local bindir=$(usex amd64 "bin64" "bin32")
 
-	insinto "${MYGAMEDIR}"
+	insinto ${MYGAMEDIR}
 	doins -r assets ${bindir}
 
-	games_make_wrapper ${PN} "./${bindir}/tinyandbig" "${MYGAMEDIR}" "${MYGAMEDIR}/${bindir}"
+	make_wrapper ${PN} "./${bindir}/tinyandbig" "${MYGAMEDIR}" "${MYGAMEDIR}/${bindir}"
 	make_desktop_entry ${PN} "Tiny & Big"
 	dodoc readme.txt
 
-	fperms +x "${MYGAMEDIR}"/${bindir}/tinyandbig
-	prepgamesdirs
+	fperms +x ${MYGAMEDIR}/${bindir}/tinyandbig
 }
diff --git a/games-puzzle/triptych/Manifest b/games-puzzle/triptych/Manifest
index 2a024318197c..ca6c9c7a3ffe 100644
--- a/games-puzzle/triptych/Manifest
+++ b/games-puzzle/triptych/Manifest
@@ -1,3 +1,3 @@
 DIST triptych-1.16.tar.gz 1748316 BLAKE2B 0d66265df27f61ddee1e1777a1e749d3a8bbcebf0e2bfe64a054febb48def865b68ab59d9c25804ed725bb11d24af2bbd712cc2de88a7259db26aa6d7c3c8d1f SHA512 614de78c9f90dd2145ff3dfa6f7a799a069c5add80bc8b0494a752346a163ab0eff7b707292b815adbffa34e4fec446035cfb65df4dd6cf284f270bb732b6daa
-EBUILD triptych-1.16.ebuild 1296 BLAKE2B 61a860b46d4c22678e742d54ae58dea6a533451fc29a6a487306b8ac74569115741eb6f36c05ad5984f3283afa3eec1fca321a62223ff4f19a298652ecf61970 SHA512 11e0b96b480652f56786c9a0c412ab181043413b617e7b82729d33d1c7373d8444c7f194b1770d98f9d81c32368f5d3169fb1efd35a8d8d9d9622e784800af81
+EBUILD triptych-1.16.ebuild 1289 BLAKE2B 680dddd58e931bb6e996d5e85ea782a7dfb003b267053c2f03b618ae277df75eb726f18d80d60ee34cc64f077744af36342ce2284910bda4c68aee1a5bcb874a SHA512 2e1983637c82be05c03e7bfe8d193ff9607bce141e9907839decae438d1705ce3323744443f327340d58a63ef4818887571b090b5782ef71ef980cacf50a26c3
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/triptych/triptych-1.16.ebuild b/games-puzzle/triptych/triptych-1.16.ebuild
index c6c262733c4e..a142a6c3e78c 100644
--- a/games-puzzle/triptych/triptych-1.16.ebuild
+++ b/games-puzzle/triptych/triptych-1.16.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop eutils
+inherit wrapper
 
 DESCRIPTION="Fast-paced Tetris-like puzzler"
 HOMEPAGE="http://www.chroniclogic.com/triptych.htm"
diff --git a/games-puzzle/world-of-goo-demo/Manifest b/games-puzzle/world-of-goo-demo/Manifest
index 10bc5a2da646..0349d87c85e2 100644
--- a/games-puzzle/world-of-goo-demo/Manifest
+++ b/games-puzzle/world-of-goo-demo/Manifest
@@ -1,3 +1,3 @@
 DIST WorldOfGooDemo.1.41.tar.gz 34729052 BLAKE2B 02700d337d3aa1daa436bd418131c7c01565244aab303eb239b59b0e437f1e40441b1879de48ade44e6b1c0842c043b4ef40e07809539db9fcacb37204c2092c SHA512 5dcaf7cdacedf0df92133284c4781e1d4ad14abbeddd623a35e59129fc5c1cbb3782d570ac83bc6201f3212c15195e5ca637400839e87fe95edddc5ca671077a
-EBUILD world-of-goo-demo-1.41-r3.ebuild 1122 BLAKE2B ef99f0c07f4749a990b01a668817ad8373bed69239390a86fc272bf9f308a958663b64ee09e7f9401e074766fef459a4662175b3b206b3f90c5985fd4f29e31f SHA512 046298561c781e2e3a6399bacf29177dec33bdc210bea3f508ce07b8d9344da121775f769cce874464dae9e8f11e6c9e17e492741c662558181371617a3da6d0
+EBUILD world-of-goo-demo-1.41-r3.ebuild 1121 BLAKE2B f493e5aeff3771d7a4b7cf5658413a4768f806dafcc21a14babd3e9dd32ec52e7592de7283d35e0883949323d7940a962b36b829f880f4ba46cc92903aecfaa0 SHA512 3fc6db7d63dc73df356d888273a7904741f0ce644986b1ab85170630e7ddda533e8feecff84de79b2d899aa881bf7d9b2920f976dad8ef91169e47e07c0019f0
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r3.ebuild b/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r3.ebuild
index c25a8830d831..03a87c6dd39c 100644
--- a/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r3.ebuild
+++ b/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop eutils xdg
+inherit desktop wrapper xdg
 
 MY_PN="WorldOfGooDemo"
 
-DESCRIPTION="A puzzle game with a strong emphasis on physics (demo version)"
+DESCRIPTION="Puzzle game with a strong emphasis on physics (demo version)"
 HOMEPAGE="https://2dboy.com/"
 SRC_URI="mirror://sourceforge/slackbuildsdirectlinks/worldofgoo/${MY_PN}.${PV}.tar.gz"
 
diff --git a/games-puzzle/xbomb/Manifest b/games-puzzle/xbomb/Manifest
index bc88916ffec3..6c0fb2120767 100644
--- a/games-puzzle/xbomb/Manifest
+++ b/games-puzzle/xbomb/Manifest
@@ -1,5 +1,5 @@
-AUX xbomb-2.2b-DESTDIR.patch 871 BLAKE2B 4a6841b33ce4cbfdf17507d8fe5001d82fa4de026693eb898b915c22b9779bf83e279a3add9fdba67ae8614cd42df5fc81f686016437184e7d529290fd2ce2fd SHA512 98135eb5927b4bd92bc1a6ac6fb86bf8c1f7387949c1ac419e3f78cc84184e1c8b2b8b6fb5d23089b6fdd8a7a8dca05733821180d1316d30edc53f487a16e4c8
-AUX xbomb-2.2b-ldflags.patch 177 BLAKE2B 2b22fe367177a8551fc692e97de539be366da981c79f31646bfc8dc5cf98bafdc916d9d89af3e44773e1a4c54bb35700cee1d093dee0233a639a6a6c4849b814 SHA512 21c7d9c57ec972ae49dd20a94041378a53dcd310685c8c3755571243d51b0b0e1664b30c0ce9013ad289d8589e7e219bafdcbcc31503ccc25052f2c3dbc2df82
+AUX xbomb-2.2b-DESTDIR.patch 706 BLAKE2B 257023ee9127df592b81c7e4cb24b2004cd1522f89766ac8a6ee094889567278f59b2c17faca7f00954fb5021762ebdd593fb0e253f54c2b83546e4b5f83c0e8 SHA512 be770c9dd42e7c802af60ebe019b359d12b74397956d32881504b20f8ad44994a3cf1dcd3e23fcf65642cbee1aa622ba2fff63ec223fce9faaef0c03ed4b1914
+AUX xbomb-2.2b-ldflags.patch 177 BLAKE2B b43eab3cf0fdbabce44b2ec6c2f47db947cb857e46620a4d4b5d2d30da07a0ee169e54403854f54a755e7569d37d9a43948ebf6bdb35611a0cbc8f415d2507dc SHA512 047f410f34505d4582969f071eb1982fd3bb38357ad228e61608ca9307118263f34d6a1b43832877ca2862e107018132bad3bf6e3df79b641d5466efb94a6d8c
 DIST xbomb-2.2b.tgz 24774 BLAKE2B 77a447af42ecd47654b826d884e7c31e98e0bdfb06d1574401064fe79dc42c961fc95a96dd6509871d78589e06eb54f975a292a5371c16520e125b75aae8b637 SHA512 7315cc08bff1ef14cc376ea3ad4913c4286e2e33e92ca1d924e4703fba2f58e5aa9df0db760cd0d9a83f2f1730cc65281403f5b198f32a30d0c5e736add8c2e1
-EBUILD xbomb-2.2b.ebuild 1001 BLAKE2B 0d0a6b3342161c22217f9cf868f8854002aa13bf7666f2e78b45ea02908a4cf6fe03b5594d303f0b9a8667045e2bffdf3447649032ee0afe08bb1278af44d15c SHA512 05d114f256b1a641714848d96df47faeaa64396e670a95d376ca32eea4b0c2f59d6246454a23bf301aa010938bde8af758fe3c90a3f6b2ee4a354bd72fe65e6a
+EBUILD xbomb-2.2b-r1.ebuild 1052 BLAKE2B 27f4468551b7bba3af241bfcef1197a10bc9df2690c299403c0e135b6b08ecb59219f2249e23d47e4ca2ceb75430461cc78d4a2ce1cd3aa55d8d7b4b5659068f SHA512 5a2386b5107289a488972561ab5908b33a39e851e21b1b7db927528d6c79f26d7b0fdbae7da35e681ef8ded2e846ac8cfbd19d2456c6d5cae56981a8a3e1b5a7
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/xbomb/files/xbomb-2.2b-DESTDIR.patch b/games-puzzle/xbomb/files/xbomb-2.2b-DESTDIR.patch
index 2ee8edd4ec91..6f45b4c82fa2 100644
--- a/games-puzzle/xbomb/files/xbomb-2.2b-DESTDIR.patch
+++ b/games-puzzle/xbomb/files/xbomb-2.2b-DESTDIR.patch
@@ -1,34 +1,27 @@
-*** xbomb-2.1/Makefile	1996-01-20 16:02:46.000000000 -0500
---- xbomb-2.1.new/Makefile
-***************
-*** 27,34 ****
-  
-  OBJ=xbomb.o xwindow.o hiscore.o
-  
-- INSTDIR=/usr/local
-- 
-  ########
-  
-  xbomb : $(OBJ)
---- 27,32 ----
-***************
-*** 52,60 ****
-  
-  install :
-  	strip xbomb
-! 	install -d $(INSTDIR)/bin
-! 	install -d $(INSTDIR)/man/man6
-! 	install -d $(INSTDIR)/lib/app-defaults
-! 	install -m 755 xbomb $(INSTDIR)/bin
-! 	install -m 644 xbomb.6 $(INSTDIR)/man/man6
-! 	install -m 644 xbomb.ad $(INSTDIR)/lib/app-defaults/XBomb
---- 50,58 ----
-  
-  install :
-  	strip xbomb
-! 	install -d $(DESTDIR)/usr/bin
-! 	install -d $(DESTDIR)/usr/share/man/man6
-! 	install -d $(DESTDIR)/etc/X11/app-defaults
-! 	install -m 755 xbomb $(DESTDIR)/usr/bin
-! 	install -m 644 xbomb.6 $(DESTDIR)/usr/share/man/man6
-! 	install -m 644 xbomb.ad $(DESTDIR)/etc/X11/app-defaults/XBomb
+--- a/Makefile
++++ b/Makefile
+@@ -27,8 +27,6 @@
+ 
+ OBJ=xbomb.o xwindow.o hiscore.o
+ 
+-INSTDIR=/usr/local
+-
+ ########
+ 
+ xbomb : $(OBJ)
+@@ -52,9 +50,9 @@
+ 
+ install :
+ 	strip xbomb
+-	install -d $(INSTDIR)/bin
+-	install -d $(INSTDIR)/man/man6
+-	install -d $(INSTDIR)/lib/app-defaults
+-	install -m 755 xbomb $(INSTDIR)/bin
+-	install -m 644 xbomb.6 $(INSTDIR)/man/man6
+-	install -m 644 xbomb.ad $(INSTDIR)/lib/app-defaults/XBomb
++	install -d $(DESTDIR)/usr/bin
++	install -d $(DESTDIR)/usr/share/man/man6
++	install -d $(DESTDIR)/etc/X11/app-defaults
++	install -m 755 xbomb $(DESTDIR)/usr/bin
++	install -m 644 xbomb.6 $(DESTDIR)/usr/share/man/man6
++	install -m 644 xbomb.ad $(DESTDIR)/etc/X11/app-defaults/XBomb
diff --git a/games-puzzle/xbomb/files/xbomb-2.2b-ldflags.patch b/games-puzzle/xbomb/files/xbomb-2.2b-ldflags.patch
index a320b0900c53..9f1f524b33cf 100644
--- a/games-puzzle/xbomb/files/xbomb-2.2b-ldflags.patch
+++ b/games-puzzle/xbomb/files/xbomb-2.2b-ldflags.patch
@@ -1,5 +1,5 @@
---- Makefile.old
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -30,7 +30,7 @@
  ########
  
diff --git a/games-puzzle/xbomb/xbomb-2.2b.ebuild b/games-puzzle/xbomb/xbomb-2.2b-r1.ebuild
index 488c4de4bd50..d717dc1dcef8 100644
--- a/games-puzzle/xbomb/xbomb-2.2b.ebuild
+++ b/games-puzzle/xbomb/xbomb-2.2b-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=7
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Minesweeper clone with hexagonal, rectangular and triangular grid"
 HOMEPAGE="http://www.gedanken.org.uk/software/xbomb/"
@@ -11,30 +12,44 @@ SRC_URI="http://www.gedanken.org.uk/software/xbomb/download/${P}.tgz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
 
 DEPEND="x11-libs/libXaw"
-RDEPEND=${DEPEND}
+RDEPEND="
+	${DEPEND}
+	acct-group/gamestat
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-DESTDIR.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-DESTDIR.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
+	default
+
 	sed -i \
 		-e '/strip/d' \
 		-e '/^CC=/d' \
 		-e "/^CFLAGS/ { s:=.*:=${CFLAGS}: }" \
-		-e "s:/usr/bin:${GAMES_BINDIR}:" \
 		Makefile || die
 	sed -i \
-		-e "s:/var/tmp:${GAMES_STATEDIR}/${PN}:g" \
+		-e "s:/var/tmp:/var/lib/${PN}:g" \
 		hiscore.c || die
 }
 
+src_configure() {
+	tc-export CC
+}
+
 src_install() {
 	default
-	dodir "${GAMES_STATEDIR}"/${PN}
-	touch "${D}/${GAMES_STATEDIR}"/${PN}/${PN}{3,4,6}.hi || die "touch failed"
-	fperms 660 "${GAMES_STATEDIR}"/${PN}/${PN}{3,4,6}.hi
+
+	dodir /var/lib/${PN}
+	touch "${ED}"/var/lib/${PN}/${PN}{3,4,6}.hi || die "touch failed"
+	fperms 660 /var/lib/${PN}/${PN}{3,4,6}.hi
+
+	fowners root:gamestat /var/lib/${PN}
+	fperms g+s /usr/bin/${PN}
+
 	make_desktop_entry xbomb XBomb
-	prepgamesdirs
 }
diff --git a/games-puzzle/xlogical/Manifest b/games-puzzle/xlogical/Manifest
index fdf7fe03ce5a..dbc9cc26265d 100644
--- a/games-puzzle/xlogical/Manifest
+++ b/games-puzzle/xlogical/Manifest
@@ -1,6 +1,6 @@
-AUX xlogical-1.0.7-gcc41.patch 1121 BLAKE2B 6e1f94c128cfc771deca86da18eb924e11b611e54c4150ed39cb53aeda46257de21ff6bdfd9d1688dd6aa559900089d457107ea78eb347466792c353aacbb602 SHA512 eb98b351ae14f9c3f4f5783ef48633957c21ddb3debd7ba00e9c651be395cb11a30b6109bd26fef12845111ff320c71ef2b43bee6ec1b8748ac6ac34dd8cb87b
-AUX xlogical-1.0.7-gcc43.patch 915 BLAKE2B c99de173bbd18bec630a8c3605ad77a6d56d3e4a4bb44fab011bb6f10a6140a4d843c7768557728deddb1edddbc6abc66445f1797bf8ca5d6b108f29598374ad SHA512 59cc10ec999aff4c8f5630e534ea834ff9a8b2d27e45752abdc46df812841e40de27ca406a45278f28a3a609c021c7753a6980edfaffd3c79b1bb7cf97336209
+AUX xlogical-1.0.7-gcc41.patch 833 BLAKE2B 6a43b04affe9cc4cd9456d52b369636b68276e86a31644edec85aefb2771d6fed90108da86f2f9759329c77a53e2176979fad353c929ad7f99e30bfa5ba10f27 SHA512 aeb239382a019a7fd186030543231c29b260af3faeeda67da72a56b8a778ba5f70b16b6e1dbd3c04c1251816b91aae9c23d39dc877fd63e7ae7032431c02533d
+AUX xlogical-1.0.7-gcc43.patch 935 BLAKE2B cea7455abc9c6c953c179984b43b124157320c7dc3e5b891940811bc5b3732acb592b914e64bedb2a93f8bce73f381cfecd8eb927bf2b88d18ea2dc698085fa2 SHA512 4a1c4e259cc798a5debe917ea4981f36f04d073ce33ed317008318a891fa5d68938e4b63e8c3166f31132251f2ed2696e46eb0799afbd808eace68c2895c0f96
 DIST xlogical-1.0-7.tar.bz2 1853575 BLAKE2B 6f78f92a14313cf65f171b99c28a4377f7685bf73705a91b92fcf370ad1f3555b7aefe99e6004aa32c62cf8b71f2d754d64acadf3bda345cc8cf3e3f91647d02 SHA512 b47aadff91a7d3057fe8657bdda5c16a910f84f6d324bee82f1beba55de7faf6a599231c8d53ed68cc30f9edfe18f57f31dfc9fe06b8e03fa6120905f37c290d
 DIST xlogical_gfx.zip 347801 BLAKE2B b9c2f963e8ddc5af9fcd7adac691a71c6ee12bc3b3164ce243d076f85c36044b4aa523d27c5dd1480388ff97356ddabd3c7f2c4d223aeeff1a8660fc7c595995 SHA512 14322ae1c8fb7f50513ef47e05372c5dc1ec1b658b33c53477e6b05bbee1de0250b21127891f205d16adc386e7ce37c4b834a62794ee105754b97e49eb5d2a42
-EBUILD xlogical-1.0.7.ebuild 1457 BLAKE2B 4f75e49392f776a0ca3ce61afcb297b691b75c3c0710b383400a89ea9b5097c5f0a50a1a05e2af5fc1596feae04579d40bfd261c1c414a1d0438c6ebd34246e4 SHA512 111648c8337edf96cfa5331185d2d48f7ba06ce28bdaca43a62f2c4fc5d81c14c326d9dee2b35393ed46a0a508d367738293b6d7542160694c18c868f68f1205
+EBUILD xlogical-1.0.7-r1.ebuild 1644 BLAKE2B 8e43a6cea8ade6ade4ee77a612e9df5c88856e69a4861833dad50ce9c1c3f0283841be9e3a83b711101aed79c2ed17805f9cb1d0561f572105dee460767cf6f5 SHA512 9b9e27d903513c632542dd5dffd8bfc416ea319688999b7f47a8a571be7363e375737b79cdcd618bcaca1c46a9c247c4b1b898632b28b499f2c3d312880b030e
 MISC metadata.xml 554 BLAKE2B f7cc61f4cc79271b95e37334918f71934f91954f5a70d1601e817f6f134cd36117ed155b91a7929da537fcb7d423a627c1990c3c57f92a60fcbd6b3668329b8a SHA512 538cff1d408baf95b2d172490a3a038a8fd79edef5b8c1b64e3c495307b632870548dc0f33b6ed6bc77599d20e883a73a2c2d658b6ca85e131e404bc72e018ee
diff --git a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch
index 19cd188b0e0e..5c77527dc598 100644
--- a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch
+++ b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch
@@ -1,5 +1,5 @@
---- properties.h.old	2007-01-11 17:33:45.000000000 +0100
-+++ properties.h	2007-01-11 17:34:32.000000000 +0100
+--- a/properties.h
++++ b/properties.h
 @@ -33,9 +33,7 @@
  #include <map>
  #include <string>
@@ -10,8 +10,8 @@
  
  #include "defs.h"
  
---- anim.h.old	2007-01-11 17:36:20.000000000 +0100
-+++ anim.h	2007-01-11 17:36:37.000000000 +0100
+--- a/anim.h
++++ b/anim.h
 @@ -27,9 +27,7 @@
  // Language Includes
  #include <list>
@@ -22,8 +22,8 @@
  
  // Application Includes
  #include "graph.h"
---- exception.h.old	2007-01-11 17:37:37.000000000 +0100
-+++ exception.h	2007-01-11 17:38:21.000000000 +0100
+--- a/exception.h
++++ b/exception.h
 @@ -27,10 +27,9 @@
  
  // Language Includes
@@ -36,8 +36,8 @@
  
  #define CatchEx(aEx)		catch( CXLException aEx )
  #define ThrowEx(aError)		throw CXLException(aError,__FILE__,__LINE__)
---- gamelogic.cpp.old	2007-01-11 17:38:52.000000000 +0100
-+++ gamelogic.cpp	2007-01-11 17:39:12.000000000 +0100
+--- a/gamelogic.cpp
++++ b/gamelogic.cpp
 @@ -154,7 +154,7 @@
  		levelFile = NULL;
  	}
diff --git a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch
index 4b64fcd67783..594298c93d44 100644
--- a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch
+++ b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch
@@ -1,5 +1,5 @@
---- gamelogic.cpp
-+++ gamelogic.cpp
+--- a/gamelogic.cpp
++++ b/gamelogic.cpp
 @@ -25,6 +25,7 @@
  #include<fstream>
  #include<cstdio>
@@ -8,8 +8,8 @@
  
  #ifndef WIN32
  #include<unistd.h>
---- levelmap.cpp
-+++ levelmap.cpp
+--- a/levelmap.cpp
++++ b/levelmap.cpp
 @@ -21,6 +21,7 @@
  ////////////////////////////////////////////////////////////////////////
  
@@ -18,8 +18,8 @@
  #include <cstdio>
  #include <cctype>
  #include <cstring>
---- mapedit.cpp
-+++ mapedit.cpp
+--- a/mapedit.cpp
++++ b/mapedit.cpp
 @@ -26,6 +26,8 @@
  #include<cstdio>
  #include<list>
@@ -29,8 +29,8 @@
  
  #ifndef WIN32
  #include<unistd.h>
---- modlist.cpp
-+++ modlist.cpp
+--- a/modlist.cpp
++++ b/modlist.cpp
 @@ -22,6 +22,7 @@
  
  #include <iostream>
@@ -39,8 +39,8 @@
  
  #ifdef WIN32
  #include <afxwin.h>
---- tile_spinner.cpp
-+++ tile_spinner.cpp
+--- a/tile_spinner.cpp
++++ b/tile_spinner.cpp
 @@ -24,6 +24,7 @@
  
  
diff --git a/games-puzzle/xlogical/xlogical-1.0.7-r1.ebuild b/games-puzzle/xlogical/xlogical-1.0.7-r1.ebuild
new file mode 100644
index 000000000000..835489919edc
--- /dev/null
+++ b/games-puzzle/xlogical/xlogical-1.0.7-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop edos2unix
+
+MY_PV=$(ver_rs 2 '-')
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="SDL logical clone"
+HOMEPAGE="https://changeling.ixionstudios.com/xlogical/"
+SRC_URI="https://changeling.ixionstudios.com/xlogical/downloads/${MY_P}.tar.bz2
+	alt_gfx? ( https://changeling.ixionstudios.com/xlogical/downloads/${PN}_gfx.zip )"
+S="${WORKDIR}"/${PN}-$(ver_cut 1-2)
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alt_gfx"
+
+DEPEND="
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-image[jpeg]
+	media-libs/sdl-mixer[mod]
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/gamestat
+"
+BDEPEND="alt_gfx? ( app-arch/unzip )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc41.patch
+	"${FILESDIR}"/${P}-gcc43.patch
+)
+
+src_unpack() {
+	unpack ${MY_P}.tar.bz2
+
+	if use alt_gfx ; then
+		cd "${S}"/images || die
+		unpack xlogical_gfx.zip
+	fi
+}
+
+src_prepare() {
+	sed -i '/^CXXFLAGS/d' Makefile.am || die
+
+	edos2unix properties.h anim.h exception.h
+
+	default
+
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	# localstatedir is only used for the score file
+	# NOTE: Check on bumps!
+	econf --localstatedir="/var/games"
+}
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/share/${PN}
+	doins -r ${PN}.{properties,levels} music sound images
+	find "${ED}" -name "Makefile*" -exec rm -f '{}' + || die
+
+	insinto /var/games/${PN}
+	doins ${PN}.scores
+
+	fowners root:gamestat /var/games/${PN}/${PN}.scores
+	fperms 660 /var/games/${PN}/${PN}.scores
+	fperms g+s /usr/bin/${PN}
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+	make_desktop_entry ${PN} "Xlogical"
+}
diff --git a/games-puzzle/xlogical/xlogical-1.0.7.ebuild b/games-puzzle/xlogical/xlogical-1.0.7.ebuild
deleted file mode 100644
index fd78761103c9..000000000000
--- a/games-puzzle/xlogical/xlogical-1.0.7.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools versionator eutils games
-
-MY_PV=$(replace_version_separator 2 '-' )
-MY_P=${PN}-${MY_PV}
-DESCRIPTION="SDL logical clone"
-HOMEPAGE="https://changeling.ixionstudios.com/xlogical/"
-SRC_URI="https://changeling.ixionstudios.com/xlogical/downloads/${MY_P}.tar.bz2
-	alt_gfx? ( http://changeling.ixionstudios.com/xlogical/downloads/xlogical_gfx.zip )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alt_gfx"
-
-RDEPEND="media-libs/libsdl[sound,video]
-	media-libs/sdl-image[jpeg]
-	media-libs/sdl-mixer[mod]"
-DEPEND="${RDEPEND}
-	alt_gfx? ( app-arch/unzip )"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	if use alt_gfx ; then
-		cd "${S}/images"
-		unpack xlogical_gfx.zip
-	fi
-}
-
-src_prepare() {
-	sed -i '/^CXXFLAGS/d' Makefile.am || die
-	edos2unix properties.h anim.h exception.h
-	epatch \
-		"${FILESDIR}"/${P}-gcc41.patch \
-		"${FILESDIR}"/${P}-gcc43.patch
-	mv configure.in configure.ac
-	eautoreconf
-}
-
-src_install() {
-	dogamesbin ${PN}
-
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r ${PN}.{properties,levels} music sound images
-	find "${D}" -name "Makefile*" -exec rm -f '{}' +
-
-	insinto "${GAMES_STATEDIR}"/${PN}
-	doins ${PN}.scores
-	fperms 0660 "${GAMES_STATEDIR}"/${PN}/${PN}.scores
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	make_desktop_entry ${PN} "Xlogical"
-	prepgamesdirs
-}
diff --git a/games-puzzle/xtris/Manifest b/games-puzzle/xtris/Manifest
index 38c01d834c8a..63db0179e52b 100644
--- a/games-puzzle/xtris/Manifest
+++ b/games-puzzle/xtris/Manifest
@@ -1,4 +1,4 @@
 AUX xtris.xpm 1403 BLAKE2B dc765e15dfc0cc49837cfbadfa3fe0ad33aef0e88921e906e89f9af8f778c700508b5a451d835d77bca64094d5a0b6e7f1bce941f6a42b6bf00e089fea7167b7 SHA512 1956a02d844b517df41a5cc82e236a04ec9609849c4d7b097af5bbb4b03c1e16bc8d6f0491c6cb1c8920bec578beab07381b15cee468079c5e474c80c07d30a3
 DIST xtris-1.15.tar.gz 52130 BLAKE2B 3f39f4208b678be85064fd08cbaabc7a170f559e115d59a8ba50524520b106b6fba5b7a4af7424154032d6b83365bfbb932a3424b6ac03ab32aac49c7afbdb67 SHA512 a5d5c32a7e1650561464f0fda08c7040ca0061e59b374359894e7f181a2e9dfece7f6bee6ed82295779f3e4ac8e7a607c668c31eeb017d6b641c1fe09dea4791
-EBUILD xtris-1.15-r1.ebuild 751 BLAKE2B be3f924189ee3375f3e5939821f1274369cfe64cbab77a83d212e201c7a4a7967ec0c024b3016b77d551419d86d6a4514ec33a3352693e03cd5ca9e30fbcefd3 SHA512 891464e2e0e152eaf7461452be8591a68ec3daa6b5b68da3778fdf534bccb183f75d3c048127dadc3cf318ee960e68fb2c6d44b770e132e6a7861aab275f3fd2
+EBUILD xtris-1.15-r1.ebuild 742 BLAKE2B a810aa7415b4801b0100700fba756971f3af926d16b3d5f8f90d5d7eec5b807fe524421791797dc49bcb14453f813bf06430bd71cb1e74b6812f917643bdd2ee SHA512 45ecda98390d0dee9fb2bad2b40cfddb6cc7326ed95fd0b0e9294d2de899fabd7135ebe76d6ce9246e5c7961f0aa1ad55077cb5ef9ead1daac27c29565d9255e
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/xtris/xtris-1.15-r1.ebuild b/games-puzzle/xtris/xtris-1.15-r1.ebuild
index 1c863a9b1d17..93ef346fe67e 100644
--- a/games-puzzle/xtris/xtris-1.15-r1.ebuild
+++ b/games-puzzle/xtris/xtris-1.15-r1.ebuild
@@ -1,23 +1,22 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit desktop toolchain-funcs
 
 DESCRIPTION="A networked Tetris-like game"
 HOMEPAGE="http://www.iagora.com/~espel/xtris/xtris.html"
 SRC_URI="http://www.iagora.com/~espel/xtris/${P}.tar.gz"
+S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="x11-libs/libX11"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}"
-
 src_compile() {
 	emake \
 		CC=$(tc-getCC) \
@@ -29,8 +28,10 @@ src_compile() {
 
 src_install() {
 	dobin xtris xtserv xtbot
+
 	doicon "${FILESDIR}"/${PN}.xpm
 	make_desktop_entry ${PN} xtris ${PN}
+
 	doman xtris.6 xtserv.6 xtbot.6
 	dodoc ChangeLog PROTOCOL README
 }
diff --git a/games-puzzle/xwelltris/Manifest b/games-puzzle/xwelltris/Manifest
index 08340532ade4..8eb5847cb7b5 100644
--- a/games-puzzle/xwelltris/Manifest
+++ b/games-puzzle/xwelltris/Manifest
@@ -1,3 +1,4 @@
+AUX xwelltris-1.0.1-scorefile-dir.patch 615 BLAKE2B 77dd21fa7650bb2d940422aebf80bd9c82188c577bf7a498e7537b88218dbbfae3be8309588798b03e7590a002a317a8171202b9b0aa411421160d776109a7c1 SHA512 3bc2e6ef0b44ead08103441e9e4e13263b108986461d263a30fc0125b25d687e74e7e49d3610fc2207a370125aaf79c839e41584e97e989b2e6dceb1478a4919
 DIST xwelltris-1.0.1.src.tar.gz 422822 BLAKE2B c6eda0d294e79c5715bcaa593776ecfb0cdc734386fc4e9a6825dd090340c2744a251ad1e753421865151928608e4aebdd5050b0091a0799b7d1da5a0b3bdd60 SHA512 6b1080c6e6d1b579c441d1f42bb6454dafed62a63790d5798e83cf137db7ff2ddc07db7e89b34402a5249770697cc3f8ad5e6222266142c7b43f6936828f2536
-EBUILD xwelltris-1.0.1.ebuild 974 BLAKE2B b76648e2ae47cd20b40c8b76f5a64b40afa8c6733ecdd9c165a5a835e324610e73d838c4e781fcda77a0c1acdca82247864ff6d52ca6984833a212c9967ee12e SHA512 cfc4027ef6409246fcf2d477e6a0653f470c24cb74f2409cf3c43470eabc91f1db4e5f1a711538814a04a2587eabd92f3ad8590c922b622987596640dc975e52
+EBUILD xwelltris-1.0.1.ebuild 1458 BLAKE2B 5dbc829ef675a29f4d2a4e1210bbad57e114e450c29ffbc3e69ae5dbaa86cba99494151dbca0ce7e40d431b4748e63caeef7e9c03e6de916ba22107b0163b74e SHA512 d36e400a6430c6f7c2dba88b8850ce92db240ff9e7e5ed94bd9f6bdac3a136f6b2eb5ec5c86c788f8572ff619369f253224f0202eec5ff8b4db8a55fe84710bc
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/xwelltris/files/xwelltris-1.0.1-scorefile-dir.patch b/games-puzzle/xwelltris/files/xwelltris-1.0.1-scorefile-dir.patch
new file mode 100644
index 000000000000..67f832ae372c
--- /dev/null
+++ b/games-puzzle/xwelltris/files/xwelltris-1.0.1-scorefile-dir.patch
@@ -0,0 +1,16 @@
+--- a/src/commonfuncs.cxx
++++ b/src/commonfuncs.cxx
+@@ -41,7 +41,12 @@ bool find_full_path_for_file(char* name, char* ret_full_pathname, FMode mode)
+ 
+   do 
+   {    
+-    sprintf(ret_full_pathname,"%s/%s",GLOBAL_SEARCH,name); //First check in GLOBAL_SEARCH dir
++    sprintf(ret_full_pathname,"%s/%s","@GENTOO_PORTAGE_EPREFIX@/var/lib/xwelltris",name); // First check in /var/lib/xwelltris
++    fd=open(ret_full_pathname,fmode);
++    if(fd>0)
++      break;
++
++    sprintf(ret_full_pathname,"%s/%s",GLOBAL_SEARCH,name); // Then in GLOBAL_SEARCH dir
+     fd=open(ret_full_pathname,fmode);
+     if(fd>0)
+       break;
diff --git a/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild b/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild
index eb2e02cbf21d..36c39e67014c 100644
--- a/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild
+++ b/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit games
+EAPI=7
+
+inherit toolchain-funcs prefix
 
 DESCRIPTION="2.5D tetris like game"
 HOMEPAGE="http://xnc.jinr.ru/xwelltris/"
@@ -11,24 +12,41 @@ SRC_URI="http://xnc.jinr.ru/xwelltris/src/${P}.src.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="media-libs/libsdl[video]
-	media-libs/sdl-image[gif]"
-RDEPEND=${DEPEND}
+DEPEND="
+	media-libs/libsdl[video]
+	media-libs/sdl-image[gif]
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/gamestat
+"
+
+PATCHES=(
+	# Look in ${EPREFIX}/var/lib/xwelltris for score file
+	"${FILESDIR}"/${PN}-1.0.1-scorefile-dir.patch
+)
 
 src_prepare() {
+	default
+
 	sed -i \
 		-e '/INSTALL_PROGRAM/s/-s //' \
 		src/Make.common.in || die
+
 	sed -i \
-		-e "/GLOBAL_SEARCH/s:\".*\":\"${GAMES_DATADIR}/${PN}\":" \
+		-e "/GLOBAL_SEARCH/s:\".*\":\"/usr/share/${PN}\":" \
 		src/include/globals.h.in || die
+
+	# Ensure we look in ${EPREFIX}/var/lib/${PN} for score file
+	eprefixify src/commonfuncs.cxx
 }
 
 src_configure() {
+	tc-export CC CXX
+
 	# configure/build process is pretty messed up
-	egamesconf --with-sdl
+	econf --with-sdl
 }
 
 src_compile() {
@@ -36,11 +54,19 @@ src_compile() {
 }
 
 src_install() {
-	dodir "${GAMES_BINDIR}" "${GAMES_DATADIR}/${PN}" /usr/share/man
+	dodir /usr/bin /usr/share/${PN} /var/lib/${PN} /usr/share/man
+
 	emake install \
-		INSTDIR="${D}/${GAMES_BINDIR}" \
-		INSTLIB="${D}/${GAMES_DATADIR}/${PN}" \
+		INSTDIR="${D}/usr/bin" \
+		INSTLIB="${D}/usr/share/${PN}" \
 		INSTMAN=/usr/share/man
+
 	dodoc AUTHORS Changelog README*
-	prepgamesdirs
+
+	# Move score file to our location
+	mv "${ED}"/usr/share/${PN}/welltris.scores "${ED}"/var/lib/${PN}/welltris.scores || die
+
+	fowners root:gamestat /var/lib/${PN}/welltris.scores
+	fperms 660 /var/lib/${PN}/welltris.scores
+	fperms g+s /usr/bin/${PN}
 }
diff --git a/games-puzzle/zaz/Manifest b/games-puzzle/zaz/Manifest
index 653fadbfaea1..fc1ef139a24d 100644
--- a/games-puzzle/zaz/Manifest
+++ b/games-puzzle/zaz/Manifest
@@ -1,4 +1,4 @@
 AUX zaz-1.0.0-build.patch 402 BLAKE2B 1f34e5961fee645ba6c55239d0795f7988bc2b3e0ee1da2ca3033f68d145d94ecc3894072bb8ac38802b6fd5cc3d8011ae5bde545dafd3b4133d73381b95a1f1 SHA512 4c7b8659407295b1a2003ecfe74f57dad73964666920a1f25fab87518fc6fb4f74285f051bf5df81c205faea5054908fb6da8e427d79ed4cd91f82212be2daa6
 DIST zaz-1.0.0.tar.bz2 25170073 BLAKE2B 6502b880a024dec356e7a1f8dfd29f7353d5de07e08a2de7480db32fec5af17adb9210e4f0b3c17f2b27a6977ae3647d7458d5d21dacff66c2085801fda45985 SHA512 8383732aefb1f83623af35c85fc90e0468ca15e2ffb5577d22a5a1b1c60154d3829c58c04bba675c49a7e4b4d14b6fec920c67c6a820a927d2ab5f80b5d694cb
-EBUILD zaz-1.0.0-r1.ebuild 1105 BLAKE2B d79453bc1dbcfabf0eee120792212f7bdd79a3e220fba0cef6bafbe8d00cfc9863cca9f3d3bf0a7efa52c9039e94bb41b72e1d0d489c6294eb69712c6ee2603e SHA512 2c820759048fc5e53ea2c1d250d93b2886b8e1ffff85fd86e18470c93963a2f9cb0383b0e3ceaec5280be4a491732023c5b17239a829c120e3033aa645f103b4
+EBUILD zaz-1.0.0-r1.ebuild 1140 BLAKE2B 49d0d5d589cb183724d742b151260594b4eea6e197da560d4c0cf4241266eeb0eca9752963f6ee7410b2da29ef5179596e10b6acfdf1ab419728a95f768171be SHA512 6e76c15eaa5c466d5ba66d827b06f7865e42069eb1d34c48beb074c70b58649134f44a467cf28e70c31e3aa6824eda90839802b5ac9dc9e342b9bb2af879e2b0
 MISC metadata.xml 326 BLAKE2B 962f166dc4d93ffdf146a76d3e45bb96284a47bb845755e1f7450d2de5ad662abb1a2d63c21ad4e23e5e8cc16a8a2d9fa36503049262205666168c5486d86ff6 SHA512 c96c9c7a3ff21d49bcaf2418c5c21e2f83070d2d148d8a8faaeb790ca3dbc522ecab9d28a1df884e5e47543fb8067ce538e6ba62c04da8f43e6f6241cb0134ba
diff --git a/games-puzzle/zaz/zaz-1.0.0-r1.ebuild b/games-puzzle/zaz/zaz-1.0.0-r1.ebuild
index 4a3321038e57..ba80059c7f1d 100644
--- a/games-puzzle/zaz/zaz-1.0.0-r1.ebuild
+++ b/games-puzzle/zaz/zaz-1.0.0-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools flag-o-matic xdg
+
+inherit autotools flag-o-matic xdg toolchain-funcs
 
 DESCRIPTION="A puzzle game where the player has to arrange balls in triplets"
 HOMEPAGE="https://sourceforge.net/projects/zaz/"
@@ -39,8 +40,8 @@ src_prepare() {
 
 src_configure() {
 	append-libs -lvorbis
-	append-cflags $(pkg-config sdl --cflags)
-	append-cxxflags $(pkg-config sdl --cflags)
+	append-cflags $($(tc-getPKG_CONFIG) sdl --cflags)
+	append-cxxflags $($(tc-getPKG_CONFIG) sdl --cflags)
 	econf \
 		--with-applicationdir=/usr/share/applications \
 		--with-icondir=/usr/share/pixmaps \
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /games-puzzle
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)