gentoo resync : 29.12.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-06-29 12:04:12 +0100
commit: 0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree: 037df795519468a25d9362b4e95cdaeb84eb1cf9 /metadata/md5-cache/games-puzzle
parent: 752d6256e5204b958b0ef7905675a940b5e9172f (diff)
105 files changed, 182 insertions, 155 deletions
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 2fcf81af06df..a7c0c1e7ae49 100644
--- a/metadata/md5-cache/games-puzzle/Manifest.gz
+++ b/metadata/md5-cache/games-puzzle/Manifest.gz
diff --git a/metadata/md5-cache/games-puzzle/amoebax-0.2.1-r2 b/metadata/md5-cache/games-puzzle/amoebax-0.2.1-r2
index 438f23a44add..c30421b6c4b0 100644
--- a/metadata/md5-cache/games-puzzle/amoebax-0.2.1-r2
+++ b/metadata/md5-cache/games-puzzle/amoebax-0.2.1-r2
@@ -4,10 +4,11 @@ DEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-image[png] media-l
 DESCRIPTION=Cute and addictive action-puzzle game, similar to tetris
 EAPI=8
 HOMEPAGE=https://www.emma-soft.com/games/amoebax/
+INHERIT=autotools
 KEYWORDS=~amd64 ~x86
 LICENSE=Free-Art-1.2 GPL-2+
 RDEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis]
 SLOT=0
 SRC_URI=https://www.emma-soft.com/games/amoebax/download/amoebax-0.2.1.tar.bz2
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=54638c9d36ebb3d336bae4775ba43059
diff --git a/metadata/md5-cache/games-puzzle/anagramarama-0.2-r1 b/metadata/md5-cache/games-puzzle/anagramarama-0.2-r1
index ba08b2d93982..190b3a6f3fab 100644
--- a/metadata/md5-cache/games-puzzle/anagramarama-0.2-r1
+++ b/metadata/md5-cache/games-puzzle/anagramarama-0.2-r1
@@ -4,10 +4,11 @@ DEPEND=>=media-libs/libsdl-1.2 >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-image
 DESCRIPTION=Create as many words as you can before the time runs out
 EAPI=7
 HOMEPAGE=http://www.coralquest.com/anagramarama/
+INHERIT=desktop toolchain-funcs vcs-clean
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libsdl-1.2 >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-image-1.2 sys-apps/miscfiles
 SLOT=0
 SRC_URI=http://www.omega.clara.net/anagramarama/dist/anagramarama-0.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3
 _md5_=443a5310580513752c42a951fcdee196
diff --git a/metadata/md5-cache/games-puzzle/angrydd-1.0.1_p13-r2 b/metadata/md5-cache/games-puzzle/angrydd-1.0.1_p13-r2
index e7a1b291c70d..bfe502a55fe0 100644
--- a/metadata/md5-cache/games-puzzle/angrydd-1.0.1_p13-r2
+++ b/metadata/md5-cache/games-puzzle/angrydd-1.0.1_p13-r2
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) p
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=mirror://gentoo/angrydd-1.0.1.tar.gz mirror://debian/pool/main/a/angrydd/angrydd_1.0.1-13.debian.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=b87c0d28b930bb9bfb6f1a90ea71d57b
diff --git a/metadata/md5-cache/games-puzzle/arrows-0.6-r2 b/metadata/md5-cache/games-puzzle/arrows-0.6-r2
index cc96abc084d4..a6aa1d9d9845 100644
--- a/metadata/md5-cache/games-puzzle/arrows-0.6-r2
+++ b/metadata/md5-cache/games-puzzle/arrows-0.6-r2
@@ -4,10 +4,11 @@ DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/pango
 DESCRIPTION=Simple maze-like game where you navigate around and destroy arrows
 EAPI=8
 HOMEPAGE=http://noreason.ca/?file=software
+INHERIT=desktop toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/pango
 SLOT=0
 SRC_URI=http://noreason.ca/data/arrows-0.6.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a429063b9b121de154a94c1f5769ccea
diff --git a/metadata/md5-cache/games-puzzle/atomix-3.34.0-r1 b/metadata/md5-cache/games-puzzle/atomix-3.34.0-r1
index 544e05c9b972..5728df7e7c32 100644
--- a/metadata/md5-cache/games-puzzle/atomix-3.34.0-r1
+++ b/metadata/md5-cache/games-puzzle/atomix-3.34.0-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=>=x11-libs/gtk+-3.10:3 >=x11-libs/gdk-pixbuf-2.0.5:2 >=dev-libs/glib-2.36.0:2 dev-libs/libgnome-games-support:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/atomix/3.34/atomix-3.34.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=e9004bef85ddf1be94ef9009cd3bb3b6
diff --git a/metadata/md5-cache/games-puzzle/bff-or-die-20200614 b/metadata/md5-cache/games-puzzle/bff-or-die-20200614
index 7031ba984fbe..d6a287d85986 100644
--- a/metadata/md5-cache/games-puzzle/bff-or-die-20200614
+++ b/metadata/md5-cache/games-puzzle/bff-or-die-20200614
@@ -4,11 +4,12 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Time travelling alien couch co-op puzzle game for 1-4 players
 EAPI=7
 HOMEPAGE=https://www.bffordie.com/
+INHERIT=desktop wrapper xdg
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=all-rights-reserved
 RDEPEND=sys-libs/zlib virtual/opengl
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=BffOrDie_Linux.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c9a9b256fcbfa80c8a44ce67319febc0
diff --git a/metadata/md5-cache/games-puzzle/biniax2-1.30-r2 b/metadata/md5-cache/games-puzzle/biniax2-1.30-r2
index 41a56d47d96a..5344c57d3911 100644
--- a/metadata/md5-cache/games-puzzle/biniax2-1.30-r2
+++ b/metadata/md5-cache/games-puzzle/biniax2-1.30-r2
@@ -3,10 +3,11 @@ DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[png] media-libs/sdl-m
 DESCRIPTION=Logic game with arcade and tactics modes
 EAPI=7
 HOMEPAGE=http://biniax.com/
+INHERIT=desktop toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=ZLIB
 RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[mod]
 SLOT=0
 SRC_URI=http://www.tuzsuzov.com/biniax/biniax2-1.30-fullsrc.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=2b0c006aff191dbfefe81bb143378ca4
diff --git a/metadata/md5-cache/games-puzzle/braid-gog-2.0.0.3 b/metadata/md5-cache/games-puzzle/braid-gog-2.0.0.3
index 56cd9588ea17..69a95baadc06 100644
--- a/metadata/md5-cache/games-puzzle/braid-gog-2.0.0.3
+++ b/metadata/md5-cache/games-puzzle/braid-gog-2.0.0.3
@@ -3,11 +3,12 @@ DEFINED_PHASES=install nofetch postinst postrm preinst unpack
 DESCRIPTION=Platform game where you manipulate flow of time
 EAPI=8
 HOMEPAGE=https://www.gog.com/en/game/braid
+INHERIT=desktop unpacker wrapper xdg
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=GOG-EULA Arphic CC-BY-NC-SA-1.0
 RDEPEND=media-gfx/nvidia-cg-toolkit[abi_x86_32] media-libs/libsdl2[joystick,opengl,sound,video,abi_x86_32] virtual/opengl[abi_x86_32] x11-libs/fltk:1[abi_x86_32] x11-libs/libX11[abi_x86_32] !games-puzzle/braid-hb
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=gog_braid_2.0.0.3.sh
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	697382d119fd3d195f110b7979184285	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	unpacker	697382d119fd3d195f110b7979184285	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=ece599c2ec35722147b5e8cb7ba2d383
diff --git a/metadata/md5-cache/games-puzzle/braid-hb-20150611 b/metadata/md5-cache/games-puzzle/braid-hb-20150611
index 1519aa8094c8..dfd1ee19b3df 100644
--- a/metadata/md5-cache/games-puzzle/braid-hb-20150611
+++ b/metadata/md5-cache/games-puzzle/braid-hb-20150611
@@ -3,11 +3,12 @@ DEFINED_PHASES=install nofetch postinst postrm preinst unpack
 DESCRIPTION=Platform game where you manipulate flow of time
 EAPI=8
 HOMEPAGE=https://www.humblebundle.com/store/braid
+INHERIT=desktop unpacker wrapper xdg
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=all-rights-reserved Arphic CC-BY-NC-SA-1.0
 RDEPEND=media-gfx/nvidia-cg-toolkit[abi_x86_32] media-libs/libsdl2[joystick,opengl,sound,video,abi_x86_32] virtual/opengl[abi_x86_32] x11-libs/fltk:1[abi_x86_32] x11-libs/libX11[abi_x86_32] !games-puzzle/braid-gog
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=BraidSetup-2015-06-11.sh
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	697382d119fd3d195f110b7979184285	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	unpacker	697382d119fd3d195f110b7979184285	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=35d6a4d81b56ad6ea9fee2aa89b6b27c
diff --git a/metadata/md5-cache/games-puzzle/braincurses-1.1.0 b/metadata/md5-cache/games-puzzle/braincurses-1.1.0
index d6dfad8b7259..e99eed50168e 100644
--- a/metadata/md5-cache/games-puzzle/braincurses-1.1.0
+++ b/metadata/md5-cache/games-puzzle/braincurses-1.1.0
@@ -4,10 +4,11 @@ DEPEND=sys-libs/ncurses:=
 DESCRIPTION=A version of the classic game Mastermind
 EAPI=7
 HOMEPAGE=https://github.com/bderrly/braincurses
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:=
 SLOT=0
 SRC_URI=https://github.com/bderrly/braincurses/archive/1.1.0.tar.gz -> braincurses-1.1.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=986ca78287b90cbd0060e21ce9c81561
diff --git a/metadata/md5-cache/games-puzzle/brainparty-0.61-r2 b/metadata/md5-cache/games-puzzle/brainparty-0.61-r2
index f7262283ec77..5193e5511981 100644
--- a/metadata/md5-cache/games-puzzle/brainparty-0.61-r2
+++ b/metadata/md5-cache/games-puzzle/brainparty-0.61-r2
@@ -3,10 +3,11 @@ DEPEND=media-libs/libsdl[sound,opengl,video] media-libs/sdl-gfx media-libs/sdl-i
 DESCRIPTION=A puzzle-solving, brain-stretching game for all ages
 EAPI=7
 HOMEPAGE=http://www.tuxradar.com/brainparty
+INHERIT=desktop toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 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 virtual/opengl virtual/glu
 SLOT=0
 SRC_URI=https://launchpad.net/brainparty/trunk/0.61/+download/brainparty0.61.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=fcf8f100fd6ebc3d8c74c69b4ad4cdbf
diff --git a/metadata/md5-cache/games-puzzle/brainworkshop-5.0.2 b/metadata/md5-cache/games-puzzle/brainworkshop-5.0.2
index d8fc2c059ee2..eff97374fd4e 100644
--- a/metadata/md5-cache/games-puzzle/brainworkshop-5.0.2
+++ b/metadata/md5-cache/games-puzzle/brainworkshop-5.0.2
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) p
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/brain-workshop/brainworkshop/archive/refs/tags/v5.0.2.tar.gz -> brainworkshop-5.0.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9a00a2b2b6ceafeb6b58eea9d62806f7
diff --git a/metadata/md5-cache/games-puzzle/color-lines-0.6-r1 b/metadata/md5-cache/games-puzzle/color-lines-0.6-r1
index 89d4dbfec24e..3e3c250aa8f7 100644
--- a/metadata/md5-cache/games-puzzle/color-lines-0.6-r1
+++ b/metadata/md5-cache/games-puzzle/color-lines-0.6-r1
@@ -3,10 +3,11 @@ DEPEND=media-libs/libsdl[X,sound,video] media-libs/sdl-image[png] media-libs/sdl
 DESCRIPTION=Color lines game written with SDL with bonus features
 EAPI=6
 HOMEPAGE=https://github.com/OpenA/color-lines-sdl
+INHERIT=desktop
 KEYWORDS=~amd64 ~x86 ~amd64-linux
 LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[X,sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[wav,mod]
 SLOT=0
 SRC_URI=https://color-lines.googlecode.com/files/lines_0.6.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
 _md5_=8bdaad715e716713d0f8c0d61f1a109d
diff --git a/metadata/md5-cache/games-puzzle/colorcode-0.8.5 b/metadata/md5-cache/games-puzzle/colorcode-0.8.5
index 6cf2c94d9fe0..742ab3caaf8b 100644
--- a/metadata/md5-cache/games-puzzle/colorcode-0.8.5
+++ b/metadata/md5-cache/games-puzzle/colorcode-0.8.5
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=http://colorcode.laebisch.com/download/ColorCode-0.8.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d6cf6dc6fa727906f41126e00e16c5e2
diff --git a/metadata/md5-cache/games-puzzle/concentration-1.2-r3 b/metadata/md5-cache/games-puzzle/concentration-1.2-r3
index 9916ee6e229c..42989919bbd1 100644
--- a/metadata/md5-cache/games-puzzle/concentration-1.2-r3
+++ b/metadata/md5-cache/games-puzzle/concentration-1.2-r3
@@ -3,10 +3,11 @@ DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer[vorbis] media-libs/sd
 DESCRIPTION=The classic memory game with some new life
 EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=desktop
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer[vorbis] media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf !sci-biology/unafold
 SLOT=0
 SRC_URI=mirror://gentoo/concentration-1.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
 _md5_=21077b3d03a20c323cd894f4dea89885
diff --git a/metadata/md5-cache/games-puzzle/connectagram-1.2.11 b/metadata/md5-cache/games-puzzle/connectagram-1.2.11
index 304cf7292ac9..3d1beac05d57 100644
--- a/metadata/md5-cache/games-puzzle/connectagram-1.2.11
+++ b/metadata/md5-cache/games-puzzle/connectagram-1.2.11
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://gottcode.org/connectagram/connectagram-1.2.11-src.tar.bz2
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=abc7b7f3d4298f6b052beaa0fe34f675
diff --git a/metadata/md5-cache/games-puzzle/construo-0.2.3 b/metadata/md5-cache/games-puzzle/construo-0.2.3
index e2abdb6980b3..626a21686df1 100644
--- a/metadata/md5-cache/games-puzzle/construo-0.2.3
+++ b/metadata/md5-cache/games-puzzle/construo-0.2.3
@@ -4,10 +4,11 @@ DEPEND=media-libs/freeglut virtual/glu virtual/opengl x11-libs/libXxf86vm x11-ba
 DESCRIPTION=2d construction toy with objects that react on physical forces
 EAPI=8
 HOMEPAGE=http://www.nongnu.org/construo/
+INHERIT=autotools desktop toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/freeglut virtual/glu virtual/opengl x11-libs/libXxf86vm
 SLOT=0
 SRC_URI=http://download-mirror.savannah.gnu.org/releases/construo/construo.pkg/0.2.3/construo-0.2.3.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=a8b83bf48f47f2b471af120043c1fac3
diff --git a/metadata/md5-cache/games-puzzle/cutemaze-1.2.6 b/metadata/md5-cache/games-puzzle/cutemaze-1.2.6
index d16b076e4f8c..289a162148c3 100644
--- a/metadata/md5-cache/games-puzzle/cutemaze-1.2.6
+++ b/metadata/md5-cache/games-puzzle/cutemaze-1.2.6
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://gottcode.org/cutemaze/cutemaze-1.2.6-src.tar.bz2
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=fa769d7ab351eb10c0730d66e8912cc9
diff --git a/metadata/md5-cache/games-puzzle/einstein-2.1.1 b/metadata/md5-cache/games-puzzle/einstein-2.1.1
index 1cb55a78cc92..2350655bffbd 100644
--- a/metadata/md5-cache/games-puzzle/einstein-2.1.1
+++ b/metadata/md5-cache/games-puzzle/einstein-2.1.1
@@ -3,10 +3,11 @@ DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer media-libs/sdl-ttf
 DESCRIPTION=A puzzle game inspired by Albert Einstein
 EAPI=6
 HOMEPAGE=https://github.com/lksj/einstein-puzzle
+INHERIT=desktop
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer media-libs/sdl-ttf
 SLOT=0
 SRC_URI=https://github.com/lksj/einstein-puzzle/archive/v2.1.1.tar.gz -> einstein-2.1.1.tar.gz mirror://gentoo/einstein.png
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
 _md5_=24bcd334ed9b044f2717419f4c4ab347
diff --git a/metadata/md5-cache/games-puzzle/enigma-1.21-r3 b/metadata/md5-cache/games-puzzle/enigma-1.21-r3
index 7ec533e9e739..b35b4065b8af 100644
--- a/metadata/md5-cache/games-puzzle/enigma-1.21-r3
+++ b/metadata/md5-cache/games-puzzle/enigma-1.21-r3
@@ -4,11 +4,12 @@ DEPEND=media-fonts/dejavu media-libs/sdl-ttf media-libs/libsdl[video] media-libs
 DESCRIPTION=Puzzle game similar to Oxyd
 EAPI=7
 HOMEPAGE=http://www.nongnu.org/enigma/
+INHERIT=autotools xdg
 IUSE=nls
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=media-fonts/dejavu media-libs/sdl-ttf media-libs/libsdl[video] media-libs/sdl-mixer media-libs/sdl-image[jpeg,png] media-libs/libpng:0= sys-libs/zlib net-misc/curl || ( >=dev-libs/xerces-c-3[icu] >=dev-libs/xerces-c-3[-icu,-iconv] ) net-libs/enet:= nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/enigma-game/enigma-1.21.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1b789409a16ed0b8af17e48755f89338
diff --git a/metadata/md5-cache/games-puzzle/fbg-0.9-r3 b/metadata/md5-cache/games-puzzle/fbg-0.9-r3
index a450e88890b6..08220425ba4f 100644
--- a/metadata/md5-cache/games-puzzle/fbg-0.9-r3
+++ b/metadata/md5-cache/games-puzzle/fbg-0.9-r3
@@ -3,10 +3,11 @@ DEPEND=dev-games/physfs media-libs/libmikmod media-libs/libsdl[opengl,video] vir
 DESCRIPTION=Tetris clone written in OpenGL
 EAPI=8
 HOMEPAGE=http://fbg.sourceforge.net/
+INHERIT=desktop
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-games/physfs media-libs/libmikmod media-libs/libsdl[opengl,video] virtual/glu virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/fbg/fbg-0.9.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
 _md5_=3a6e2e19a6016a91dc247d16381ba3ef
diff --git a/metadata/md5-cache/games-puzzle/fish-fillets-1.0.1-r100 b/metadata/md5-cache/games-puzzle/fish-fillets-1.0.1-r100
index f3bf6899460e..0ce6223b2198 100644
--- a/metadata/md5-cache/games-puzzle/fish-fillets-1.0.1-r100
+++ b/metadata/md5-cache/games-puzzle/fish-fillets-1.0.1-r100
@@ -4,6 +4,7 @@ DEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-libs/fribidi >=media-l
 DESCRIPTION=Underwater puzzle game - find a safe way out
 EAPI=7
 HOMEPAGE=http://fillets.sourceforge.net/
+INHERIT=autotools desktop lua-single
 IUSE=+lua_single_target_lua5-1
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -11,5 +12,5 @@ RDEPEND=lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) dev-libs/fribidi >=media-
 REQUIRED_USE=^^ ( lua_single_target_lua5-1 )
 SLOT=0
 SRC_URI=mirror://sourceforge/fillets/fillets-ng-1.0.1.tar.gz mirror://sourceforge/fillets/fillets-ng-data-1.0.0.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9aad56bc0af10342c7b5123545527255
diff --git a/metadata/md5-cache/games-puzzle/five-or-more-3.32.2-r1 b/metadata/md5-cache/games-puzzle/five-or-more-3.32.2-r1
deleted file mode 100644
index 328ce61f8935..000000000000
--- a/metadata/md5-cache/games-puzzle/five-or-more-3.32.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 ) gnome-base/librsvg:2[vala] dev-libs/appstream-glib dev-libs/libxml2:2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/libgee:0.8= >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.20:3 dev-libs/libgnome-games-support:1= >=gnome-base/librsvg-2.32:2 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Remove colored balls from the board by forming lines
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Apps/Five%20or%20more
-INHERIT=gnome.org gnome2-utils meson vala xdg
-KEYWORDS=amd64 ~arm arm64 ~riscv x86
-LICENSE=GPL-2+ CC-BY-SA-3.0
-RDEPEND=dev-libs/libgee:0.8= >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.20:3 dev-libs/libgnome-games-support:1= >=gnome-base/librsvg-2.32:2
-SLOT=0
-SRC_URI=mirror://gnome/sources/five-or-more/3.32/five-or-more-3.32.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=388c595b1d54b84824dbccdf85287219
diff --git a/metadata/md5-cache/games-puzzle/five-or-more-3.32.3 b/metadata/md5-cache/games-puzzle/five-or-more-3.32.3
index edfa47fc4720..4b2ecc016822 100644
--- a/metadata/md5-cache/games-puzzle/five-or-more-3.32.3
+++ b/metadata/md5-cache/games-puzzle/five-or-more-3.32.3
@@ -5,10 +5,10 @@ DESCRIPTION=Remove colored balls from the board by forming lines
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Five%20or%20more
 INHERIT=gnome.org gnome2-utils meson vala xdg
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=dev-libs/libgee:0.8= >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.20:3 dev-libs/libgnome-games-support:1= >=gnome-base/librsvg-2.32:2
 SLOT=0
 SRC_URI=mirror://gnome/sources/five-or-more/3.32/five-or-more-3.32.3.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8e600aa877f135e5c89b72b5b8ea60ef
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=ca74e145ec4551226aaf887617d2a40e
diff --git a/metadata/md5-cache/games-puzzle/flobopuyo-0.20-r3 b/metadata/md5-cache/games-puzzle/flobopuyo-0.20-r3
index ebea9b8c6c72..691dedd14a3b 100644
--- a/metadata/md5-cache/games-puzzle/flobopuyo-0.20-r3
+++ b/metadata/md5-cache/games-puzzle/flobopuyo-0.20-r3
@@ -4,11 +4,12 @@ DEPEND=media-libs/libsdl[joystick,sound,video] media-libs/sdl-image[jpeg,png] me
 DESCRIPTION=Clone of the famous PuyoPuyo game
 EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=desktop toolchain-funcs
 IUSE=opengl
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[joystick,sound,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod] opengl? ( media-libs/libglvnd )
 SLOT=0
 SRC_URI=mirror://gentoo/flobopuyo-0.20.tgz mirror://gentoo/flobopuyo.png
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3ba2c2c1f7c44e40f9df982ffdbebb8d
diff --git a/metadata/md5-cache/games-puzzle/freesweep-1.0.2 b/metadata/md5-cache/games-puzzle/freesweep-1.0.2
index 9025f90ed7f8..0c61efd168cc 100644
--- a/metadata/md5-cache/games-puzzle/freesweep-1.0.2
+++ b/metadata/md5-cache/games-puzzle/freesweep-1.0.2
@@ -4,10 +4,11 @@ DEPEND=sys-libs/ncurses:=
 DESCRIPTION=Console Minesweeper
 EAPI=8
 HOMEPAGE=https://github.com/rwestlund/freesweep
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~x86 ~ppc-macos
 LICENSE=GPL-2+
 RDEPEND=sys-libs/ncurses:=
 SLOT=0
 SRC_URI=https://github.com/rwestlund/freesweep/archive/v1.0.2.tar.gz -> freesweep-1.0.2.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7fc0d024c6f0430e2f43c4965961104a
diff --git a/metadata/md5-cache/games-puzzle/galaxis-1.8-r1 b/metadata/md5-cache/games-puzzle/galaxis-1.8-r1
index d4cbea42a6b0..2fc8328b12b9 100644
--- a/metadata/md5-cache/games-puzzle/galaxis-1.8-r1
+++ b/metadata/md5-cache/games-puzzle/galaxis-1.8-r1
@@ -4,10 +4,11 @@ DEPEND=>=sys-libs/ncurses-5.3:0=
 DESCRIPTION=Curses-based clone of the nifty little Macintosh freeware game Galaxis
 EAPI=7
 HOMEPAGE=http://www.catb.org/~esr/galaxis/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.3:0=
 SLOT=0
 SRC_URI=http://www.catb.org/~esr/galaxis/galaxis-1.8.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=31b8a24ad1aa432e38d55e4aa37f12b4
diff --git a/metadata/md5-cache/games-puzzle/gemdropx-0.9-r3 b/metadata/md5-cache/games-puzzle/gemdropx-0.9-r3
index 0289747392a8..5a45df0e7331 100644
--- a/metadata/md5-cache/games-puzzle/gemdropx-0.9-r3
+++ b/metadata/md5-cache/games-puzzle/gemdropx-0.9-r3
@@ -3,10 +3,11 @@ DEPEND=media-libs/libsdl[joystick,sound,video] media-libs/sdl-mixer[mod]
 DESCRIPTION=Puzzle game where it's your job to clear the screen of gems
 EAPI=8
 HOMEPAGE=http://www.newbreedsoftware.com/gemdropx/
+INHERIT=desktop toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[joystick,sound,video] media-libs/sdl-mixer[mod]
 SLOT=0
 SRC_URI=ftp://ftp.tuxpaint.org/unix/x/gemdropx/src/gemdropx-0.9.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c88f4b321cdea7926bab11725c0f63af
diff --git a/metadata/md5-cache/games-puzzle/gfifteen-1.0.3-r2 b/metadata/md5-cache/games-puzzle/gfifteen-1.0.3-r2
index 9d80dc936a94..042275878e98 100644
--- a/metadata/md5-cache/games-puzzle/gfifteen-1.0.3-r2
+++ b/metadata/md5-cache/games-puzzle/gfifteen-1.0.3-r2
@@ -4,10 +4,11 @@ DEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gtk+:3
 DESCRIPTION=Graphical implementation of the sliding puzzle game fifteen
 EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=desktop
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gtk+:3
 SLOT=0
 SRC_URI=mirror://gentoo/gfifteen-1.0.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
 _md5_=3652afececcacf0b6aaaa5fec7f7bba9
diff --git a/metadata/md5-cache/games-puzzle/glightoff-1.0.0-r1 b/metadata/md5-cache/games-puzzle/glightoff-1.0.0-r1
index 0d6acddbd402..1bb570ac6c90 100644
--- a/metadata/md5-cache/games-puzzle/glightoff-1.0.0-r1
+++ b/metadata/md5-cache/games-puzzle/glightoff-1.0.0-r1
@@ -4,10 +4,11 @@ DEPEND=gnome-base/librsvg media-libs/libpng:0= >=x11-libs/gtk+-2.6:2 dev-util/de
 DESCRIPTION=A simple (but not so easy to solve!) puzzle game
 EAPI=7
 HOMEPAGE=http://glightoff.sourceforge.net/
+INHERIT=gnome2
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=gnome-base/librsvg media-libs/libpng:0= >=x11-libs/gtk+-2.6:2
 SLOT=0
 SRC_URI=mirror://sourceforge/glightoff/glightoff-1.0.0.tar.gz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=51008c828fb6e1aa8aca0be0579c250d
diff --git a/metadata/md5-cache/games-puzzle/gnome-klotski-3.38.2 b/metadata/md5-cache/games-puzzle/gnome-klotski-3.38.2
index 4eed4879ab4b..5eca2f7f2ba7 100644
--- a/metadata/md5-cache/games-puzzle/gnome-klotski-3.38.2
+++ b/metadata/md5-cache/games-puzzle/gnome-klotski-3.38.2
@@ -10,5 +10,5 @@ LICENSE=GPL-3+ FDL-1.1+
 RDEPEND=dev-libs/libgee:0.8= >=dev-libs/glib-2.42.0:2 >=dev-libs/libgnome-games-support-1.7.1:1= >=x11-libs/gtk+-3.24.0:3 >=gnome-base/librsvg-2.32.0:2
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-klotski/3.38/gnome-klotski-3.38.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=5016cd301f33c0c831d4a54a9b977385
diff --git a/metadata/md5-cache/games-puzzle/gnome-sudoku-40.2 b/metadata/md5-cache/games-puzzle/gnome-sudoku-40.2
deleted file mode 100644
index 97d0e493b7ad..000000000000
--- a/metadata/md5-cache/games-puzzle/gnome-sudoku-40.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) || ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 ) dev-libs/appstream-glib dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=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] dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Test your logic skills in this number grid puzzle
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Apps/Sudoku
-INHERIT=gnome.org gnome2-utils meson python-any-r1 vala xdg
-KEYWORDS=amd64 ~arm arm64 ~riscv x86
-LICENSE=GPL-3+ CC-BY-SA-3.0
-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]
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-sudoku/40/gnome-sudoku-40.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=45179a454e93eaaad2ffcf04337c4383
diff --git a/metadata/md5-cache/games-puzzle/gnome-sudoku-42.0 b/metadata/md5-cache/games-puzzle/gnome-sudoku-42.0
index 94fac4c13e8d..984ce893c987 100644
--- a/metadata/md5-cache/games-puzzle/gnome-sudoku-42.0
+++ b/metadata/md5-cache/games-puzzle/gnome-sudoku-42.0
@@ -5,10 +5,10 @@ DESCRIPTION=Test your logic skills in this number grid puzzle
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Sudoku
 INHERIT=gnome.org gnome2-utils meson python-any-r1 vala xdg
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=GPL-3+ CC-BY-SA-3.0
 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]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-sudoku/42/gnome-sudoku-42.0.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ac8a8ea6c801b0c4491aa8bce9db256f
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=d9afdfd6c34c952682fd629b43346b4a
diff --git a/metadata/md5-cache/games-puzzle/gnome-taquin-3.38.1 b/metadata/md5-cache/games-puzzle/gnome-taquin-3.38.1
index 9ae61de594d2..cc7b3c7d0518 100644
--- a/metadata/md5-cache/games-puzzle/gnome-taquin-3.38.1
+++ b/metadata/md5-cache/games-puzzle/gnome-taquin-3.38.1
@@ -10,5 +10,5 @@ LICENSE=GPL-3+ CC-BY-SA-3.0 CC-BY-SA-4.0
 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
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-taquin/3.38/gnome-taquin-3.38.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=594e148c26b7aa7a2a2c7e820992fd67
diff --git a/metadata/md5-cache/games-puzzle/gnome-tetravex-3.38.2 b/metadata/md5-cache/games-puzzle/gnome-tetravex-3.38.2
index ee0bb5ac9bcb..a2b032387d11 100644
--- a/metadata/md5-cache/games-puzzle/gnome-tetravex-3.38.2
+++ b/metadata/md5-cache/games-puzzle/gnome-tetravex-3.38.2
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/glib-2.42.0:2 gui? ( >=x11-libs/gtk+-3.22.23:3 )
 REQUIRED_USE=|| ( cli gui )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-tetravex/3.38/gnome-tetravex-3.38.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=495825db61806e414e6e59a7b6d20e0a
diff --git a/metadata/md5-cache/games-puzzle/gnome2048-3.38.2 b/metadata/md5-cache/games-puzzle/gnome2048-3.38.2
index a7186d0960c3..c7dcf2683fd7 100644
--- a/metadata/md5-cache/games-puzzle/gnome2048-3.38.2
+++ b/metadata/md5-cache/games-puzzle/gnome2048-3.38.2
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.42.0:2 >=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.7.1:1=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-2048/3.38/gnome-2048-3.38.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=90ce64b916b1c3ecbec898c98f2d45fe
diff --git a/metadata/md5-cache/games-puzzle/gnurobbo-0.68 b/metadata/md5-cache/games-puzzle/gnurobbo-0.68
index f1f8ec8d4906..13e53191bf0e 100644
--- a/metadata/md5-cache/games-puzzle/gnurobbo-0.68
+++ b/metadata/md5-cache/games-puzzle/gnurobbo-0.68
@@ -4,10 +4,11 @@ DEPEND=media-libs/libsdl[sound,video,joystick] media-libs/sdl-image[png] media-l
 DESCRIPTION=Robbo, a popular Atari XE/XL game ported to Linux
 EAPI=7
 HOMEPAGE=http://gnurobbo.sourceforge.net/
+INHERIT=desktop toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 BitstreamVera
 RDEPEND=media-libs/libsdl[sound,video,joystick] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf
 SLOT=0
 SRC_URI=mirror://sourceforge/gnurobbo/gnurobbo-0.68-source.tar.gz https://salsa.debian.org/games-team/gnurobbo/-/raw/debian/0.68+dfsg-5/debian/patches/single-variable-declarations.patch?inline=false -> gnurobbo-0.68-single-variable-declarations.patch
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ecf152afbfa4780c409e4956a18077dc
diff --git a/metadata/md5-cache/games-puzzle/gottet-1.1.9 b/metadata/md5-cache/games-puzzle/gottet-1.1.9
index 264f69729b88..669e7581770e 100644
--- a/metadata/md5-cache/games-puzzle/gottet-1.1.9
+++ b/metadata/md5-cache/games-puzzle/gottet-1.1.9
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://gottcode.org/gottet/gottet-1.1.9-src.tar.bz2
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=9eacf914a17ca5d83543fa73d0d9ce5a
diff --git a/metadata/md5-cache/games-puzzle/greedy-0.2.0-r2 b/metadata/md5-cache/games-puzzle/greedy-0.2.0-r2
index 6052089cd4dd..232753220e0e 100644
--- a/metadata/md5-cache/games-puzzle/greedy-0.2.0-r2
+++ b/metadata/md5-cache/games-puzzle/greedy-0.2.0-r2
@@ -4,10 +4,11 @@ DEPEND=sys-libs/ncurses:0=
 DESCRIPTION=fun little ncurses puzzle game
 EAPI=7
 HOMEPAGE=http://www.kotinet.com/juhamattin/linux/index.html
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=http://www.kotinet.com/juhamattin/linux/download/greedy-0.2.0.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=c49723e7334c74dd78ef1ddf5454b6bf
diff --git a/metadata/md5-cache/games-puzzle/groundhog-1.4-r1 b/metadata/md5-cache/games-puzzle/groundhog-1.4-r1
index de92d41adf31..c2c3d11c8f09 100644
--- a/metadata/md5-cache/games-puzzle/groundhog-1.4-r1
+++ b/metadata/md5-cache/games-puzzle/groundhog-1.4-r1
@@ -4,11 +4,12 @@ DEPEND=x11-libs/gtk+:2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-dev
 DESCRIPTION=Put the balls in the pockets of the same color by manipulating a maze of tubes
 EAPI=7
 HOMEPAGE=http://home-2.consunet.nl/~cb007736/groundhog.html
+INHERIT=autotools desktop
 IUSE=nls
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=http://home-2.consunet.nl/~cb007736/groundhog-1.4.tar.gz mirror://debian/pool/main/g/groundhog/groundhog_1.4-9.diff.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7cc64c76884a406623984957ddf271ef
diff --git a/metadata/md5-cache/games-puzzle/gtkballs-3.1.5-r2 b/metadata/md5-cache/games-puzzle/gtkballs-3.1.5-r2
index 2aba5bf6f8c8..58c4548b575d 100644
--- a/metadata/md5-cache/games-puzzle/gtkballs-3.1.5-r2
+++ b/metadata/md5-cache/games-puzzle/gtkballs-3.1.5-r2
@@ -3,11 +3,12 @@ DEPEND=x11-libs/gtk+:2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( >=sys-d
 DESCRIPTION=An entertaining game based on the old DOS game lines
 EAPI=6
 HOMEPAGE=http://gtkballs.antex.ru/
+INHERIT=desktop
 IUSE=nls
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=http://gtkballs.antex.ru/dist/gtkballs-3.1.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
 _md5_=73c20bf967cb11593ef98ecc9a728a01
diff --git a/metadata/md5-cache/games-puzzle/gweled-0.9.1-r2 b/metadata/md5-cache/games-puzzle/gweled-0.9.1-r2
index 265d5ac78239..0dd70059b6ad 100644
--- a/metadata/md5-cache/games-puzzle/gweled-0.9.1-r2
+++ b/metadata/md5-cache/games-puzzle/gweled-0.9.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 media-libs/libmikmod gnome-base/librsvg:2
 SLOT=0
 SRC_URI=https://launchpad.net/gweled/trunk/0.9.1/+download/gweled-0.9.1.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=1c9b35f160ff6c6abe81faf6ab5d394c
diff --git a/metadata/md5-cache/games-puzzle/hangman-0.9.2-r1 b/metadata/md5-cache/games-puzzle/hangman-0.9.2-r1
index d7bf67e20a64..5ab9ddc56f37 100644
--- a/metadata/md5-cache/games-puzzle/hangman-0.9.2-r1
+++ b/metadata/md5-cache/games-puzzle/hangman-0.9.2-r1
@@ -3,10 +3,11 @@ DEPEND=!games-misc/bsd-games media-libs/libsdl media-libs/sdl-mixer media-libs/s
 DESCRIPTION=The classic word guessing game
 EAPI=6
 HOMEPAGE=http://www.shiftygames.com/hangman/hangman.html
+INHERIT=desktop
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=!games-misc/bsd-games media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-image media-libs/sdl-ttf sys-apps/miscfiles
 SLOT=0
 SRC_URI=http://www.shiftygames.com/hangman/hangman-0.9.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
 _md5_=ee3bcaf5cbb1c580b0fd4fdf851f1629
diff --git a/metadata/md5-cache/games-puzzle/hexalate-1.1.6 b/metadata/md5-cache/games-puzzle/hexalate-1.1.6
index 909e639b7c4b..75c33edaf535 100644
--- a/metadata/md5-cache/games-puzzle/hexalate-1.1.6
+++ b/metadata/md5-cache/games-puzzle/hexalate-1.1.6
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://gottcode.org/hexalate/hexalate-1.1.6-src.tar.bz2
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=e80268b6e0c8ee98741a81196eeaa165
diff --git a/metadata/md5-cache/games-puzzle/hitori-3.38.3 b/metadata/md5-cache/games-puzzle/hitori-3.38.3
index bca7ee7eb690..d2c08a2d9bc2 100644
--- a/metadata/md5-cache/games-puzzle/hitori-3.38.3
+++ b/metadata/md5-cache/games-puzzle/hitori-3.38.3
@@ -10,5 +10,5 @@ LICENSE=GPL-3+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.22.0:3 >=x11-libs/cairo-1.4
 SLOT=0
 SRC_URI=mirror://gnome/sources/hitori/3.38/hitori-3.38.3.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=19695ec2e63bb275b68530003b1fd2a6
diff --git a/metadata/md5-cache/games-puzzle/icebreaker-1.9.6-r1 b/metadata/md5-cache/games-puzzle/icebreaker-1.9.6-r1
index 8f0f10715863..32f9bbdc977d 100644
--- a/metadata/md5-cache/games-puzzle/icebreaker-1.9.6-r1
+++ b/metadata/md5-cache/games-puzzle/icebreaker-1.9.6-r1
@@ -3,10 +3,11 @@ DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer
 DESCRIPTION=Trap and capture penguins on Antarctica
 EAPI=6
 HOMEPAGE=http://www.mattdm.org/icebreaker/
+INHERIT=desktop
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer
 SLOT=0
 SRC_URI=http://www.mattdm.org/icebreaker/1.9.x/icebreaker-1.9.6.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
 _md5_=bb9cb78444bbc02e6ae914bf81ccd920
diff --git a/metadata/md5-cache/games-puzzle/ksokoban-0.5.0_pre20210905 b/metadata/md5-cache/games-puzzle/ksokoban-0.5.0_pre20210905
index 947fde9a278f..396629688658 100644
--- a/metadata/md5-cache/games-puzzle/ksokoban-0.5.0_pre20210905
+++ b/metadata/md5-cache/games-puzzle/ksokoban-0.5.0_pre20210905
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 dev-qt/qtcore:5
 DESCRIPTION=The Japanese warehouse keeper game
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=0
 SRC_URI=https://invent.kde.org/kde/ksokoban/-/archive/39b9d1c1702a21a6e0fae82876c29c1f6bb77fae/ksokoban-39b9d1c1702a21a6e0fae82876c29c1f6bb77fae.tar.gz -> ksokoban-0.5.0_pre20210905-39b9d1c1.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1161df28793c4d9c9b75edee6f51cad2
diff --git a/metadata/md5-cache/games-puzzle/ksokoban-9999 b/metadata/md5-cache/games-puzzle/ksokoban-9999
index 6048a840b85b..adf6bcd54a42 100644
--- a/metadata/md5-cache/games-puzzle/ksokoban-9999
+++ b/metadata/md5-cache/games-puzzle/ksokoban-9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.82.0:5 ) >=kde-frameworks/extra-cmake-modules-5.82.0:5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
 DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 dev-qt/qtcore:5
 DESCRIPTION=The Japanese warehouse keeper game
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.82.0:5 >=kde-frameworks/kcoreaddons-5.82.0:5 >=kde-frameworks/ki18n-5.82.0:5 >=kde-frameworks/kio-5.82.0:5 >=kde-frameworks/kwidgetsaddons-5.82.0:5 >=kde-frameworks/kxmlgui-5.82.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=0
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c656cec73a057ff83b3269aa996654d9
diff --git a/metadata/md5-cache/games-puzzle/lightsoff-40.0.1 b/metadata/md5-cache/games-puzzle/lightsoff-40.0.1
index 8dfea47dc135..e55b7592dce3 100644
--- a/metadata/md5-cache/games-puzzle/lightsoff-40.0.1
+++ b/metadata/md5-cache/games-puzzle/lightsoff-40.0.1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.38.0:2 >=x11-libs/gtk+-3.24.0:3 >=gnome-base/librsvg-2.32.0:2
 SLOT=0
 SRC_URI=mirror://gnome/sources/lightsoff/40/lightsoff-40.0.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=004a3283a116caea60d80df510dd411b
diff --git a/metadata/md5-cache/games-puzzle/lmarbles-1.0.8-r2 b/metadata/md5-cache/games-puzzle/lmarbles-1.0.8-r2
index 19a590adbf3c..cd5c6be9d5fb 100644
--- a/metadata/md5-cache/games-puzzle/lmarbles-1.0.8-r2
+++ b/metadata/md5-cache/games-puzzle/lmarbles-1.0.8-r2
@@ -3,10 +3,11 @@ DEPEND=acct-group/gamestat media-libs/libsdl[sound,video] media-libs/sdl-mixer
 DESCRIPTION=Puzzle game inspired by Atomix and written in SDL
 EAPI=8
 HOMEPAGE=https://lgames.sourceforge.io/LMarbles/
+INHERIT=desktop
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=acct-group/gamestat media-libs/libsdl[sound,video] media-libs/sdl-mixer
 SLOT=0
 SRC_URI=https://download.sourceforge.net/lgames/lmarbles-1.0.8.tar.gz https://dev.gentoo.org/~ionen/distfiles/lmarbles.png
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
 _md5_=8738263373f1a9ce17bbc1188ed5a60d
diff --git a/metadata/md5-cache/games-puzzle/lpairs-1.0.5 b/metadata/md5-cache/games-puzzle/lpairs-1.0.5
index 561cc3a96dcc..9f638f1cb9ef 100644
--- a/metadata/md5-cache/games-puzzle/lpairs-1.0.5
+++ b/metadata/md5-cache/games-puzzle/lpairs-1.0.5
@@ -4,11 +4,12 @@ DEPEND=media-libs/libsdl[sound?,video] virtual/libintl
 DESCRIPTION=Classic memory game
 EAPI=8
 HOMEPAGE=https://lgames.sourceforge.io/LPairs/
+INHERIT=desktop
 IUSE=+sound
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=media-libs/libsdl[sound?,video] virtual/libintl
 SLOT=0
 SRC_URI=mirror://sourceforge/lgames/lpairs-1.0.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
 _md5_=31ee11a1c918c8226f90c8b5a98aea3e
diff --git a/metadata/md5-cache/games-puzzle/ltris-1.0.19-r1 b/metadata/md5-cache/games-puzzle/ltris-1.0.19-r1
index 4192630e23bf..73cee5f99d47 100644
--- a/metadata/md5-cache/games-puzzle/ltris-1.0.19-r1
+++ b/metadata/md5-cache/games-puzzle/ltris-1.0.19-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/lgames/ltris-1.0.19.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=590302128a9702c3741afbfbf4914ae4
diff --git a/metadata/md5-cache/games-puzzle/magiccube4d-2.2-r1 b/metadata/md5-cache/games-puzzle/magiccube4d-2.2-r1
index d7b39db039b2..0af07e5dc73c 100644
--- a/metadata/md5-cache/games-puzzle/magiccube4d-2.2-r1
+++ b/metadata/md5-cache/games-puzzle/magiccube4d-2.2-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libXaw
 DESCRIPTION=Four-dimensional analog of Rubik's cube
 EAPI=6
 HOMEPAGE=http://www.superliminal.com/cube/cube.htm
+INHERIT=desktop
 KEYWORDS=~amd64 ~x86
 LICENSE=free-noncomm
 RDEPEND=x11-libs/libXaw
 SLOT=0
 SRC_URI=http://www.superliminal.com/cube/mc4d-src-2_2.tgz http://superliminal.com/cube/cube_transp.gif -> magiccube4d.gif
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
 _md5_=e214163ade0cde5381a80522bb08f8b2
diff --git a/metadata/md5-cache/games-puzzle/meandmyshadow-0.5a b/metadata/md5-cache/games-puzzle/meandmyshadow-0.5a
index 5736dc2796e6..beb4960c6259 100644
--- a/metadata/md5-cache/games-puzzle/meandmyshadow-0.5a
+++ b/metadata/md5-cache/games-puzzle/meandmyshadow-0.5a
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) app-arch/libarchive:= media-libs/libsdl2[sound,video] media-libs/sdl2-image[jpeg,png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-ttf net-misc/curl[ssl] dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Puzzle/platform game with a player and its shadow
@@ -12,5 +12,5 @@ RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4?
 REQUIRED_USE=^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/meandmyshadow/0.5a/meandmyshadow-0.5a-src.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=8ab1dc385d9b8c11bda80737eec2d665
diff --git a/metadata/md5-cache/games-puzzle/mindless-1.6-r1 b/metadata/md5-cache/games-puzzle/mindless-1.6-r1
index ccd322123812..25cf7c4834a1 100644
--- a/metadata/md5-cache/games-puzzle/mindless-1.6-r1
+++ b/metadata/md5-cache/games-puzzle/mindless-1.6-r1
@@ -3,11 +3,12 @@ DEPEND=x11-libs/gtk+:2 media-fonts/font-schumacher-misc gnome-base/librsvg:2 vir
 DESCRIPTION=Play trading card games (Magic: the Gathering etc.) against other people
 EAPI=6
 HOMEPAGE=http://mindless.sourceforge.net/
+INHERIT=desktop readme.gentoo-r1
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:2 media-fonts/font-schumacher-misc
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://sourceforge/mindless/mindless-1.6.tar.gz http://www.wizards.com/dci/oracle/OracleAll_050523.txt http://mindless.sourceforge.net/images/logo.png -> mindless.png
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
 _md5_=27140614cc9cf4cccdb3d4fe45d8994f
diff --git a/metadata/md5-cache/games-puzzle/mirrormagic-2.0.2-r2 b/metadata/md5-cache/games-puzzle/mirrormagic-2.0.2-r2
index 435901a06607..0fd0791beb17 100644
--- a/metadata/md5-cache/games-puzzle/mirrormagic-2.0.2-r2
+++ b/metadata/md5-cache/games-puzzle/mirrormagic-2.0.2-r2
@@ -3,11 +3,12 @@ DEPEND=!sdl? ( x11-libs/libX11 ) sdl? ( media-libs/libsdl[video] media-libs/sdl-
 DESCRIPTION=A game like Deflektor (C 64) or Mindbender (Amiga)
 EAPI=6
 HOMEPAGE=https://www.artsoft.org/mirrormagic/
+INHERIT=desktop toolchain-funcs
 IUSE=sdl
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=!sdl? ( x11-libs/libX11 ) sdl? ( media-libs/libsdl[video] media-libs/sdl-mixer media-libs/sdl-image )
 SLOT=0
 SRC_URI=https://www.artsoft.org/RELEASES/unix/mirrormagic/mirrormagic-2.0.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=73634a1bf8744f106cfc9c58e2551476
diff --git a/metadata/md5-cache/games-puzzle/monsterz-0.7.1_p12 b/metadata/md5-cache/games-puzzle/monsterz-0.7.1_p12
index 77afb81f4253..ba27253c09c4 100644
--- a/metadata/md5-cache/games-puzzle/monsterz-0.7.1_p12
+++ b/metadata/md5-cache/games-puzzle/monsterz-0.7.1_p12
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) p
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=http://sam.zoy.org/projects/monsterz/monsterz-0.7.1.tar.gz mirror://debian/pool/main/m/monsterz/monsterz_0.7.1-12.debian.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=9e0d0533914eca71f1b5a08de0574ba6
diff --git a/metadata/md5-cache/games-puzzle/mures-0.5-r2 b/metadata/md5-cache/games-puzzle/mures-0.5-r2
index dd1d9187750b..eec1649a1d1a 100644
--- a/metadata/md5-cache/games-puzzle/mures-0.5-r2
+++ b/metadata/md5-cache/games-puzzle/mures-0.5-r2
@@ -4,11 +4,12 @@ DEPEND=media-libs/libsdl[joystick] media-libs/sdl-image media-libs/sdl-net media
 DESCRIPTION=A clone of Sega's Chu Chu Rocket
 EAPI=7
 HOMEPAGE=http://mures.sourceforge.net/
+INHERIT=autotools desktop
 IUSE=opengl
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[joystick] media-libs/sdl-image media-libs/sdl-net media-libs/sdl-ttf opengl? ( virtual/opengl )
 SLOT=0
 SRC_URI=mirror://sourceforge/mures/mures-0.5.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d83438a90b61fe8d34ce22ea79565876
diff --git a/metadata/md5-cache/games-puzzle/neverball-1.6.0-r1 b/metadata/md5-cache/games-puzzle/neverball-1.6.0-r1
index cbe3a0eea5ed..15934341ffbc 100644
--- a/metadata/md5-cache/games-puzzle/neverball-1.6.0-r1
+++ b/metadata/md5-cache/games-puzzle/neverball-1.6.0-r1
@@ -4,6 +4,7 @@ DEPEND=dev-games/physfs media-libs/libpng:= media-libs/libsdl2[joystick,opengl,s
 DESCRIPTION=Clone of Super Monkey Ball using SDL/OpenGL
 EAPI=7
 HOMEPAGE=https://neverball.org
+INHERIT=desktop eapi8-dosym toolchain-funcs xdg
 IUSE=nls
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ IJG
@@ -11,5 +12,5 @@ RDEPEND=dev-games/physfs media-libs/libpng:= media-libs/libsdl2[joystick,opengl,
 RESTRICT=test
 SLOT=0
 SRC_URI=https://neverball.org/neverball-1.6.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=9003c7ac0897478e21be39ae9486daf4
diff --git a/metadata/md5-cache/games-puzzle/nightsky-20111222-r1 b/metadata/md5-cache/games-puzzle/nightsky-20111222-r1
index a84d55508640..9bec0042c434 100644
--- a/metadata/md5-cache/games-puzzle/nightsky-20111222-r1
+++ b/metadata/md5-cache/games-puzzle/nightsky-20111222-r1
@@ -2,6 +2,7 @@ DEFINED_PHASES=install nofetch postinst prepare
 DESCRIPTION=Puzzle game that puts you inside and ambient and mysterious universe
 EAPI=8
 HOMEPAGE=http://www.nicalis.com/nightsky/
+INHERIT=desktop
 IUSE=bundled-libs
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=all-rights-reserved
@@ -9,5 +10,5 @@ RDEPEND=virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/lib
 RESTRICT=bindist fetch
 SLOT=0
 SRC_URI=nightskyhd-linux-1324519044.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
 _md5_=fef0ec44ddc33400263a694b47654d59
diff --git a/metadata/md5-cache/games-puzzle/nudoku-2.1.0 b/metadata/md5-cache/games-puzzle/nudoku-2.1.0
index 9d4d1e3a329d..72b34c12a275 100644
--- a/metadata/md5-cache/games-puzzle/nudoku-2.1.0
+++ b/metadata/md5-cache/games-puzzle/nudoku-2.1.0
@@ -2,13 +2,14 @@ BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815
 DEFINED_PHASES=configure prepare
 DEPEND=cairo? ( x11-libs/cairo ) >=sys-devel/gettext-0.20 sys-libs/ncurses:= virtual/libintl
 DESCRIPTION=ncurses based sudoku game
-EAPI=7
+EAPI=8
 HOMEPAGE=https://jubalh.github.io/nudoku/
+INHERIT=autotools
 IUSE=cairo
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=cairo? ( x11-libs/cairo ) >=sys-devel/gettext-0.20 sys-libs/ncurses:= virtual/libintl
 SLOT=0
 SRC_URI=https://github.com/jubalh/nudoku/archive/2.1.0.tar.gz -> nudoku-2.1.0.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=9099181fb998316d7fdc1152107e1b84
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
+_md5_=a7e0c0d4b49db3b68ce4131da3bb98a8
diff --git a/metadata/md5-cache/games-puzzle/numptyphysics-0.3.8 b/metadata/md5-cache/games-puzzle/numptyphysics-0.3.8
index 396054f3710c..f42daa877d03 100644
--- a/metadata/md5-cache/games-puzzle/numptyphysics-0.3.8
+++ b/metadata/md5-cache/games-puzzle/numptyphysics-0.3.8
@@ -4,10 +4,11 @@ DEPEND=dev-libs/glib:2 media-libs/libsdl2[opengl,video] media-libs/sdl2-image[pn
 DESCRIPTION=Crayon Physics-like drawing puzzle game using the same excellent Box2D engine
 EAPI=7
 HOMEPAGE=https://github.com/thp/numptyphysics
+INHERIT=toolchain-funcs xdg
 KEYWORDS=~amd64
 LICENSE=BSD GPL-3+ ZLIB
 RDEPEND=dev-libs/glib:2 media-libs/libsdl2[opengl,video] media-libs/sdl2-image[png] media-libs/sdl2-ttf virtual/opengl
 SLOT=0
 SRC_URI=https://github.com/thp/numptyphysics/archive/0.3.8.tar.gz -> numptyphysics-0.3.8.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=b87ec5adada6cc2f0092c091486532d2
diff --git a/metadata/md5-cache/games-puzzle/numptyphysics-9999 b/metadata/md5-cache/games-puzzle/numptyphysics-9999
index c19bee0b7e1e..4cab94902d9b 100644
--- a/metadata/md5-cache/games-puzzle/numptyphysics-9999
+++ b/metadata/md5-cache/games-puzzle/numptyphysics-9999
@@ -4,9 +4,10 @@ DEPEND=dev-libs/glib:2 media-libs/libsdl2[opengl,video] media-libs/sdl2-image[pn
 DESCRIPTION=Crayon Physics-like drawing puzzle game using the same excellent Box2D engine
 EAPI=7
 HOMEPAGE=https://github.com/thp/numptyphysics
+INHERIT=toolchain-funcs xdg git-r3
 LICENSE=BSD GPL-3+ ZLIB
 PROPERTIES=live
 RDEPEND=dev-libs/glib:2 media-libs/libsdl2[opengl,video] media-libs/sdl2-image[png] media-libs/sdl2-ttf virtual/opengl
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=8813e05b5b1a657895ef91baba9bef80
diff --git a/metadata/md5-cache/games-puzzle/pathological-1.1.3_p16-r3 b/metadata/md5-cache/games-puzzle/pathological-1.1.3_p16-r3
index a3e5961333c1..748f07826d7b 100644
--- a/metadata/md5-cache/games-puzzle/pathological-1.1.3_p16-r3
+++ b/metadata/md5-cache/games-puzzle/pathological-1.1.3_p16-r3
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) p
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pathological/pathological-1.1.3.tar.gz mirror://debian/pool/main/p/pathological/pathological_1.1.3-16.debian.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=3f983f582a74d2a13a164c52e68ac525
diff --git a/metadata/md5-cache/games-puzzle/pauker-1.8-r2 b/metadata/md5-cache/games-puzzle/pauker-1.8-r2
index f1680e181867..135569c6d981 100644
--- a/metadata/md5-cache/games-puzzle/pauker-1.8-r2
+++ b/metadata/md5-cache/games-puzzle/pauker-1.8-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-java/browserlauncher2:1.0 dev-java/javahelp dev-java/lucene:2.4 dev-java/swing-layout:1 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://sourceforge/pauker/pauker-1.8.src.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	cfb5f6911bb70204c94ceafd0372c716	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=242fa61e2fb0968f7b75948ce85f9aff
diff --git a/metadata/md5-cache/games-puzzle/penguzzle-1.0-r2 b/metadata/md5-cache/games-puzzle/penguzzle-1.0-r2
index 1f9582af46ae..93df5cecc2dc 100644
--- a/metadata/md5-cache/games-puzzle/penguzzle-1.0-r2
+++ b/metadata/md5-cache/games-puzzle/penguzzle-1.0-r2
@@ -3,10 +3,11 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Tcl/Tk variant of the well-known 15-puzzle game
 EAPI=7
 HOMEPAGE=http://www.naskita.com/linux/penguzzle/penguzzle.shtml
+INHERIT=desktop
 KEYWORDS=~amd64 ~x86
 LICENSE=penguzzle
 RDEPEND=dev-lang/tk:0= dev-tcltk/tclx
 SLOT=0
 SRC_URI=http://www.naskita.com/linux/penguzzle/penguzzle.zip -> penguzzle-1.0.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
 _md5_=db29e45d020ed6e55e4f06e92a16dacc
diff --git a/metadata/md5-cache/games-puzzle/picpuz-2.5-r1 b/metadata/md5-cache/games-puzzle/picpuz-2.5-r1
index 46b519b91e4c..7a096e758688 100644
--- a/metadata/md5-cache/games-puzzle/picpuz-2.5-r1
+++ b/metadata/md5-cache/games-puzzle/picpuz-2.5-r1
@@ -4,10 +4,11 @@ DEPEND=x11-libs/gtk+:3
 DESCRIPTION=Jigsaw puzzle program
 EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=desktop flag-o-matic toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=x11-libs/gtk+:3
 SLOT=0
 SRC_URI=mirror://gentoo/picpuz-2.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=6ba749395008aa219d26a628152db40d
diff --git a/metadata/md5-cache/games-puzzle/pingus-0.7.6-r3 b/metadata/md5-cache/games-puzzle/pingus-0.7.6-r3
index 96e802d71cd3..b94d6eb5f2aa 100644
--- a/metadata/md5-cache/games-puzzle/pingus-0.7.6-r3
+++ b/metadata/md5-cache/games-puzzle/pingus-0.7.6-r3
@@ -11,5 +11,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/libsdl[joystick,opengl?,video] media-libs/sdl-image[png] media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mod] ) opengl? ( virtual/opengl ) media-libs/libpng:0= dev-libs/boost:=
 SLOT=0
 SRC_URI=https://pingus.googlecode.com/files/pingus-0.7.6.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	scons-utils	c30e32d0d48c308fe47706846020fdfa	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	a3e9c0524a795d7f2767a2cf12a2e8c0	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	scons-utils	c30e32d0d48c308fe47706846020fdfa	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=26dc1c68ca282b2a589b63e19ae3ebe0
diff --git a/metadata/md5-cache/games-puzzle/pingus-9999 b/metadata/md5-cache/games-puzzle/pingus-9999
index 166e3d16c97a..d8be55ddd32b 100644
--- a/metadata/md5-cache/games-puzzle/pingus-9999
+++ b/metadata/md5-cache/games-puzzle/pingus-9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
 DEPEND=dev-libs/jsoncpp:= dev-libs/libfmt:= dev-libs/libsigc++:2 media-libs/libmodplug media-libs/libpng:= media-libs/libsdl2[joystick,opengl,video] media-libs/libvorbis media-libs/openal media-libs/opusfile media-libs/sdl2-image[jpeg,png] media-sound/mpg123 virtual/opengl dev-libs/boost media-libs/glm dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Free Lemmings clone
@@ -9,5 +9,5 @@ LICENSE=GPL-3+
 PROPERTIES=live
 RDEPEND=dev-libs/jsoncpp:= dev-libs/libfmt:= dev-libs/libsigc++:2 media-libs/libmodplug media-libs/libpng:= media-libs/libsdl2[joystick,opengl,video] media-libs/libvorbis media-libs/openal media-libs/opusfile media-libs/sdl2-image[jpeg,png] media-sound/mpg123 virtual/opengl
 SLOT=0
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=31d39edb3da30d76cde3d363a1b0d4bb
diff --git a/metadata/md5-cache/games-puzzle/pipepanic-0.1.3-r3 b/metadata/md5-cache/games-puzzle/pipepanic-0.1.3-r3
index 1f777e801a06..0d58a8cc7825 100644
--- a/metadata/md5-cache/games-puzzle/pipepanic-0.1.3-r3
+++ b/metadata/md5-cache/games-puzzle/pipepanic-0.1.3-r3
@@ -3,10 +3,11 @@ DEPEND=media-libs/libsdl[video]
 DESCRIPTION=A simple pipe connecting game
 EAPI=6
 HOMEPAGE=http://www.users.waitrose.com/~thunor/pipepanic/
+INHERIT=desktop
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ Free-Art-1.2
 RDEPEND=media-libs/libsdl[video]
 SLOT=0
 SRC_URI=http://www.users.waitrose.com/~thunor/pipepanic/dload/pipepanic-0.1.3-source.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
 _md5_=f3cc88d2144585201185a7f08784b428
diff --git a/metadata/md5-cache/games-puzzle/pipewalker-0.9.4-r2 b/metadata/md5-cache/games-puzzle/pipewalker-0.9.4-r2
index f21b73c913f3..a4cc8a502a1e 100644
--- a/metadata/md5-cache/games-puzzle/pipewalker-0.9.4-r2
+++ b/metadata/md5-cache/games-puzzle/pipewalker-0.9.4-r2
@@ -4,10 +4,11 @@ DEPEND=media-libs/libpng:= media-libs/libsdl[opengl,sound,video] virtual/opengl
 DESCRIPTION=Rotating pieces puzzle game
 EAPI=8
 HOMEPAGE=http://pipewalker.sourceforge.net/
+INHERIT=autotools desktop flag-o-matic toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=media-libs/libpng:= media-libs/libsdl[opengl,sound,video] virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/pipewalker/pipewalker-0.9.4.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=29758c959e7cae5fa896556d91631ecd
diff --git a/metadata/md5-cache/games-puzzle/quadra-1.3.0 b/metadata/md5-cache/games-puzzle/quadra-1.3.0
index f89ea740244e..e754798aa010 100644
--- a/metadata/md5-cache/games-puzzle/quadra-1.3.0
+++ b/metadata/md5-cache/games-puzzle/quadra-1.3.0
@@ -4,10 +4,11 @@ DEPEND=dev-libs/boost:= media-libs/libpng:= media-libs/libsdl2[sound,video] sys-
 DESCRIPTION=Tetris clone with multiplayer support
 EAPI=8
 HOMEPAGE=https://github.com/quadra-game/quadra
+INHERIT=autotools desktop
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/boost:= media-libs/libpng:= media-libs/libsdl2[sound,video] sys-libs/zlib
 SLOT=0
 SRC_URI=https://github.com/quadra-game/quadra/archive/v1.3.0.tar.gz -> quadra-1.3.0.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=dabd799b380604974d45f300b3a1b0c5
diff --git a/metadata/md5-cache/games-puzzle/quadrapassel-40.2 b/metadata/md5-cache/games-puzzle/quadrapassel-40.2
index f4a7a87e903f..d13d4744076c 100644
--- a/metadata/md5-cache/games-puzzle/quadrapassel-40.2
+++ b/metadata/md5-cache/games-puzzle/quadrapassel-40.2
@@ -10,5 +10,5 @@ LICENSE=GPL-2+ CC-BY-SA-3.0
 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
 SLOT=0
 SRC_URI=mirror://gnome/sources/quadrapassel/40/quadrapassel-40.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=51b26fac172b44523e18da593a4b4f2c
diff --git a/metadata/md5-cache/games-puzzle/rezerwar-0.4.2-r2 b/metadata/md5-cache/games-puzzle/rezerwar-0.4.2-r2
index f6bf8ac7095e..ef0ca6ea1b1d 100644
--- a/metadata/md5-cache/games-puzzle/rezerwar-0.4.2-r2
+++ b/metadata/md5-cache/games-puzzle/rezerwar-0.4.2-r2
@@ -3,10 +3,11 @@ DEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-mixer[vorbis]
 DESCRIPTION=Puzzle game like the known tetromino and the average pipe games
 EAPI=7
 HOMEPAGE=https://tamentis.com/projects/rezerwar/
+INHERIT=desktop toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-mixer[vorbis]
 SLOT=0
 SRC_URI=https://tamentis.com/projects/rezerwar/files/rezerwar-0.4.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=67bde81bddf5ec1f76b4892e607efb25
diff --git a/metadata/md5-cache/games-puzzle/scramble-0.9.5-r1 b/metadata/md5-cache/games-puzzle/scramble-0.9.5-r1
index 6b8944559c96..e9abfbfec738 100644
--- a/metadata/md5-cache/games-puzzle/scramble-0.9.5-r1
+++ b/metadata/md5-cache/games-puzzle/scramble-0.9.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=media-libs/libsdl-1.2[sound,video] >=media-libs/sdl-mixer-1.2[vorbis] >=media-libs/sdl-image-1.2[png] media-libs/sdl-ttf
 SLOT=0
 SRC_URI=http://www.shiftygames.com/scramble/scramble-0.9.5.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=22c7f934147e914c51c80fae8418f85f
diff --git a/metadata/md5-cache/games-puzzle/sdl-jewels-1.1.1-r1 b/metadata/md5-cache/games-puzzle/sdl-jewels-1.1.1-r1
index 101bd1611020..841e6e8ae2b7 100644
--- a/metadata/md5-cache/games-puzzle/sdl-jewels-1.1.1-r1
+++ b/metadata/md5-cache/games-puzzle/sdl-jewels-1.1.1-r1
@@ -3,11 +3,12 @@ DEPEND=media-libs/libsdl[opengl,video] virtual/opengl
 DESCRIPTION=Swap and match 3 or more jewels in a line in order to score points
 EAPI=6
 HOMEPAGE=http://www.linuxmotors.com/gljewel/
+INHERIT=desktop vcs-clean
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[opengl,video] virtual/opengl
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.linuxmotors.com/gljewel/downloads/SDL_jewels-1.1.1.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3
 _md5_=add4b9d26537ab66f22c9995879e93d3
diff --git a/metadata/md5-cache/games-puzzle/seatris-0.0.14-r2 b/metadata/md5-cache/games-puzzle/seatris-0.0.14-r2
index 31d52db350de..3477446e5bd9 100644
--- a/metadata/md5-cache/games-puzzle/seatris-0.0.14-r2
+++ b/metadata/md5-cache/games-puzzle/seatris-0.0.14-r2
@@ -4,10 +4,11 @@ DEPEND=sys-libs/ncurses:=
 DESCRIPTION=A color ncurses tetris clone
 EAPI=7
 HOMEPAGE=http://www.earth.li/projectpurple/progs/seatris.html
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:= acct-group/gamestat
 SLOT=0
 SRC_URI=http://www.earth.li/projectpurple/files/seatris-0.0.14.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=dfa1bec358fd7606bfa8186291a98d26
diff --git a/metadata/md5-cache/games-puzzle/sgt-puzzles-20190415 b/metadata/md5-cache/games-puzzle/sgt-puzzles-20190415
index 8a526a7f5157..5de8933389ce 100644
--- a/metadata/md5-cache/games-puzzle/sgt-puzzles-20190415
+++ b/metadata/md5-cache/games-puzzle/sgt-puzzles-20190415
@@ -4,11 +4,12 @@ DEPEND=x11-libs/gtk+:3
 DESCRIPTION=Simon Tatham's Portable Puzzle Collection
 EAPI=7
 HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/puzzles/
+INHERIT=autotools desktop toolchain-funcs xdg-utils
 IUSE=+doc
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=x11-libs/gtk+:3 x11-misc/xdg-utils
 SLOT=0
 SRC_URI=https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-20190415.e2135d5.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=df60939a6da20d72f40067742f124759
diff --git a/metadata/md5-cache/games-puzzle/splice-20121120-r2 b/metadata/md5-cache/games-puzzle/splice-20121120-r2
index cf4f9002481a..b10d819c0951 100644
--- a/metadata/md5-cache/games-puzzle/splice-20121120-r2
+++ b/metadata/md5-cache/games-puzzle/splice-20121120-r2
@@ -2,11 +2,12 @@ DEFINED_PHASES=install nofetch prepare
 DESCRIPTION=An experimental and artistic puzzler set in a microbial world
 EAPI=7
 HOMEPAGE=http://www.cipherprime.com/games/splice/
+INHERIT=desktop wrapper
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=all-rights-reserved
 RDEPEND=virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext
 RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=splice-linux-1353389454.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=b6dc94ee286f56159a8f11512d845f3d
diff --git a/metadata/md5-cache/games-puzzle/swell-foop-41.0.1 b/metadata/md5-cache/games-puzzle/swell-foop-41.0.1
deleted file mode 100644
index 8fa8d0f279ba..000000000000
--- a/metadata/md5-cache/games-puzzle/swell-foop-41.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-libs/appstream-glib dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig || ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 ) app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=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= dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Clear the screen by removing groups of colored and shaped tiles
-EAPI=7
-HOMEPAGE=https://wiki.gnome.org/Apps/Swell%20Foop
-INHERIT=gnome.org gnome2-utils meson vala xdg
-KEYWORDS=amd64 ~arm arm64 ~riscv x86
-LICENSE=GPL-2+ FDL-1.1+
-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=
-SLOT=0
-SRC_URI=mirror://gnome/sources/swell-foop/41/swell-foop-41.0.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d5e741569340476c58cf1fcb4dbdfc66
diff --git a/metadata/md5-cache/games-puzzle/swell-foop-41.1 b/metadata/md5-cache/games-puzzle/swell-foop-41.1
index 7ec989abb117..50ee21d4e9bf 100644
--- a/metadata/md5-cache/games-puzzle/swell-foop-41.1
+++ b/metadata/md5-cache/games-puzzle/swell-foop-41.1
@@ -5,10 +5,10 @@ DESCRIPTION=Clear the screen by removing groups of colored and shaped tiles
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Swell%20Foop
 INHERIT=gnome.org gnome2-utils meson vala xdg
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=GPL-2+ FDL-1.1+
 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=
 SLOT=0
 SRC_URI=mirror://gnome/sources/swell-foop/41/swell-foop-41.1.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c32d3c17d213821b3b1c6433f0e6b50f
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	648fe6a039e87233d7f48da72cadb76f	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=31413e884024f261504eada03ed5992b
diff --git a/metadata/md5-cache/games-puzzle/tanglet-1.6.1.1 b/metadata/md5-cache/games-puzzle/tanglet-1.6.1.1
index cb863b5c335c..1a00552941b6 100644
--- a/metadata/md5-cache/games-puzzle/tanglet-1.6.1.1
+++ b/metadata/md5-cache/games-puzzle/tanglet-1.6.1.1
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-libs/zlib
 SLOT=0
 SRC_URI=https://gottcode.org/tanglet/tanglet-1.6.1.1-src.tar.bz2
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=78d97d25ffec28507642cf41cae8567e
diff --git a/metadata/md5-cache/games-puzzle/tetrinet-0.11-r2 b/metadata/md5-cache/games-puzzle/tetrinet-0.11-r2
index 26761ffbb2a0..b8a4fb1dec9f 100644
--- a/metadata/md5-cache/games-puzzle/tetrinet-0.11-r2
+++ b/metadata/md5-cache/games-puzzle/tetrinet-0.11-r2
@@ -4,11 +4,12 @@ DEPEND=sys-libs/ncurses:0=
 DESCRIPTION=Console based tetrinet inc. standalone server
 EAPI=7
 HOMEPAGE=http://tetrinet.or.cz/
+INHERIT=flag-o-matic toolchain-funcs
 IUSE=ipv6
 KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=http://tetrinet.or.cz/download/tetrinet-0.11.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=a4db1f20a050da884169545d191a4cd5
diff --git a/metadata/md5-cache/games-puzzle/tint-0.03b-r1 b/metadata/md5-cache/games-puzzle/tint-0.03b-r1
index f6e4a179735a..4cca4feed91e 100644
--- a/metadata/md5-cache/games-puzzle/tint-0.03b-r1
+++ b/metadata/md5-cache/games-puzzle/tint-0.03b-r1
@@ -4,10 +4,11 @@ DEPEND=>=sys-libs/ncurses-5.4-r1:0=
 DESCRIPTION=Tint Is Not Tetris, a ncurses based clone of the original Tetris(tm) game
 EAPI=7
 HOMEPAGE=http://oasis.frogfoot.net/code/tint/
+INHERIT=toolchain-funcs
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=sys-libs/ncurses-5.4-r1:0=
 SLOT=0
 SRC_URI=http://oasis.frogfoot.net/code/tint/download/0.03b/tint_0.03b.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=059255c958fb4478101c14b2012a69e9
diff --git a/metadata/md5-cache/games-puzzle/tiny-and-big-1.4.1-r2 b/metadata/md5-cache/games-puzzle/tiny-and-big-1.4.1-r2
index 92baff9ee21d..228dc96bc2f6 100644
--- a/metadata/md5-cache/games-puzzle/tiny-and-big-1.4.1-r2
+++ b/metadata/md5-cache/games-puzzle/tiny-and-big-1.4.1-r2
@@ -3,6 +3,7 @@ DEFINED_PHASES=install nofetch prepare
 DESCRIPTION=Combines elements of adventure, jump&run and physical puzzles
 EAPI=7
 HOMEPAGE=http://www.tinyandbig.com/
+INHERIT=desktop wrapper
 IUSE=bundled-libs
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=all-rights-reserved
@@ -10,5 +11,5 @@ RDEPEND=media-libs/openal virtual/opengl x11-libs/libX11 !bundled-libs? ( media-
 RESTRICT=bindist fetch bundled-libs? ( splitdebug )
 SLOT=0
 SRC_URI=tinyandbig_grandpasleftovers-retail-linux-1.4.1_1370968537.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=57770555eddc582f86f7e54f94b798de
diff --git a/metadata/md5-cache/games-puzzle/tod-0-r3 b/metadata/md5-cache/games-puzzle/tod-0-r3
index 412eb2f2ae37..5ef1555e282d 100644
--- a/metadata/md5-cache/games-puzzle/tod-0-r3
+++ b/metadata/md5-cache/games-puzzle/tod-0-r3
@@ -3,10 +3,11 @@ DEPEND=media-libs/allegro:0[X] app-arch/unzip
 DESCRIPTION=Tetanus On Drugs simulates playing Tetris under the influence of drugs
 EAPI=7
 HOMEPAGE=http://www.pineight.com/tod/
+INHERIT=desktop toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/allegro:0[X]
 SLOT=0
 SRC_URI=http://www.pineight.com/pc/wintod.zip
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=f894f39d625c662fd6372e3025c7362f
diff --git a/metadata/md5-cache/games-puzzle/tong-1.2-r1 b/metadata/md5-cache/games-puzzle/tong-1.2-r1
index f69128ba688d..60d26c144c63 100644
--- a/metadata/md5-cache/games-puzzle/tong-1.2-r1
+++ b/metadata/md5-cache/games-puzzle/tong-1.2-r1
@@ -3,10 +3,11 @@ DEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-image[png] media-l
 DESCRIPTION=Tetris and Pong in the same place at the same time
 EAPI=6
 HOMEPAGE=http://www.nongnu.org/tong/
+INHERIT=desktop
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis]
 SLOT=0
 SRC_URI=http://www.nongnu.org/tong/tong-1.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
 _md5_=6aa120c4e5260a069b954a092b3bca49
diff --git a/metadata/md5-cache/games-puzzle/toppler-1.1.6-r2 b/metadata/md5-cache/games-puzzle/toppler-1.1.6-r2
index a4e9a98ea7a8..7339cc6e269f 100644
--- a/metadata/md5-cache/games-puzzle/toppler-1.1.6-r2
+++ b/metadata/md5-cache/games-puzzle/toppler-1.1.6-r2
@@ -4,11 +4,12 @@ DEPEND=acct-group/gamestat media-libs/libsdl[joystick,video] media-libs/sdl-mixe
 DESCRIPTION=Reimplementation of Nebulous using SDL
 EAPI=8
 HOMEPAGE=http://toppler.sourceforge.net/
+INHERIT=autotools
 IUSE=nls
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=acct-group/gamestat media-libs/libsdl[joystick,video] media-libs/sdl-mixer[vorbis] sys-libs/zlib nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/toppler/toppler-1.1.6.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=ebb86bd99d28c84da9d9e215bf6b1837
diff --git a/metadata/md5-cache/games-puzzle/torrent-0.8.2-r1 b/metadata/md5-cache/games-puzzle/torrent-0.8.2-r1
index 57f9eea8772c..9c0d897958ff 100644
--- a/metadata/md5-cache/games-puzzle/torrent-0.8.2-r1
+++ b/metadata/md5-cache/games-puzzle/torrent-0.8.2-r1
@@ -3,10 +3,11 @@ DEPEND=>=media-libs/libsdl-1.2.4 >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-ima
 DESCRIPTION=Match rising tiles before reaching the top to score as many points as possible
 EAPI=6
 HOMEPAGE=http://www.shiftygames.com/torrent/torrent.html
+INHERIT=desktop
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libsdl-1.2.4 >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-image-1.2 media-libs/sdl-ttf
 SLOT=0
 SRC_URI=http://www.shiftygames.com/torrent/torrent-0.8.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
 _md5_=8bc56a032dda80c80d0ce25aa780ba7f
diff --git a/metadata/md5-cache/games-puzzle/twindistress-1.1.0 b/metadata/md5-cache/games-puzzle/twindistress-1.1.0
index c4e27e1cab66..ea538e1e1aeb 100644
--- a/metadata/md5-cache/games-puzzle/twindistress-1.1.0
+++ b/metadata/md5-cache/games-puzzle/twindistress-1.1.0
@@ -3,10 +3,11 @@ DEPEND=media-libs/libsdl[video] media-libs/sdl-image[png] media-libs/sdl-mixer[v
 DESCRIPTION=Match and remove all of the blocks before time runs out
 EAPI=7
 HOMEPAGE=http://twind.sourceforge.net/
+INHERIT=desktop toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis]
 SLOT=0
 SRC_URI=mirror://sourceforge/twind/twind-1.1.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=65156933052433f460466b9d20b7f814
diff --git a/metadata/md5-cache/games-puzzle/wakkabox-1.1.0-r1 b/metadata/md5-cache/games-puzzle/wakkabox-1.1.0-r1
index 4e51afa4430f..85287bea5794 100644
--- a/metadata/md5-cache/games-puzzle/wakkabox-1.1.0-r1
+++ b/metadata/md5-cache/games-puzzle/wakkabox-1.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libsdl-1.0.1
 SLOT=0
 SRC_URI=http://kenn.frap.net/wakkabox/wakkabox-1.1.0.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=f1b7249ac8506af28067b012f338d2bb
diff --git a/metadata/md5-cache/games-puzzle/wizznic-369-r1 b/metadata/md5-cache/games-puzzle/wizznic-369-r1
index ebf2d35a9bec..53606829e153 100644
--- a/metadata/md5-cache/games-puzzle/wizznic-369-r1
+++ b/metadata/md5-cache/games-puzzle/wizznic-369-r1
@@ -3,10 +3,11 @@ DEPEND=media-libs/libsdl[sound,joystick,opengl,video] media-libs/sdl-image[png]
 DESCRIPTION=Block-clearing puzzle game
 EAPI=6
 HOMEPAGE=http://wizznic.org/
+INHERIT=desktop
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=media-libs/libsdl[sound,joystick,opengl,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] virtual/opengl
 SLOT=0
 SRC_URI=mirror://sourceforge/wizznic/Wizznic_src_build_369.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
 _md5_=1b30b1885ab03355271e7807c9717595
diff --git a/metadata/md5-cache/games-puzzle/wmpuzzle-0.5.2-r1 b/metadata/md5-cache/games-puzzle/wmpuzzle-0.5.2-r1
index 67526f009466..2a1d860f0b56 100644
--- a/metadata/md5-cache/games-puzzle/wmpuzzle-0.5.2-r1
+++ b/metadata/md5-cache/games-puzzle/wmpuzzle-0.5.2-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm dev-util/desktop-file-ut
 DESCRIPTION=4x4 puzzle on a 64x64 mini window
 EAPI=7
 HOMEPAGE=https://people.debian.org/~godisch/wmpuzzle/
+INHERIT=desktop xdg
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 SLOT=0
 SRC_URI=https://people.debian.org/~godisch/wmpuzzle/wmpuzzle-0.5.2.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=e5b4eadcb504cc523e1a15274f259915
diff --git a/metadata/md5-cache/games-puzzle/world-of-goo-demo-1.41-r3 b/metadata/md5-cache/games-puzzle/world-of-goo-demo-1.41-r3
index 33b884eed024..8f6d98dff4af 100644
--- a/metadata/md5-cache/games-puzzle/world-of-goo-demo-1.41-r3
+++ b/metadata/md5-cache/games-puzzle/world-of-goo-demo-1.41-r3
@@ -3,11 +3,12 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Puzzle game with a strong emphasis on physics (demo version)
 EAPI=7
 HOMEPAGE=https://2dboy.com/
+INHERIT=desktop wrapper xdg
 KEYWORDS=~amd64 ~x86
 LICENSE=2dboy-EULA
 RDEPEND=media-libs/libsdl[opengl,sound,video] media-libs/sdl-mixer[vorbis] >=sys-devel/gcc-3.4 sys-libs/glibc virtual/opengl virtual/glu
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=mirror://sourceforge/slackbuildsdirectlinks/worldofgoo/WorldOfGooDemo.1.41.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=b2c52090644f1fa0be62c66c4d725bae
diff --git a/metadata/md5-cache/games-puzzle/world-of-goo-gog-1.51.29337 b/metadata/md5-cache/games-puzzle/world-of-goo-gog-1.51.29337
index 17cff14f4f62..8675bca66936 100644
--- a/metadata/md5-cache/games-puzzle/world-of-goo-gog-1.51.29337
+++ b/metadata/md5-cache/games-puzzle/world-of-goo-gog-1.51.29337
@@ -4,6 +4,7 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A puzzle game with a strong emphasis on physics (GOG edition)
 EAPI=7
 HOMEPAGE=https://2dboy.com/
+INHERIT=desktop unpacker xdg
 IUSE=bundled-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=2dboy-EULA
@@ -11,5 +12,5 @@ RDEPEND=!bundled-libs? ( media-libs/libsdl2[opengl,sound,video] media-libs/sdl2-
 RESTRICT=bindist fetch strip bundled-libs? ( splitdebug )
 SLOT=0
 SRC_URI=world_of_goo_1_51_29337.sh
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=3a4065a0a6d54500f18fc43389c1c42a
diff --git a/metadata/md5-cache/games-puzzle/world-of-goo-hb-1.53 b/metadata/md5-cache/games-puzzle/world-of-goo-hb-1.53
index 1f593dac1d1d..5eb0e25afc20 100644
--- a/metadata/md5-cache/games-puzzle/world-of-goo-hb-1.53
+++ b/metadata/md5-cache/games-puzzle/world-of-goo-hb-1.53
@@ -4,6 +4,7 @@ DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A puzzle game with a strong emphasis on physics (Humble Bundle edition)
 EAPI=7
 HOMEPAGE=https://2dboy.com/
+INHERIT=desktop unpacker xdg
 IUSE=bundled-libs
 KEYWORDS=~amd64 ~x86
 LICENSE=2dboy-EULA
@@ -11,5 +12,5 @@ RDEPEND=!bundled-libs? ( media-libs/libsdl2[opengl,sound,video] media-libs/sdl2-
 RESTRICT=bindist fetch strip bundled-libs? ( splitdebug )
 SLOT=0
 SRC_URI=WorldOfGoo.Linux.1.53.sh
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=310a5868b74d3bda3beb0f7bd1055998
diff --git a/metadata/md5-cache/games-puzzle/xblockout-1.1.6-r2 b/metadata/md5-cache/games-puzzle/xblockout-1.1.6-r2
index 71bc044ef372..48d2140313ec 100644
--- a/metadata/md5-cache/games-puzzle/xblockout-1.1.6-r2
+++ b/metadata/md5-cache/games-puzzle/xblockout-1.1.6-r2
@@ -4,10 +4,11 @@ DEPEND=x11-libs/libX11 x11-libs/libXext
 DESCRIPTION=X Window block dropping game in 3 Dimension
 EAPI=7
 HOMEPAGE=http://perso.univ-lyon1.fr/thierry.excoffier/XBL/
+INHERIT=autotools desktop flag-o-matic toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-1
 RDEPEND=x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=http://perso.univ-lyon1.fr/thierry.excoffier/XBL/xbl-1.1.6.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=06fe25d7072223ef89b759834d305da1
diff --git a/metadata/md5-cache/games-puzzle/xbomb-2.2b-r3 b/metadata/md5-cache/games-puzzle/xbomb-2.2b-r3
index 68fd48641d55..a1bd5d78f10f 100644
--- a/metadata/md5-cache/games-puzzle/xbomb-2.2b-r3
+++ b/metadata/md5-cache/games-puzzle/xbomb-2.2b-r3
@@ -3,10 +3,11 @@ DEPEND=acct-group/gamestat x11-libs/libX11 x11-libs/libXaw x11-libs/libXt
 DESCRIPTION=Minesweeper clone with hexagonal, rectangular and triangular grid
 EAPI=8
 HOMEPAGE=http://www.gedanken.org.uk/software/xbomb/
+INHERIT=desktop toolchain-funcs
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-2+
 RDEPEND=acct-group/gamestat x11-libs/libX11 x11-libs/libXaw x11-libs/libXt media-fonts/font-misc-misc
 SLOT=0
 SRC_URI=http://www.gedanken.org.uk/software/xbomb/download/xbomb-2.2b.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=48fcda1d5bdeaa8065a704f38f18bfb0
diff --git a/metadata/md5-cache/games-puzzle/xlogical-1.0.8 b/metadata/md5-cache/games-puzzle/xlogical-1.0.8
index ed50ef3ed3f1..f27b7867213f 100644
--- a/metadata/md5-cache/games-puzzle/xlogical-1.0.8
+++ b/metadata/md5-cache/games-puzzle/xlogical-1.0.8
@@ -4,10 +4,11 @@ DEPEND=acct-group/gamestat media-libs/libsdl[sound,video] media-libs/sdl-image[j
 DESCRIPTION=Puzzle game based on the Logical! game released on the Commodore Amiga
 EAPI=8
 HOMEPAGE=https://changeling.ixionstudios.com/xlogical/
+INHERIT=autotools desktop
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=acct-group/gamestat media-libs/libsdl[sound,video] media-libs/sdl-image[jpeg] media-libs/sdl-mixer[mod]
 SLOT=0
 SRC_URI=https://changeling.ixionstudios.com/xlogical/downloads/xlogical-1.0-8.tar.bz2 https://dev.gentoo.org/~ionen/distfiles/xlogical.png
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=d563f853311c7b9f6ed1a5579a256b1d
diff --git a/metadata/md5-cache/games-puzzle/xpired-1.22-r1 b/metadata/md5-cache/games-puzzle/xpired-1.22-r1
index 2dc5262ae5de..f3e687f458f4 100644
--- a/metadata/md5-cache/games-puzzle/xpired-1.22-r1
+++ b/metadata/md5-cache/games-puzzle/xpired-1.22-r1
@@ -3,10 +3,11 @@ DEPEND=media-libs/sdl-gfx media-libs/sdl-image[jpeg] media-libs/sdl-mixer[mod]
 DESCRIPTION=A Sokoban-styled puzzle game with lots more action
 EAPI=6
 HOMEPAGE=http://xpired.sourceforge.net
+INHERIT=desktop
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/sdl-gfx media-libs/sdl-image[jpeg] media-libs/sdl-mixer[mod]
 SLOT=0
 SRC_URI=mirror://sourceforge/xpired/xpired-1.22-linux_source.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa
 _md5_=ea1131c8817277602d817515c4d45821
diff --git a/metadata/md5-cache/games-puzzle/xtris-1.15-r1 b/metadata/md5-cache/games-puzzle/xtris-1.15-r1
index a2b270c07e8b..695f5b0f5e31 100644
--- a/metadata/md5-cache/games-puzzle/xtris-1.15-r1
+++ b/metadata/md5-cache/games-puzzle/xtris-1.15-r1
@@ -3,10 +3,11 @@ DEPEND=x11-libs/libX11
 DESCRIPTION=A networked Tetris-like game
 EAPI=8
 HOMEPAGE=http://www.iagora.com/~espel/xtris/xtris.html
+INHERIT=desktop toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=http://www.iagora.com/~espel/xtris/xtris-1.15.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=75fa4083c9dc886999b7d468b0f04cb7
diff --git a/metadata/md5-cache/games-puzzle/xwelltris-1.0.1-r1 b/metadata/md5-cache/games-puzzle/xwelltris-1.0.1-r1
index 95dfe34e234d..eb88680baef4 100644
--- a/metadata/md5-cache/games-puzzle/xwelltris-1.0.1-r1
+++ b/metadata/md5-cache/games-puzzle/xwelltris-1.0.1-r1
@@ -3,10 +3,11 @@ DEPEND=media-libs/libsdl[video] media-libs/sdl-image[gif]
 DESCRIPTION=2.5D tetris like game
 EAPI=7
 HOMEPAGE=http://xnc.jinr.ru/xwelltris/
+INHERIT=toolchain-funcs prefix
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libsdl[video] media-libs/sdl-image[gif] acct-group/gamestat
 SLOT=0
 SRC_URI=http://xnc.jinr.ru/xwelltris/src/xwelltris-1.0.1.src.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb
 _md5_=7f77d074e2cb7f657e2119ff73185101
diff --git a/metadata/md5-cache/games-puzzle/xye-0.12.2 b/metadata/md5-cache/games-puzzle/xye-0.12.2
index d63150e69397..b3abcd2427e4 100644
--- a/metadata/md5-cache/games-puzzle/xye-0.12.2
+++ b/metadata/md5-cache/games-puzzle/xye-0.12.2
@@ -4,10 +4,11 @@ DEPEND=media-fonts/dejavu media-libs/libsdl[video] media-libs/sdl-image[png] med
 DESCRIPTION=Free version of the classic game Kye
 EAPI=7
 HOMEPAGE=http://xye.sourceforge.net/
+INHERIT=autotools eapi8-dosym xdg
 KEYWORDS=~amd64 ~x86
 LICENSE=ZLIB
 RDEPEND=media-fonts/dejavu media-libs/libsdl[video] media-libs/sdl-image[png] media-libs/sdl-ttf
 SLOT=0
 SRC_URI=mirror://sourceforge/xye/xye-0.12.2.tar.gz
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d5bd261ce67cb1371af3963ef4a67934
diff --git a/metadata/md5-cache/games-puzzle/zaz-1.0.0-r1 b/metadata/md5-cache/games-puzzle/zaz-1.0.0-r1
index 2a18e3bd7a68..118d2e9f2e04 100644
--- a/metadata/md5-cache/games-puzzle/zaz-1.0.0-r1
+++ b/metadata/md5-cache/games-puzzle/zaz-1.0.0-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-3 GPL-3+ CC-BY-SA-3.0 OFL
 RDEPEND=virtual/opengl virtual/glu media-libs/libsdl[X,sound,video] media-libs/sdl-image[jpeg,png] media-libs/libvorbis media-libs/libtheora media-libs/ftgl virtual/libintl
 SLOT=0
 SRC_URI=mirror://sourceforge/zaz/zaz-1.0.0.tar.bz2
-_eclasses_=autotools	b46e8992a8126c894fbdc8084fc040c4	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a3abd6002fafb3022597be6b8d01f88b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	e9da88162e7a3c60376e80c2c2adcdfb	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=81580d909f2a9c948d930aa6a32ea258
author	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-06-29 12:04:12 +0100
commit	0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree	037df795519468a25d9362b4e95cdaeb84eb1cf9 /metadata/md5-cache/games-puzzle
parent	752d6256e5204b958b0ef7905675a940b5e9172f (diff)