gentoo resync : 16.04.2018

41 files changed, 240 insertions, 243 deletions

diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 1d61661fece6..e08a17027754 100644
--- a/metadata/md5-cache/games-arcade/Manifest.gz
+++ b/metadata/md5-cache/games-arcade/Manifest.gz
diff --git a/metadata/md5-cache/games-arcade/abe-1.1 b/metadata/md5-cache/games-arcade/abe-1.1
deleted file mode 100644
index 79402725f9d3..000000000000
--- a/metadata/md5-cache/games-arcade/abe-1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[sound,video] x11-libs/libXi media-libs/sdl-mixer[vorbis]
-DESCRIPTION=A scrolling, platform-jumping, key-collecting, ancient pyramid exploring game
-EAPI=5
-HOMEPAGE=http://abe.sourceforge.net/
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[sound,video] x11-libs/libXi media-libs/sdl-mixer[vorbis] games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/abe/abe-1.1.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=059dab9ec3f16c7d45d5f8e824c77c68
diff --git a/metadata/md5-cache/games-arcade/abe-1.1-r1 b/metadata/md5-cache/games-arcade/abe-1.1-r1
new file mode 100644
index 000000000000..53c1402d7fae
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/abe-1.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=media-libs/libsdl[sound,video] x11-libs/libXi media-libs/sdl-mixer[vorbis]
+DESCRIPTION=A scrolling, platform-jumping, key-collecting, ancient pyramid exploring game
+EAPI=6
+HOMEPAGE=http://abe.sourceforge.net/
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,video] x11-libs/libXi media-libs/sdl-mixer[vorbis]
+SLOT=0
+SRC_URI=mirror://sourceforge/abe/abe-1.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=a7620659099894ea7e3a63d7cbb3f913
diff --git a/metadata/md5-cache/games-arcade/afternoonstalker-1.1.5 b/metadata/md5-cache/games-arcade/afternoonstalker-1.1.5
deleted file mode 100644
index fb41fc4e587d..000000000000
--- a/metadata/md5-cache/games-arcade/afternoonstalker-1.1.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=dev-games/flatzebra-0.1.6 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Clone of the 1981 Night Stalker video game by Mattel Electronics
-EAPI=5
-HOMEPAGE=http://perso.b2b2c.ca/sarrazip/dev/afternoonstalker.html
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-games/flatzebra-0.1.6 games-misc/games-envd
-SLOT=0
-SRC_URI=http://perso.b2b2c.ca/sarrazip/dev/afternoonstalker-1.1.5.tar.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=311e0b722cc946cd7248ff689405ba4e
diff --git a/metadata/md5-cache/games-arcade/afternoonstalker-1.1.5-r1 b/metadata/md5-cache/games-arcade/afternoonstalker-1.1.5-r1
new file mode 100644
index 000000000000..28edbac26de0
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/afternoonstalker-1.1.5-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=dev-games/flatzebra-0.1.6 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Clone of the 1981 Night Stalker video game by Mattel Electronics
+EAPI=6
+HOMEPAGE=http://perso.b2b2c.ca/sarrazip/dev/afternoonstalker.html
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=dev-games/flatzebra-0.1.6
+SLOT=0
+SRC_URI=http://perso.b2b2c.ca/sarrazip/dev/afternoonstalker-1.1.5.tar.gz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=28c8e004b495cc9464ee5f13b881d6a7
diff --git a/metadata/md5-cache/games-arcade/alienwave-0.4.0 b/metadata/md5-cache/games-arcade/alienwave-0.4.0
deleted file mode 100644
index da8f162865e4..000000000000
--- a/metadata/md5-cache/games-arcade/alienwave-0.4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=sys-libs/ncurses:0
-DESCRIPTION=An ncurses-based Xenon clone
-EAPI=5
-HOMEPAGE=http://www.alessandropira.org/alienwave/aw.html
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0 games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.alessandropira.org/alienwave/alienwave-0.4.0.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=34711d49c2453031be8b4e27b95db807
diff --git a/metadata/md5-cache/games-arcade/alienwave-0.4.0-r1 b/metadata/md5-cache/games-arcade/alienwave-0.4.0-r1
new file mode 100644
index 000000000000..2910fd69aa02
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/alienwave-0.4.0-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=sys-libs/ncurses:0
+DESCRIPTION=An ncurses-based Xenon clone
+EAPI=6
+HOMEPAGE=http://www.alessandropira.org/alienwave/aw.html
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0
+SLOT=0
+SRC_URI=http://www.alessandropira.org/alienwave/alienwave-0.4.0.tar.gz
+_md5_=52dd0a543aabc845013a93b0f97ec0f3
diff --git a/metadata/md5-cache/games-arcade/amphetamine-0.8.10 b/metadata/md5-cache/games-arcade/amphetamine-0.8.10
deleted file mode 100644
index 7b44dea3db72..000000000000
--- a/metadata/md5-cache/games-arcade/amphetamine-0.8.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[sound,video] x11-libs/libXpm
-DESCRIPTION=a cool Jump'n Run game offering some unique visual effects
-EAPI=5
-HOMEPAGE=http://homepage.hispeed.ch/loehrer/amph/amph.html
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[sound,video] x11-libs/libXpm games-misc/games-envd
-SLOT=0
-SRC_URI=http://homepage.hispeed.ch/loehrer/amph/files/amphetamine-0.8.10.tar.bz2 http://homepage.hispeed.ch/loehrer/amph/files/amphetamine-data-0.8.6.tar.bz2
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=54e61129bfe8bd19aa02dd3bd4b5b5a2
diff --git a/metadata/md5-cache/games-arcade/amphetamine-0.8.10-r1 b/metadata/md5-cache/games-arcade/amphetamine-0.8.10-r1
new file mode 100644
index 000000000000..01fa36347650
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/amphetamine-0.8.10-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/libsdl[sound,video] x11-libs/libXpm
+DESCRIPTION=a cool Jump'n Run game offering some unique visual effects
+EAPI=6
+HOMEPAGE=http://homepage.hispeed.ch/loehrer/amph/amph.html
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,video] x11-libs/libXpm
+SLOT=0
+SRC_URI=http://homepage.hispeed.ch/loehrer/amph/files/amphetamine-0.8.10.tar.bz2 http://homepage.hispeed.ch/loehrer/amph/files/amphetamine-data-0.8.6.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6
+_md5_=e89726d03c801bb0d6e5255e92a51eee
diff --git a/metadata/md5-cache/games-arcade/aop-0.6 b/metadata/md5-cache/games-arcade/aop-0.6
deleted file mode 100644
index c2d77dce8f50..000000000000
--- a/metadata/md5-cache/games-arcade/aop-0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=sys-libs/ncurses:0 virtual/pkgconfig
-DESCRIPTION=Ambassador of Pain is a curses based game with only 64 lines of code
-EAPI=5
-HOMEPAGE=http://raffi.at/view/code/aop
-KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0 games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.raffi.at/code/aop/aop-0.6.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5c81af2ed3ffc0b4cdcb843cf33b59f0
diff --git a/metadata/md5-cache/games-arcade/aop-0.6-r1 b/metadata/md5-cache/games-arcade/aop-0.6-r1
new file mode 100644
index 000000000000..ba012b2fdd13
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/aop-0.6-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DEPEND=sys-libs/ncurses:0 virtual/pkgconfig
+DESCRIPTION=Ambassador of Pain is a curses based game with only 64 lines of code
+EAPI=6
+HOMEPAGE=http://raffi.at/view/code/aop
+KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0
+SLOT=0
+SRC_URI=http://www.raffi.at/code/aop/aop-0.6.tar.gz
+_md5_=489e0f914cd7c6b436ce80a4d1beedc1
diff --git a/metadata/md5-cache/games-arcade/apricots-0.2.6-r1 b/metadata/md5-cache/games-arcade/apricots-0.2.6-r1
deleted file mode 100644
index ef05ddc4052e..000000000000
--- a/metadata/md5-cache/games-arcade/apricots-0.2.6-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[sound,video] media-libs/openal media-libs/freealut >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Fly a plane around bomb/shoot the enemy. Port of Planegame from Amiga
-EAPI=5
-HOMEPAGE=http://www.fishies.org.uk/apricots.html
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[sound,video] media-libs/openal media-libs/freealut games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.fishies.org.uk/apricots-0.2.6.tar.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5c0199cc0df32e6e21ae237a5a47d197
diff --git a/metadata/md5-cache/games-arcade/apricots-0.2.6-r2 b/metadata/md5-cache/games-arcade/apricots-0.2.6-r2
new file mode 100644
index 000000000000..7500550b9f6b
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/apricots-0.2.6-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/libsdl[sound,video] media-libs/openal media-libs/freealut >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Fly a plane around bomb/shoot the enemy. Port of Planegame from Amiga
+EAPI=6
+HOMEPAGE=http://www.fishies.org.uk/apricots.html
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,video] media-libs/openal media-libs/freealut
+SLOT=0
+SRC_URI=http://www.fishies.org.uk/apricots-0.2.6.tar.gz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=0d1b863024d1cae8dc325182e5f7fa42
diff --git a/metadata/md5-cache/games-arcade/ascii-invaders-0.1b b/metadata/md5-cache/games-arcade/ascii-invaders-0.1b
deleted file mode 100644
index 4f39eec930f0..000000000000
--- a/metadata/md5-cache/games-arcade/ascii-invaders-0.1b
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=sys-libs/ncurses:0 virtual/pkgconfig
-DESCRIPTION=Space invaders clone, using ncurses library
-EAPI=5
-HOMEPAGE=https://packages.gentoo.org/package/games-arcade/ascii-invaders
-KEYWORDS=~alpha ~amd64 ~mips ~ppc64 ~x86 ~x86-fbsd ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0 games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://gentoo/invaders0.1b.tgz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=de5151e9bfb44d1f95038fa8ed336bac
diff --git a/metadata/md5-cache/games-arcade/ascii-invaders-0.1b-r1 b/metadata/md5-cache/games-arcade/ascii-invaders-0.1b-r1
new file mode 100644
index 000000000000..d1b5a0d3cfb5
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/ascii-invaders-0.1b-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-libs/ncurses:0 virtual/pkgconfig
+DESCRIPTION=Space invaders clone, using ncurses library
+EAPI=6
+HOMEPAGE=https://packages.gentoo.org/package/games-arcade/ascii-invaders
+KEYWORDS=~alpha ~amd64 ~mips ~ppc64 ~x86 ~x86-fbsd ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0
+SLOT=0
+SRC_URI=mirror://gentoo/invaders0.1b.tgz
+_md5_=06e31bf7144ebfb3ee5988b150f0fc4b
diff --git a/metadata/md5-cache/games-arcade/asteroid-1.1 b/metadata/md5-cache/games-arcade/asteroid-1.1
deleted file mode 100644
index 27613bb808dd..000000000000
--- a/metadata/md5-cache/games-arcade/asteroid-1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=virtual/opengl media-libs/freeglut virtual/glu media-libs/libsdl media-libs/sdl-mixer
-DESCRIPTION=A modern version of the arcade classic that uses OpenGL
-EAPI=5
-HOMEPAGE=http://chaoslizard.sourceforge.net/asteroid/
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=virtual/opengl media-libs/freeglut virtual/glu media-libs/libsdl media-libs/sdl-mixer games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/chaoslizard/asteroid-1.1.tar.bz2
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c350b346559ecce15f85d51a134992d3
diff --git a/metadata/md5-cache/games-arcade/asteroid-1.2.1 b/metadata/md5-cache/games-arcade/asteroid-1.2.1
new file mode 100644
index 000000000000..9bb1e342091d
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/asteroid-1.2.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/opengl media-libs/freeglut virtual/glu media-libs/libsdl media-libs/sdl-mixer x11-libs/gtk+:2 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A modern version of the arcade classic that uses OpenGL
+EAPI=6
+HOMEPAGE=https://chazomaticus.github.io/asteroid/
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=virtual/opengl media-libs/freeglut virtual/glu media-libs/libsdl media-libs/sdl-mixer x11-libs/gtk+:2
+SLOT=0
+SRC_URI=https://github.com/chazomaticus/asteroid/archive/1.2.1.tar.gz
+_eclasses_=cmake-utils	d2f8cff68b90b869ef9d460c6f3c4e2e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4a2d6de484b464ff3209326e85ffe903
diff --git a/metadata/md5-cache/games-arcade/balloonchase-0.9.6 b/metadata/md5-cache/games-arcade/balloonchase-0.9.6
deleted file mode 100644
index f954eadaef51..000000000000
--- a/metadata/md5-cache/games-arcade/balloonchase-0.9.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[video]
-DESCRIPTION=Fly a hot air balloon and try to blow the other player out of the screen
-EAPI=5
-HOMEPAGE=http://koti.mbnet.fi/makegho/c/bchase/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[video] games-misc/games-envd
-SLOT=0
-SRC_URI=http://koti.mbnet.fi/makegho/c/bchase/balloonchase-0.9.6.tar.bz2
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f1997fe928ba1319d028c42fa8a8f7b1
diff --git a/metadata/md5-cache/games-arcade/balloonchase-0.9.6-r1 b/metadata/md5-cache/games-arcade/balloonchase-0.9.6-r1
new file mode 100644
index 000000000000..866881be378d
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/balloonchase-0.9.6-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libsdl[video]
+DESCRIPTION=Fly a hot air balloon and try to blow the other player out of the screen
+EAPI=6
+HOMEPAGE=http://makegho.mbnet.fi/c/bchase/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[video]
+SLOT=0
+SRC_URI=http://makegho.mbnet.fi/c/bchase/balloonchase-0.9.6.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=1b835598566c112f11445778d80ade2d
diff --git a/metadata/md5-cache/games-arcade/batrachians-0.1.6 b/metadata/md5-cache/games-arcade/batrachians-0.1.6
deleted file mode 100644
index 1fb2bcbfe312..000000000000
--- a/metadata/md5-cache/games-arcade/batrachians-0.1.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-games/flatzebra-0.1.5 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=A fly-eating frog video game
-EAPI=5
-HOMEPAGE=http://perso.b2b2c.ca/sarrazip/dev/batrachians.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-games/flatzebra-0.1.5 games-misc/games-envd
-SLOT=0
-SRC_URI=http://perso.b2b2c.ca/sarrazip/dev/batrachians-0.1.6.tar.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=527f065a0aceb2be67380d3ccdb69598
diff --git a/metadata/md5-cache/games-arcade/batrachians-0.1.6-r1 b/metadata/md5-cache/games-arcade/batrachians-0.1.6-r1
new file mode 100644
index 000000000000..09ce9fe498bd
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/batrachians-0.1.6-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-games/flatzebra-0.1.5 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A fly-eating frog video game
+EAPI=6
+HOMEPAGE=http://perso.b2b2c.ca/sarrazip/dev/batrachians.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-games/flatzebra-0.1.5
+SLOT=0
+SRC_URI=http://perso.b2b2c.ca/sarrazip/dev/batrachians-0.1.6.tar.gz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e989f540e94f19311f03e8bec7d02ef1
diff --git a/metadata/md5-cache/games-arcade/berusky-1.7.1 b/metadata/md5-cache/games-arcade/berusky-1.7.1
deleted file mode 100644
index 2a3289e330a4..000000000000
--- a/metadata/md5-cache/games-arcade/berusky-1.7.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=media-libs/libsdl[X,video] media-libs/sdl-image[png] x11-libs/gtk+:2 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=free logic game based on an ancient puzzle named Sokoban
-EAPI=5
-HOMEPAGE=http://anakreon.cz/?q=node/1
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[X,video] media-libs/sdl-image[png] x11-libs/gtk+:2 games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.anakreon.cz/download/berusky-1.7.1.tar.gz http://www.anakreon.cz/download/berusky-data-1.7.tar.gz https://dev.gentoo.org/~hasufell/distfiles/berusky.png
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b6e4816d465e35e4f18e95b1a0cbda46
diff --git a/metadata/md5-cache/games-arcade/berusky-1.7.1-r1 b/metadata/md5-cache/games-arcade/berusky-1.7.1-r1
new file mode 100644
index 000000000000..5405b538244b
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/berusky-1.7.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=media-libs/libsdl[X,video] media-libs/sdl-image[png] x11-libs/gtk+:2 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Free logic game based on an ancient puzzle named Sokoban
+EAPI=6
+HOMEPAGE=http://anakreon.cz/?q=node/1
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[X,video] media-libs/sdl-image[png] x11-libs/gtk+:2
+SLOT=0
+SRC_URI=http://www.anakreon.cz/download/berusky-1.7.1.tar.gz http://www.anakreon.cz/download/berusky-data-1.7.tar.gz https://dev.gentoo.org/~hasufell/distfiles/berusky.png
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b90a41e4c8c5fbf303a525c89588673e
diff --git a/metadata/md5-cache/games-arcade/ceferino-0.97.8-r1 b/metadata/md5-cache/games-arcade/ceferino-0.97.8-r1
deleted file mode 100644
index 19730d588c87..000000000000
--- a/metadata/md5-cache/games-arcade/ceferino-0.97.8-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=media-libs/libsdl-1.2[video] >=media-libs/sdl-image-1.2 >=media-libs/sdl-mixer-1.2 nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Super-Pang clone (destroy bouncing balloons with your grapnel)
-EAPI=5
-HOMEPAGE=http://www.loosersjuegos.com.ar/juegos/ceferino
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=media-libs/libsdl-1.2[video] >=media-libs/sdl-image-1.2 >=media-libs/sdl-mixer-1.2 nls? ( virtual/libintl ) games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://debian/pool/main/c/ceferino/ceferino_0.97.8+svn37.orig.tar.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ef1e0b422898e8054852e173dc2aa741
diff --git a/metadata/md5-cache/games-arcade/ceferino-0.97.8-r2 b/metadata/md5-cache/games-arcade/ceferino-0.97.8-r2
new file mode 100644
index 000000000000..ce395bf8913e
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/ceferino-0.97.8-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=>=media-libs/libsdl-1.2[video] >=media-libs/sdl-image-1.2 >=media-libs/sdl-mixer-1.2 nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Super-Pang clone (destroy bouncing balloons with your grapnel)
+EAPI=6
+HOMEPAGE=http://www.loosersjuegos.com.ar/juegos/ceferino
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=media-libs/libsdl-1.2[video] >=media-libs/sdl-image-1.2 >=media-libs/sdl-mixer-1.2 nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/c/ceferino/ceferino_0.97.8+svn37.orig.tar.gz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=d59ce4172f81a0bed1edd27cb3613ec6
diff --git a/metadata/md5-cache/games-arcade/circuslinux-1.0.3 b/metadata/md5-cache/games-arcade/circuslinux-1.0.3
deleted file mode 100644
index 9abefb155502..000000000000
--- a/metadata/md5-cache/games-arcade/circuslinux-1.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl media-libs/sdl-image[png] media-libs/sdl-mixer[mod]
-DESCRIPTION=clone of the Atari 2600 game "Circus Atari"
-EAPI=5
-HOMEPAGE=http://www.newbreedsoftware.com/circus-linux/
-KEYWORDS=~alpha ~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl media-libs/sdl-image[png] media-libs/sdl-mixer[mod] games-misc/games-envd
-SLOT=0
-SRC_URI=ftp://ftp.sonic.net/pub/users/nbs/unix/x/circus-linux/circuslinux-1.0.3.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4b7e5426f0dcebbb54b3e0a88567cb2f
diff --git a/metadata/md5-cache/games-arcade/circuslinux-1.0.3-r1 b/metadata/md5-cache/games-arcade/circuslinux-1.0.3-r1
new file mode 100644
index 000000000000..61964a02e911
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/circuslinux-1.0.3-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libsdl media-libs/sdl-image[png] media-libs/sdl-mixer[mod]
+DESCRIPTION=clone of the Atari 2600 game "Circus Atari"
+EAPI=6
+HOMEPAGE=http://www.newbreedsoftware.com/circus-linux/
+KEYWORDS=~alpha ~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl media-libs/sdl-image[png] media-libs/sdl-mixer[mod]
+SLOT=0
+SRC_URI=ftp://ftp.sonic.net/pub/users/nbs/unix/x/circus-linux/circuslinux-1.0.3.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6
+_md5_=12bd2147479b280a9c24883e81f135b2
diff --git a/metadata/md5-cache/games-arcade/cob-0.9 b/metadata/md5-cache/games-arcade/cob-0.9
deleted file mode 100644
index 44b0b9a4eae3..000000000000
--- a/metadata/md5-cache/games-arcade/cob-0.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[joystick,sound,video]
-DESCRIPTION=Cruising on Broadway: a painting-type game
-EAPI=5
-HOMEPAGE=http://www.autismuk.freeserve.co.uk/
-KEYWORDS=~alpha ~amd64 ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[joystick,sound,video] games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.autismuk.freeserve.co.uk/cob-0.9.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=61163cdca253a77c1a4898eafef52b34
diff --git a/metadata/md5-cache/games-arcade/cob-0.9-r1 b/metadata/md5-cache/games-arcade/cob-0.9-r1
new file mode 100644
index 000000000000..d16baa1fe473
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/cob-0.9-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=media-libs/libsdl[joystick,sound,video]
+DESCRIPTION=Cruising on Broadway: a painting-type game
+EAPI=6
+HOMEPAGE=http://www.autismuk.freeserve.co.uk/
+KEYWORDS=~alpha ~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[joystick,sound,video]
+SLOT=0
+SRC_URI=http://www.autismuk.freeserve.co.uk/cob-0.9.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6
+_md5_=727ed4585e15cd0f86f580fc9ae34047
diff --git a/metadata/md5-cache/games-arcade/conveysdl-1.3 b/metadata/md5-cache/games-arcade/conveysdl-1.3
deleted file mode 100644
index 73104741b698..000000000000
--- a/metadata/md5-cache/games-arcade/conveysdl-1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer
-DESCRIPTION=Guide the blob along the conveyer belt collecting the red blobs
-EAPI=5
-HOMEPAGE=http://www.cloudsprinter.com/software/conveysdl/
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.cloudsprinter.com/software/conveysdl/conveysdl.1.3.tar
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=01b3c572c5b8aebc5fc39c3f3d076ee1
diff --git a/metadata/md5-cache/games-arcade/conveysdl-1.3-r1 b/metadata/md5-cache/games-arcade/conveysdl-1.3-r1
new file mode 100644
index 000000000000..312d053dd031
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/conveysdl-1.3-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer
+DESCRIPTION=Guide the blob along the conveyer belt collecting the red blobs
+EAPI=6
+HOMEPAGE=http://www.cloudsprinter.com/software/conveysdl/
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer
+SLOT=0
+SRC_URI=http://www.cloudsprinter.com/software/conveysdl/conveysdl.1.3.tar
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=5e473b952280b7732a958ee87b834947
diff --git a/metadata/md5-cache/games-arcade/cosmosmash-1.4.7 b/metadata/md5-cache/games-arcade/cosmosmash-1.4.7
deleted file mode 100644
index f7d2bf0e232a..000000000000
--- a/metadata/md5-cache/games-arcade/cosmosmash-1.4.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=dev-games/flatzebra-0.1.6 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A space rock shooting video game
-EAPI=5
-HOMEPAGE=http://perso.b2b2c.ca/sarrazip/dev/cosmosmash.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-games/flatzebra-0.1.6 games-misc/games-envd
-RESTRICT=test
-SLOT=0
-SRC_URI=http://perso.b2b2c.ca/sarrazip/dev/cosmosmash-1.4.7.tar.gz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=04fa90de8aafe10b385e3ede5fa02175
diff --git a/metadata/md5-cache/games-arcade/cosmosmash-1.4.7-r1 b/metadata/md5-cache/games-arcade/cosmosmash-1.4.7-r1
new file mode 100644
index 000000000000..7f7c292a97ed
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/cosmosmash-1.4.7-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=dev-games/flatzebra-0.1.6 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A space rock shooting video game
+EAPI=6
+HOMEPAGE=http://perso.b2b2c.ca/sarrazip/dev/cosmosmash.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-games/flatzebra-0.1.6
+RESTRICT=test
+SLOT=0
+SRC_URI=http://perso.b2b2c.ca/sarrazip/dev/cosmosmash-1.4.7.tar.gz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=0786de6c086d9ed4a15bf627e74b5bc1
diff --git a/metadata/md5-cache/games-arcade/crack-attack-1.1.14-r1 b/metadata/md5-cache/games-arcade/crack-attack-1.1.14-r1
deleted file mode 100644
index 8fa022ed3658..000000000000
--- a/metadata/md5-cache/games-arcade/crack-attack-1.1.14-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/freeglut sdl? ( media-libs/libsdl media-libs/sdl-mixer ) gtk? ( >=x11-libs/gtk+-2.6:2 ) virtual/pkgconfig
-DESCRIPTION=Addictive OpenGL-based block game
-EAPI=5
-HOMEPAGE=http://www.nongnu.org/crack-attack/
-IUSE=gtk sdl
-KEYWORDS=~amd64 ~arm ~hppa ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/freeglut sdl? ( media-libs/libsdl media-libs/sdl-mixer ) gtk? ( >=x11-libs/gtk+-2.6:2 ) games-misc/games-envd
-SLOT=0
-SRC_URI=https://savannah.nongnu.org/download/crack-attack/crack-attack-1.1.14.tar.bz2
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9289f2a08936b8558b17ef2fc5f47a09
diff --git a/metadata/md5-cache/games-arcade/crack-attack-1.1.14-r2 b/metadata/md5-cache/games-arcade/crack-attack-1.1.14-r2
new file mode 100644
index 000000000000..7cb97822e0a1
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/crack-attack-1.1.14-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=media-libs/freeglut sdl? ( media-libs/libsdl media-libs/sdl-mixer ) gtk? ( >=x11-libs/gtk+-2.6:2 ) virtual/pkgconfig
+DESCRIPTION=Addictive OpenGL-based block game
+EAPI=6
+HOMEPAGE=http://www.nongnu.org/crack-attack/
+IUSE=gtk sdl
+KEYWORDS=~amd64 ~arm ~hppa ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/freeglut sdl? ( media-libs/libsdl media-libs/sdl-mixer ) gtk? ( >=x11-libs/gtk+-2.6:2 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/crack-attack/crack-attack-1.1.14.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6
+_md5_=1d3cdd51c63d4fb0eea0fa7ab552d661
diff --git a/metadata/md5-cache/games-arcade/criticalmass-1.0.2 b/metadata/md5-cache/games-arcade/criticalmass-1.0.2
deleted file mode 100644
index 68e0ea7e4dfd..000000000000
--- a/metadata/md5-cache/games-arcade/criticalmass-1.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/sdl-mixer media-libs/sdl-image[png] media-libs/libpng:0 virtual/opengl net-misc/curl >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=SDL/OpenGL space shoot'em up game
-EAPI=5
-HOMEPAGE=http://criticalmass.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/sdl-mixer media-libs/sdl-image[png] media-libs/libpng:0 virtual/opengl net-misc/curl games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/criticalmass/CriticalMass-1.0.2.tar.bz2
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	games	2bb3ede665927a68ffdb7c41eec7efde	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2e2b28cffe8c8705272330c0c5157948
diff --git a/metadata/md5-cache/games-arcade/criticalmass-1.0.2-r1 b/metadata/md5-cache/games-arcade/criticalmass-1.0.2-r1
new file mode 100644
index 000000000000..ad647303b47f
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/criticalmass-1.0.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=media-libs/sdl-mixer media-libs/sdl-image[png] media-libs/libpng:0= virtual/opengl net-misc/curl >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=SDL/OpenGL space shoot'em up game
+EAPI=6
+HOMEPAGE=http://criticalmass.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/sdl-mixer media-libs/sdl-image[png] media-libs/libpng:0= virtual/opengl net-misc/curl
+SLOT=0
+SRC_URI=mirror://sourceforge/criticalmass/CriticalMass-1.0.2.tar.bz2
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=acfdd86e6ee6baad342aea13b4196563
diff --git a/metadata/md5-cache/games-arcade/defendguin-0.0.12 b/metadata/md5-cache/games-arcade/defendguin-0.0.12
deleted file mode 100644
index 3cbbda6e27e2..000000000000
--- a/metadata/md5-cache/games-arcade/defendguin-0.0.12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/sdl-mixer[mod] media-libs/libsdl[video]
-DESCRIPTION=A clone of the arcade game Defender, but with a Linux theme
-EAPI=5
-HOMEPAGE=http://www.newbreedsoftware.com/defendguin/
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=media-libs/sdl-mixer[mod] media-libs/libsdl[video] games-misc/games-envd
-SLOT=0
-SRC_URI=ftp://ftp.tuxpaint.org/unix/x/defendguin/src/defendguin-0.0.12.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ed0e4d165b724307831bfa642a54b03e
diff --git a/metadata/md5-cache/games-arcade/defendguin-0.0.12-r1 b/metadata/md5-cache/games-arcade/defendguin-0.0.12-r1
new file mode 100644
index 000000000000..cb21e9340e19
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/defendguin-0.0.12-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/sdl-mixer[mod] media-libs/libsdl[video]
+DESCRIPTION=A clone of the arcade game Defender, but with a Linux theme
+EAPI=6
+HOMEPAGE=http://www.newbreedsoftware.com/defendguin/
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=media-libs/sdl-mixer[mod] media-libs/libsdl[video]
+SLOT=0
+SRC_URI=ftp://ftp.tuxpaint.org/unix/x/defendguin/src/defendguin-0.0.12.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6
+_md5_=ba0255517a1b528dfd7bc089f6d16c07
diff --git a/metadata/md5-cache/games-arcade/digger-20140423 b/metadata/md5-cache/games-arcade/digger-20140423
deleted file mode 100644
index ce29fcb4d042..000000000000
--- a/metadata/md5-cache/games-arcade/digger-20140423
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[X,video] x11-libs/libX11
-DESCRIPTION=Digger Remastered
-EAPI=5
-HOMEPAGE=http://www.digger.org/
-KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[X,video] x11-libs/libX11 games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://gentoo/digger-20140423.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d53d0b144ea90e275f12b5be37625047
diff --git a/metadata/md5-cache/games-arcade/digger-20140423-r1 b/metadata/md5-cache/games-arcade/digger-20140423-r1
new file mode 100644
index 000000000000..051a1b39c4d2
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/digger-20140423-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=media-libs/libsdl[X,video] x11-libs/libX11
+DESCRIPTION=Digger Remastered
+EAPI=6
+HOMEPAGE=http://www.digger.org/
+KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[X,video] x11-libs/libX11
+SLOT=0
+SRC_URI=mirror://gentoo/digger-20140423.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6
+_md5_=db4f020b11bb4ba4ac264dfab19c9425