16 files changed, 95 insertions, 97 deletions
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 9ac459414319..08667b409ca3 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/cuyo-2.1.1-r1 b/metadata/md5-cache/games-puzzle/cuyo-2.1.1-r1
deleted file mode 100644
index aa7981a9047b..000000000000
--- a/metadata/md5-cache/games-puzzle/cuyo-2.1.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=postinst postrm preinst prepare
-DEPEND=sys-libs/zlib media-libs/libsdl[sound,video] media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mod] ) media-libs/sdl-image sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=highly addictive and remotely related to tetris
-EAPI=6
-HOMEPAGE=https://www.karimmi.de/cuyo/
-IUSE=+music
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib media-libs/libsdl[sound,video] media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mod] ) media-libs/sdl-image
-SLOT=0
-SRC_URI=https://savannah.nongnu.org/download/cuyo/cuyo-2.~-1.1.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=2ed73885e5937963594d52698aa79ba0
diff --git a/metadata/md5-cache/games-puzzle/cuyo-2.1.1-r2 b/metadata/md5-cache/games-puzzle/cuyo-2.1.1-r2
new file mode 100644
index 000000000000..6c9c63de4b1f
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/cuyo-2.1.1-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=postinst postrm preinst prepare
+DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image media-libs/sdl-mixer[mod] sys-libs/zlib:= dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Highly addictive and remotely related to tetris
+EAPI=7
+HOMEPAGE=https://www.karimmi.de/cuyo/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image media-libs/sdl-mixer[mod] sys-libs/zlib:=
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/cuyo/cuyo-2.~-1.1.tar.gz
+_eclasses_=xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=3e0a8084d16ffb6bd0a0a5013358f0fb
diff --git a/metadata/md5-cache/games-puzzle/gfifteen-1.0.3-r1 b/metadata/md5-cache/games-puzzle/gfifteen-1.0.3-r1
deleted file mode 100644
index fc84a0bca815..000000000000
--- a/metadata/md5-cache/games-puzzle/gfifteen-1.0.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=x11-libs/gtk+:3 virtual/pkgconfig
-DESCRIPTION=Graphical implementation of the sliding puzzle game fifteen
-EAPI=6
-HOMEPAGE=https://frigidcode.com/code/gfifteen/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=x11-libs/gtk+:3
-SLOT=0
-SRC_URI=https://frigidcode.com/code/gfifteen/gfifteen-1.0.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=d6067d752571b1e31c60ea9d134b142a
diff --git a/metadata/md5-cache/games-puzzle/gfifteen-1.0.3-r2 b/metadata/md5-cache/games-puzzle/gfifteen-1.0.3-r2
new file mode 100644
index 000000000000..9d80dc936a94
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/gfifteen-1.0.3-r2
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+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
+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
+_md5_=3652afececcacf0b6aaaa5fec7f7bba9
diff --git a/metadata/md5-cache/games-puzzle/lmarbles-1.0.8-r1 b/metadata/md5-cache/games-puzzle/lmarbles-1.0.8-r1
deleted file mode 100644
index 6e74459c0b57..000000000000
--- a/metadata/md5-cache/games-puzzle/lmarbles-1.0.8-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=install
-DEPEND=acct-group/gamestat media-libs/libsdl[video] media-libs/sdl-mixer
-DESCRIPTION=puzzle game inspired by Atomix and written in SDL
-EAPI=7
-HOMEPAGE=http://lgames.sourceforge.net/LMarbles/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=acct-group/gamestat media-libs/libsdl[video] media-libs/sdl-mixer
-SLOT=0
-SRC_URI=https://download.sourceforge.net/lgames/lmarbles-1.0.8.tar.gz
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e6faab015b0ddada2198ac5b9f3ebc9a
diff --git a/metadata/md5-cache/games-puzzle/lmarbles-1.0.8-r2 b/metadata/md5-cache/games-puzzle/lmarbles-1.0.8-r2
new file mode 100644
index 000000000000..7420cd0d1892
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/lmarbles-1.0.8-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+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=http://lgames.sourceforge.net/LMarbles/
+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
+_md5_=bc716e3493d7a1b2bb0d57bb5baeb236
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 9ea57b42785b..3e49a3714e86 100644
--- a/metadata/md5-cache/games-puzzle/neverball-1.6.0-r1
+++ b/metadata/md5-cache/games-puzzle/neverball-1.6.0-r1
@@ -1,14 +1,15 @@
+BDEPEND=nls? ( sys-devel/gettext )
 DEFINED_PHASES=compile install postinst postrm preinst prepare
-DEPEND=media-libs/libsdl2[sound,joystick,opengl,video] media-libs/sdl2-ttf media-libs/libpng:0= virtual/jpeg:0 media-libs/libvorbis virtual/opengl dev-games/physfs media-fonts/dejavu media-fonts/wqy-microhei nls? ( virtual/libintl ) sys-devel/gettext
+DEPEND=dev-games/physfs media-libs/libpng:= media-libs/libsdl2[joystick,opengl,sound,video] media-libs/libvorbis media-libs/sdl2-ttf virtual/jpeg virtual/opengl nls? ( virtual/libintl ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Clone of Super Monkey Ball using SDL/OpenGL
-EAPI=6
+EAPI=7
 HOMEPAGE=https://neverball.org
 IUSE=nls
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+ IJG
-RDEPEND=media-libs/libsdl2[sound,joystick,opengl,video] media-libs/sdl2-ttf media-libs/libpng:0= virtual/jpeg:0 media-libs/libvorbis virtual/opengl dev-games/physfs media-fonts/dejavu media-fonts/wqy-microhei nls? ( virtual/libintl )
+RDEPEND=dev-games/physfs media-libs/libpng:= media-libs/libsdl2[joystick,opengl,sound,video] media-libs/libvorbis media-libs/sdl2-ttf virtual/jpeg virtual/opengl nls? ( virtual/libintl ) media-fonts/dejavu media-fonts/wqy-microhei
 RESTRICT=test
 SLOT=0
 SRC_URI=https://neverball.org/neverball-1.6.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=78899d4fe5d197cff73185ab873b8b4d
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=9003c7ac0897478e21be39ae9486daf4
diff --git a/metadata/md5-cache/games-puzzle/nightsky-20111222-r1 b/metadata/md5-cache/games-puzzle/nightsky-20111222-r1
index 54c662f3992e..a84d55508640 100644
--- a/metadata/md5-cache/games-puzzle/nightsky-20111222-r1
+++ b/metadata/md5-cache/games-puzzle/nightsky-20111222-r1
@@ -1,13 +1,13 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare
+DEFINED_PHASES=install nofetch postinst prepare
 DESCRIPTION=Puzzle game that puts you inside and ambient and mysterious universe
-EAPI=7
+EAPI=8
 HOMEPAGE=http://www.nicalis.com/nightsky/
 IUSE=bundled-libs
 KEYWORDS=-* ~amd64 ~x86
 LICENSE=all-rights-reserved
 RDEPEND=virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXxf86vm !bundled-libs? ( media-libs/freealut media-libs/freeglut media-libs/libogg media-libs/libvorbis media-libs/openal sys-libs/zlib )
-RESTRICT=bindist fetch splitdebug
+RESTRICT=bindist fetch
 SLOT=0
 SRC_URI=nightskyhd-linux-1324519044.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=3e91177054d91e73d8980886706cf8d5
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28
+_md5_=fef0ec44ddc33400263a694b47654d59
diff --git a/metadata/md5-cache/games-puzzle/numptyphysics-0.3.5 b/metadata/md5-cache/games-puzzle/numptyphysics-0.3.5
deleted file mode 100644
index 1f23497d2b4c..000000000000
--- a/metadata/md5-cache/games-puzzle/numptyphysics-0.3.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile postinst postrm preinst
-DEPEND=dev-libs/glib:2 media-libs/libsdl2[opengl,video] media-libs/sdl2-image[png] media-libs/sdl2-ttf virtual/opengl
-DESCRIPTION=Crayon Physics-like drawing puzzle game using the same excellent Box2D engine
-EAPI=7
-HOMEPAGE=https://github.com/thp/numptyphysics
-IUSE=+user-levels
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-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=user-levels? ( https://github.com/thp/numptyphysics/archive/0.3.5.tar.gz -> numptyphysics-0.3.5.tar.gz http://numptyphysics.garage.maemo.org/levels/butelo/butelo.npz http://numptyphysics.garage.maemo.org/levels/catalyst/catalyst.npz http://numptyphysics.garage.maemo.org/levels/christeck/christeck.npz http://numptyphysics.garage.maemo.org/levels/dneary/dneary.npz http://numptyphysics.garage.maemo.org/levels/gnuton/gnuton.npz http://numptyphysics.garage.maemo.org/levels/gudger/gudger.npz http://numptyphysics.garage.maemo.org/levels/guile/guile.npz http://numptyphysics.garage.maemo.org/levels/hurd/hurd.npz http://numptyphysics.garage.maemo.org/levels/ioan/ioan.npz http://numptyphysics.garage.maemo.org/levels/jhoff80/jhoff80.npz http://numptyphysics.garage.maemo.org/levels/leonet/leonet.npz http://numptyphysics.garage.maemo.org/levels/melvin/melvin.npz http://numptyphysics.garage.maemo.org/levels/noodleman/noodleman.npz http://numptyphysics.garage.maemo.org/levels/papky/papky.npz http://numptyphysics.garage.maemo.org/levels/perli/perli.npz http://numptyphysics.garage.maemo.org/levels/qole/qole.npz http://numptyphysics.garage.maemo.org/levels/siminz/siminz.npz http://numptyphysics.garage.maemo.org/levels/szymanowski/szymanowski.npz http://numptyphysics.garage.maemo.org/levels/therealbubba/therealbubba.npz http://numptyphysics.garage.maemo.org/levels/werre/werre.npz http://numptyphysics.garage.maemo.org/levels/zeez/zeez.npz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=b7c80d5c692bf5c6fcfeb4c65187f524
diff --git a/metadata/md5-cache/games-puzzle/numptyphysics-0.3.8 b/metadata/md5-cache/games-puzzle/numptyphysics-0.3.8
new file mode 100644
index 000000000000..cf7ac4651101
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/numptyphysics-0.3.8
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile postinst postrm preinst prepare
+DEPEND=dev-libs/glib:2 media-libs/libsdl2[opengl,video] media-libs/sdl2-image[png] media-libs/sdl2-ttf virtual/opengl dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Crayon Physics-like drawing puzzle game using the same excellent Box2D engine
+EAPI=7
+HOMEPAGE=https://github.com/thp/numptyphysics
+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	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=b87ec5adada6cc2f0092c091486532d2
diff --git a/metadata/md5-cache/games-puzzle/numptyphysics-9999 b/metadata/md5-cache/games-puzzle/numptyphysics-9999
index b5fc776aa573..97f0a248caca 100644
--- a/metadata/md5-cache/games-puzzle/numptyphysics-9999
+++ b/metadata/md5-cache/games-puzzle/numptyphysics-9999
@@ -1,14 +1,12 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile postinst postrm preinst unpack
-DEPEND=dev-libs/glib:2 media-libs/libsdl2[opengl,video] media-libs/sdl2-image[png] media-libs/sdl2-ttf virtual/opengl
+DEFINED_PHASES=compile postinst postrm preinst prepare unpack
+DEPEND=dev-libs/glib:2 media-libs/libsdl2[opengl,video] media-libs/sdl2-image[png] media-libs/sdl2-ttf virtual/opengl dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Crayon Physics-like drawing puzzle game using the same excellent Box2D engine
 EAPI=7
 HOMEPAGE=https://github.com/thp/numptyphysics
-IUSE=+user-levels
-LICENSE=GPL-3+
+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
-SRC_URI=user-levels? ( http://numptyphysics.garage.maemo.org/levels/butelo/butelo.npz http://numptyphysics.garage.maemo.org/levels/catalyst/catalyst.npz http://numptyphysics.garage.maemo.org/levels/christeck/christeck.npz http://numptyphysics.garage.maemo.org/levels/dneary/dneary.npz http://numptyphysics.garage.maemo.org/levels/gnuton/gnuton.npz http://numptyphysics.garage.maemo.org/levels/gudger/gudger.npz http://numptyphysics.garage.maemo.org/levels/guile/guile.npz http://numptyphysics.garage.maemo.org/levels/hurd/hurd.npz http://numptyphysics.garage.maemo.org/levels/ioan/ioan.npz http://numptyphysics.garage.maemo.org/levels/jhoff80/jhoff80.npz http://numptyphysics.garage.maemo.org/levels/leonet/leonet.npz http://numptyphysics.garage.maemo.org/levels/melvin/melvin.npz http://numptyphysics.garage.maemo.org/levels/noodleman/noodleman.npz http://numptyphysics.garage.maemo.org/levels/papky/papky.npz http://numptyphysics.garage.maemo.org/levels/perli/perli.npz http://numptyphysics.garage.maemo.org/levels/qole/qole.npz http://numptyphysics.garage.maemo.org/levels/siminz/siminz.npz http://numptyphysics.garage.maemo.org/levels/szymanowski/szymanowski.npz http://numptyphysics.garage.maemo.org/levels/therealbubba/therealbubba.npz http://numptyphysics.garage.maemo.org/levels/werre/werre.npz http://numptyphysics.garage.maemo.org/levels/zeez/zeez.npz )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	multilib	97566c1a256d07b00848aa767e38a352	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=e33050fe39cd4dbd19f6fb9474ba1f51
+_eclasses_=git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=8813e05b5b1a657895ef91baba9bef80
diff --git a/metadata/md5-cache/games-puzzle/picpuz-2.5-r1 b/metadata/md5-cache/games-puzzle/picpuz-2.5-r1
index 190b57eaf811..63cdef5ba5de 100644
--- a/metadata/md5-cache/games-puzzle/picpuz-2.5-r1
+++ b/metadata/md5-cache/games-puzzle/picpuz-2.5-r1
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile install postinst postrm preinst
-DEPEND=x11-libs/gtk+:3 virtual/pkgconfig
-DESCRIPTION=A jigsaw puzzle program
-EAPI=6
-HOMEPAGE=http://kornelix.squarespace.com/picpuz/
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=x11-libs/gtk+:3
+DESCRIPTION=Jigsaw puzzle program
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
+LICENSE=GPL-3+
 RDEPEND=x11-libs/gtk+:3
 SLOT=0
-SRC_URI=http://kornelix.squarespace.com/storage/downloads/picpuz-2.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=6eb78cb971dba8cb31dc3bb8c35b7b14
+SRC_URI=mirror://gentoo/picpuz-2.5.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	4134b5c0fb719b9161d10bdaba9e09e5	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=6ba749395008aa219d26a628152db40d
diff --git a/metadata/md5-cache/games-puzzle/xlogical-1.0.7-r1 b/metadata/md5-cache/games-puzzle/xlogical-1.0.7-r1
deleted file mode 100644
index e98e6890bc9b..000000000000
--- a/metadata/md5-cache/games-puzzle/xlogical-1.0.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=alt_gfx? ( app-arch/unzip ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[jpeg] media-libs/sdl-mixer[mod]
-DESCRIPTION=SDL logical clone
-EAPI=7
-HOMEPAGE=https://changeling.ixionstudios.com/xlogical/
-IUSE=alt_gfx
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[jpeg] media-libs/sdl-mixer[mod] acct-group/gamestat
-SLOT=0
-SRC_URI=https://changeling.ixionstudios.com/xlogical/downloads/xlogical-1.0-7.tar.bz2 alt_gfx? ( https://changeling.ixionstudios.com/xlogical/downloads/xlogical_gfx.zip )
-_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
-_md5_=bf14dd81ed026b596f41810b06c57618
diff --git a/metadata/md5-cache/games-puzzle/xlogical-1.0.8 b/metadata/md5-cache/games-puzzle/xlogical-1.0.8
new file mode 100644
index 000000000000..cc22c12f4230
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/xlogical-1.0.8
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815
+DEFINED_PHASES=install prepare
+DEPEND=acct-group/gamestat media-libs/libsdl[sound,video] media-libs/sdl-image[jpeg] media-libs/sdl-mixer[mod]
+DESCRIPTION=Puzzle game based on the Logical! game released on the Commodore Amiga
+EAPI=8
+HOMEPAGE=https://changeling.ixionstudios.com/xlogical/
+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	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa
+_md5_=d563f853311c7b9f6ed1a5579a256b1d
diff --git a/metadata/md5-cache/games-puzzle/xye-0.12.2 b/metadata/md5-cache/games-puzzle/xye-0.12.2
index d6aa5b47d2a1..d5d57caa00cf 100644
--- a/metadata/md5-cache/games-puzzle/xye-0.12.2
+++ b/metadata/md5-cache/games-puzzle/xye-0.12.2
@@ -1,12 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=media-fonts/dejavu media-libs/libsdl[video] media-libs/sdl-ttf media-libs/sdl-image[png] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=media-fonts/dejavu media-libs/libsdl[video] media-libs/sdl-image[png] media-libs/sdl-ttf dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Free version of the classic game Kye
-EAPI=6
+EAPI=7
 HOMEPAGE=http://xye.sourceforge.net/
 KEYWORDS=~amd64 ~x86
 LICENSE=ZLIB
-RDEPEND=media-fonts/dejavu media-libs/libsdl[video] media-libs/sdl-ttf media-libs/sdl-image[png]
+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	2a36908d5f63f41614b450a2459567da	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	9f813bb3c47cf2e60619a663b87c5f4e	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	97566c1a256d07b00848aa767e38a352	preserve-libs	dbc9f8d2d49c66467bc327fddd8317bd	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	vcs-clean	b690a7e9b6c497cf59326a7545df4283	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
-_md5_=c06256972ddd5914756be4d609f217e6
+_eclasses_=autotools	2a36908d5f63f41614b450a2459567da	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	97566c1a256d07b00848aa767e38a352	toolchain-funcs	9ea1c67b6f8315fdc2568abb674519aa	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	27f9a2f19502b925ac117bd657aa2979
+_md5_=d5bd261ce67cb1371af3963ef4a67934