summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--metadata/md5-cache/dev-java/lucene-2.4.1-r22
-rw-r--r--metadata/md5-cache/dev-python/namespace-zope-14
-rw-r--r--metadata/md5-cache/dev-python/zope-interface-4.4.34
-rw-r--r--metadata/md5-cache/games-fps/freedoom-0.10.112
-rw-r--r--metadata/md5-cache/games-fps/freedoom-0.10.1-r111
-rw-r--r--metadata/md5-cache/games-fps/openarena-0.8.8-r1 (renamed from metadata/md5-cache/games-fps/openarena-0.8.8)10
-rw-r--r--metadata/md5-cache/games-fps/prboom-2.5.012
-rw-r--r--metadata/md5-cache/games-fps/prboom-2.5.0-r112
-rw-r--r--metadata/md5-cache/games-fps/transfusion-bin-1.0113
-rw-r--r--metadata/md5-cache/games-fps/transfusion-bin-1.01-r113
-rw-r--r--metadata/md5-cache/games-fps/worldofpadman-1.613
-rw-r--r--metadata/md5-cache/games-fps/worldofpadman-1.6-r113
-rw-r--r--metadata/md5-cache/games-kids/memonix-1.612
-rw-r--r--metadata/md5-cache/games-kids/memonix-1.6-r112
-rw-r--r--metadata/md5-cache/games-misc/exult-sound-012
-rw-r--r--metadata/md5-cache/games-misc/exult-sound-0-r110
-rw-r--r--metadata/md5-cache/games-misc/typespeed-0.6.513
-rw-r--r--metadata/md5-cache/games-misc/typespeed-0.6.5-r113
-rw-r--r--metadata/md5-cache/games-puzzle/4stattack-2.1.411
-rw-r--r--metadata/md5-cache/games-puzzle/4stattack-2.1.4-r113
-rw-r--r--metadata/md5-cache/games-puzzle/anagramarama-0.212
-rw-r--r--metadata/md5-cache/games-puzzle/anagramarama-0.2-r112
-rw-r--r--metadata/md5-cache/games-puzzle/angrydd-1.0.1-r114
-rw-r--r--metadata/md5-cache/games-puzzle/angrydd-1.0.1-r214
-rw-r--r--metadata/md5-cache/games-puzzle/color-lines-0.612
-rw-r--r--metadata/md5-cache/games-puzzle/color-lines-0.6-r112
-rw-r--r--metadata/md5-cache/games-puzzle/concentration-1.2-r112
-rw-r--r--metadata/md5-cache/games-puzzle/concentration-1.2-r212
-rw-r--r--metadata/md5-cache/games-puzzle/connectagram-1.2.112
-rw-r--r--metadata/md5-cache/games-puzzle/connectagram-1.2.1-r112
-rw-r--r--metadata/md5-cache/games-puzzle/construo-0.2.212
-rw-r--r--metadata/md5-cache/games-puzzle/construo-0.2.2-r112
-rw-r--r--metadata/md5-cache/games-puzzle/cuyo-2.1.113
-rw-r--r--metadata/md5-cache/games-puzzle/cuyo-2.1.1-r113
-rw-r--r--metadata/md5-cache/games-puzzle/einstein-2.012
-rw-r--r--metadata/md5-cache/games-puzzle/einstein-2.1.112
-rw-r--r--metadata/md5-cache/games-puzzle/enigma-1.21-r213
-rw-r--r--metadata/md5-cache/games-puzzle/enigma-1.21-r313
-rw-r--r--metadata/md5-cache/games-puzzle/fbg-0.9-r112
-rw-r--r--metadata/md5-cache/games-puzzle/fbg-0.9-r212
-rw-r--r--metadata/md5-cache/games-puzzle/fish-fillets-1.0.1-r1 (renamed from metadata/md5-cache/games-puzzle/fish-fillets-1.0.1)10
-rw-r--r--metadata/md5-cache/games-puzzle/flobopuyo-0.20-r113
-rw-r--r--metadata/md5-cache/games-puzzle/flobopuyo-0.20-r213
-rw-r--r--metadata/md5-cache/games-puzzle/freesweep-0.9212
-rw-r--r--metadata/md5-cache/games-puzzle/freesweep-0.92-r112
-rw-r--r--metadata/md5-cache/games-puzzle/galaxis-1.812
-rw-r--r--metadata/md5-cache/games-puzzle/galaxis-1.8-r111
-rw-r--r--metadata/md5-cache/games-puzzle/gemdropx-0.9-r112
-rw-r--r--metadata/md5-cache/games-puzzle/gemdropx-0.9-r212
-rw-r--r--metadata/md5-cache/games-puzzle/gfifteen-1.0.312
-rw-r--r--metadata/md5-cache/games-puzzle/gfifteen-1.0.3-r112
-rw-r--r--metadata/md5-cache/games-puzzle/gnudoku-0.9313
-rw-r--r--metadata/md5-cache/games-puzzle/gnudoku-0.93-r113
-rw-r--r--metadata/md5-cache/games-puzzle/gnurobbo-0.6612
-rw-r--r--metadata/md5-cache/games-puzzle/gnurobbo-0.66-r112
-rw-r--r--metadata/md5-cache/games-puzzle/groundhog-1.413
-rw-r--r--metadata/md5-cache/games-puzzle/groundhog-1.4-r113
-rw-r--r--metadata/md5-cache/games-puzzle/gtkballs-3.1.5-r113
-rw-r--r--metadata/md5-cache/games-puzzle/gtkballs-3.1.5-r213
-rw-r--r--metadata/md5-cache/games-puzzle/gweled-0.9.1-r112
-rw-r--r--metadata/md5-cache/games-puzzle/gweled-0.9.1-r212
-rw-r--r--metadata/md5-cache/games-puzzle/hangman-0.9.212
-rw-r--r--metadata/md5-cache/games-puzzle/hangman-0.9.2-r112
-rw-r--r--metadata/md5-cache/games-puzzle/hexamine-0.2.114
-rw-r--r--metadata/md5-cache/games-puzzle/hexamine-0.2.1-r113
-rw-r--r--metadata/md5-cache/games-puzzle/icebreaker-1.9.612
-rw-r--r--metadata/md5-cache/games-puzzle/icebreaker-1.9.6-r112
-rw-r--r--metadata/md5-cache/games-puzzle/jools-0.20-r214
-rw-r--r--metadata/md5-cache/games-puzzle/jools-0.20-r314
-rw-r--r--metadata/md5-cache/games-puzzle/lpairs-1.0.413
-rw-r--r--metadata/md5-cache/games-puzzle/lpairs-1.0.4-r113
-rw-r--r--metadata/md5-cache/games-puzzle/ltris-1.0.1913
-rw-r--r--metadata/md5-cache/games-puzzle/ltris-1.0.19-r113
-rw-r--r--metadata/md5-cache/games-puzzle/magiccube4d-2.212
-rw-r--r--metadata/md5-cache/games-puzzle/magiccube4d-2.2-r112
-rw-r--r--metadata/md5-cache/games-puzzle/meandmyshadow-0.413
-rw-r--r--metadata/md5-cache/games-puzzle/meandmyshadow-0.4-r113
-rw-r--r--metadata/md5-cache/games-puzzle/mindless-1.613
-rw-r--r--metadata/md5-cache/games-puzzle/mindless-1.6-r113
-rw-r--r--metadata/md5-cache/games-puzzle/mirrormagic-2.0.2-r113
-rw-r--r--metadata/md5-cache/games-puzzle/mirrormagic-2.0.2-r213
-rw-r--r--metadata/md5-cache/games-puzzle/monsterz-0.7.1-r314
-rw-r--r--metadata/md5-cache/games-puzzle/monsterz-0.7.1-r414
-rw-r--r--metadata/md5-cache/games-puzzle/mures-0.513
-rw-r--r--metadata/md5-cache/games-puzzle/mures-0.5-r113
-rw-r--r--metadata/md5-cache/games-puzzle/neverball-1.6.014
-rw-r--r--metadata/md5-cache/games-puzzle/neverball-1.6.0-r114
-rw-r--r--metadata/md5-cache/games-puzzle/pauker-1.813
-rw-r--r--metadata/md5-cache/games-puzzle/pauker-1.8-r113
-rw-r--r--metadata/md5-cache/games-puzzle/penguzzle-1.0-r112
-rw-r--r--metadata/md5-cache/games-puzzle/penguzzle-1.0-r212
-rw-r--r--metadata/md5-cache/games-puzzle/picpuz-2.512
-rw-r--r--metadata/md5-cache/games-puzzle/picpuz-2.5-r112
-rw-r--r--metadata/md5-cache/games-puzzle/pipepanic-0.1.312
-rw-r--r--metadata/md5-cache/games-puzzle/pipepanic-0.1.3-r111
-rw-r--r--metadata/md5-cache/games-puzzle/pipewalker-0.9.412
-rw-r--r--metadata/md5-cache/games-puzzle/pipewalker-0.9.4-r112
-rw-r--r--metadata/md5-cache/games-puzzle/quadra-1.2.012
-rw-r--r--metadata/md5-cache/games-puzzle/quadra-1.2.0-r112
-rw-r--r--metadata/md5-cache/games-puzzle/rezerwar-0.4.212
-rw-r--r--metadata/md5-cache/games-puzzle/rezerwar-0.4.2-r112
-rw-r--r--metadata/md5-cache/games-puzzle/scramble-0.9.512
-rw-r--r--metadata/md5-cache/games-puzzle/scramble-0.9.5-r112
-rw-r--r--metadata/md5-cache/games-puzzle/sdl-jewels-1.1.113
-rw-r--r--metadata/md5-cache/games-puzzle/sdl-jewels-1.1.1-r113
-rw-r--r--metadata/md5-cache/games-puzzle/tanglet-1.3.112
-rw-r--r--metadata/md5-cache/games-puzzle/tanglet-1.3.1-r112
-rw-r--r--metadata/md5-cache/games-puzzle/tetrinet-0.1113
-rw-r--r--metadata/md5-cache/games-puzzle/tetrinet-0.11-r113
-rw-r--r--metadata/md5-cache/games-puzzle/textmaze-1.211
-rw-r--r--metadata/md5-cache/games-puzzle/textmaze-1.2-r110
-rw-r--r--metadata/md5-cache/games-puzzle/tint-0.03b12
-rw-r--r--metadata/md5-cache/games-puzzle/tint-0.03b-r111
-rw-r--r--metadata/md5-cache/games-puzzle/tod-012
-rw-r--r--metadata/md5-cache/games-puzzle/tod-0-r112
-rw-r--r--metadata/md5-cache/games-puzzle/tong-1.212
-rw-r--r--metadata/md5-cache/games-puzzle/tong-1.2-r112
-rw-r--r--metadata/md5-cache/games-puzzle/toppler-1.1.613
-rw-r--r--metadata/md5-cache/games-puzzle/toppler-1.1.6-r112
-rw-r--r--metadata/md5-cache/games-puzzle/torrent-0.8.212
-rw-r--r--metadata/md5-cache/games-puzzle/torrent-0.8.2-r112
-rw-r--r--metadata/md5-cache/games-puzzle/wakkabox-1.1.012
-rw-r--r--metadata/md5-cache/games-puzzle/wakkabox-1.1.0-r112
-rw-r--r--metadata/md5-cache/games-puzzle/wizznic-36912
-rw-r--r--metadata/md5-cache/games-puzzle/wizznic-369-r112
-rw-r--r--metadata/md5-cache/games-puzzle/world-of-goo-demo-1.41-r112
-rw-r--r--metadata/md5-cache/games-puzzle/world-of-goo-demo-1.41-r212
-rw-r--r--metadata/md5-cache/games-puzzle/xblockout-1.1.612
-rw-r--r--metadata/md5-cache/games-puzzle/xblockout-1.1.6-r112
-rw-r--r--metadata/md5-cache/games-puzzle/xpired-1.2212
-rw-r--r--metadata/md5-cache/games-puzzle/xpired-1.22-r112
-rw-r--r--metadata/md5-cache/games-puzzle/xtris-1.1512
-rw-r--r--metadata/md5-cache/games-puzzle/xtris-1.15-r112
-rw-r--r--metadata/md5-cache/games-puzzle/zaz-1.0.013
-rw-r--r--metadata/md5-cache/games-puzzle/zaz-1.0.0-r113
-rw-r--r--metadata/md5-cache/games-rpg/bass-1.2-r112
-rw-r--r--metadata/md5-cache/games-rpg/bass-1.312
-rw-r--r--metadata/md5-cache/games-rpg/draci-historie-201213
-rw-r--r--metadata/md5-cache/games-rpg/draci-historie-2012-r112
-rw-r--r--metadata/md5-cache/games-rpg/drascula-1.0-r214
-rw-r--r--metadata/md5-cache/games-rpg/drascula-1.0-r314
-rw-r--r--metadata/md5-cache/games-rpg/dreamweb-1.113
-rw-r--r--metadata/md5-cache/games-rpg/dreamweb-1.1-r112
-rw-r--r--metadata/md5-cache/games-rpg/freedink-108.412
-rw-r--r--metadata/md5-cache/games-rpg/freedink-108.4-r112
-rw-r--r--metadata/md5-cache/games-rpg/freedink-data-1.08.2014090111
-rw-r--r--metadata/md5-cache/games-rpg/freedink-data-1.08.20140901-r19
-rw-r--r--metadata/md5-cache/games-rpg/queen-1-r1 (renamed from metadata/md5-cache/games-rpg/queen-1)10
-rw-r--r--metadata/md5-cache/games-rpg/soltys-1.0-r113
-rw-r--r--metadata/md5-cache/games-rpg/soltys-1.0-r212
-rw-r--r--metadata/md5-cache/games-rpg/zsdx-1.9.013
-rw-r--r--metadata/md5-cache/games-rpg/zsdx-1.9.0-r113
-rw-r--r--metadata/md5-cache/games-server/crossfire-server-1.71.014
-rw-r--r--metadata/md5-cache/games-server/crossfire-server-1.71.0-r113
-rw-r--r--metadata/md5-cache/games-simulation/cannonsmash-0.6.613
-rw-r--r--metadata/md5-cache/games-simulation/cannonsmash-0.6.6-r113
-rw-r--r--metadata/md5-cache/games-simulation/pmars-sdl-0.9.2e13
-rw-r--r--metadata/md5-cache/games-simulation/pmars-sdl-0.9.2e-r113
-rw-r--r--metadata/md5-cache/games-sports/foobillard-3.0a13
-rw-r--r--metadata/md5-cache/games-sports/foobillard-3.0a-r113
-rw-r--r--metadata/md5-cache/games-strategy/crimson-0.5.313
-rw-r--r--metadata/md5-cache/games-strategy/crimson-0.5.3-r113
-rw-r--r--metadata/md5-cache/games-strategy/dopewars-1.5.12-r213
-rw-r--r--metadata/md5-cache/games-strategy/dopewars-1.5.12-r313
-rw-r--r--metadata/timestamp.chk2
165 files changed, 996 insertions, 1009 deletions
diff --git a/metadata/md5-cache/dev-java/lucene-2.4.1-r2 b/metadata/md5-cache/dev-java/lucene-2.4.1-r2
index 96109f3390b9..09ee302a6629 100644
--- a/metadata/md5-cache/dev-java/lucene-2.4.1-r2
+++ b/metadata/md5-cache/dev-java/lucene-2.4.1-r2
@@ -10,4 +10,4 @@ RDEPEND=dev-java/javacc:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 sour
SLOT=2.4
SRC_URI=https://archive.apache.org/dist/lucene/java/lucene-2.4.1-src.tar.gz -> lucene-2.4.1.tar.gz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-ant-2 ea15ab9e838d1062abd6b53de2045d50 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=90c28a55e0a841c1e994c75b1a02d31e
+_md5_=f600176223481fd074181365488abbb2
diff --git a/metadata/md5-cache/dev-python/namespace-zope-1 b/metadata/md5-cache/dev-python/namespace-zope-1
index 426b9d9052b2..622dedbb7613 100644
--- a/metadata/md5-cache/dev-python/namespace-zope-1
+++ b/metadata/md5-cache/dev-python/namespace-zope-1
@@ -4,10 +4,10 @@ DESCRIPTION=Namespace package declaration for zope
EAPI=6
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages
IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=public-domain
RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
_eclasses_=multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=89500e3266147e9205e41e57c1d6be52
+_md5_=3eb1f5cea3aa4370f5975bcf3edfc862
diff --git a/metadata/md5-cache/dev-python/zope-interface-4.4.3 b/metadata/md5-cache/dev-python/zope-interface-4.4.3
index a7a0be7fbb1c..d2ad115dee30 100644
--- a/metadata/md5-cache/dev-python/zope-interface-4.4.3
+++ b/metadata/md5-cache/dev-python/zope-interface-4.4.3
@@ -4,11 +4,11 @@ DESCRIPTION=Interfaces for Python
EAPI=6
HOMEPAGE=https://pypi.org/project/zope.interface/ https://github.com/zopefoundation/zope.interface
IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=ZPL
RDEPEND=dev-python/namespace-zope[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/z/zope.interface/zope.interface-4.4.3.tar.gz
_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 distutils-r1 c25bafd988acc946bfa457eac09621d8 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f01a53d1794d4c99ed0d9577c2042bc4
+_md5_=6c006dc04831668d59f4ec880c426560
diff --git a/metadata/md5-cache/games-fps/freedoom-0.10.1 b/metadata/md5-cache/games-fps/freedoom-0.10.1
deleted file mode 100644
index c3707006e1f4..000000000000
--- a/metadata/md5-cache/games-fps/freedoom-0.10.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Freedoom - Open Source Doom resources
-EAPI=5
-HOMEPAGE=http://www.nongnu.org/freedoom/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=games-misc/games-envd
-SLOT=0
-SRC_URI=https://github.com/freedoom/freedoom/releases/download/v0.10.1/freedoom-0.10.1.zip https://github.com/freedoom/freedoom/releases/download/v0.10.1/freedm-0.10.1.zip
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d98afee67f00153288a028fd9f11fda0
diff --git a/metadata/md5-cache/games-fps/freedoom-0.10.1-r1 b/metadata/md5-cache/games-fps/freedoom-0.10.1-r1
new file mode 100644
index 000000000000..a504221ffcf8
--- /dev/null
+++ b/metadata/md5-cache/games-fps/freedoom-0.10.1-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst
+DEPEND=app-arch/unzip
+DESCRIPTION=Freedoom - Open Source Doom resources
+EAPI=6
+HOMEPAGE=http://www.nongnu.org/freedoom/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/freedoom/freedoom/releases/download/v0.10.1/freedoom-0.10.1.zip https://github.com/freedoom/freedoom/releases/download/v0.10.1/freedm-0.10.1.zip
+_eclasses_=readme.gentoo-r1 6f03e110529650f57fc7d1fb908b8986
+_md5_=8692ada031f3b3a1ef2e1c005621b824
diff --git a/metadata/md5-cache/games-fps/openarena-0.8.8 b/metadata/md5-cache/games-fps/openarena-0.8.8-r1
index 3e5501d58ce2..2667e7e4611b 100644
--- a/metadata/md5-cache/games-fps/openarena-0.8.8
+++ b/metadata/md5-cache/games-fps/openarena-0.8.8-r1
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEFINED_PHASES=compile install prepare
DEPEND=media-libs/libsdl[joystick,opengl,video] media-libs/speex media-libs/speexdsp virtual/jpeg:0 virtual/opengl x11-libs/libXext x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp curl? ( net-misc/curl ) openal? ( media-libs/openal ) vorbis? ( media-libs/libvorbis ) app-arch/unzip
DESCRIPTION=Open-source replacement for Quake 3 Arena
-EAPI=5
+EAPI=6
HOMEPAGE=http://openarena.ws/
IUSE=+curl +openal +vorbis
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[joystick,opengl,video] media-libs/speex media-libs/speexdsp virtual/jpeg:0 virtual/opengl x11-libs/libXext x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp curl? ( net-misc/curl ) openal? ( media-libs/openal ) vorbis? ( media-libs/libvorbis ) games-misc/games-envd
+RDEPEND=media-libs/libsdl[joystick,opengl,video] media-libs/speex media-libs/speexdsp virtual/jpeg:0 virtual/opengl x11-libs/libXext x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp curl? ( net-misc/curl ) openal? ( media-libs/openal ) vorbis? ( media-libs/libvorbis )
SLOT=0
SRC_URI=mirror://sourceforge/oarena/openarena-0.8.8.zip mirror://sourceforge/oarena/src/openarena-engine-source-0.8.8.tar.bz2
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3ca5786f89497077b6530e99c45d0d5a
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b3eee15f66296c23c8f48436d959c634
diff --git a/metadata/md5-cache/games-fps/prboom-2.5.0 b/metadata/md5-cache/games-fps/prboom-2.5.0
deleted file mode 100644
index 22af2c50cced..000000000000
--- a/metadata/md5-cache/games-fps/prboom-2.5.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[joystick,video] media-libs/sdl-mixer media-libs/sdl-net !<games-fps/lsdldoom-1.5 virtual/opengl virtual/glu
-DESCRIPTION=Port of ID's doom to SDL and OpenGL
-EAPI=5
-HOMEPAGE=http://prboom.sourceforge.net/
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[joystick,video] media-libs/sdl-mixer media-libs/sdl-net !<games-fps/lsdldoom-1.5 virtual/opengl virtual/glu games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/prboom/prboom-2.5.0.tar.gz mirror://gentoo/prboom.png
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=44df56efb0b27a0414538f2e743eccbf
diff --git a/metadata/md5-cache/games-fps/prboom-2.5.0-r1 b/metadata/md5-cache/games-fps/prboom-2.5.0-r1
new file mode 100644
index 000000000000..7db92764d836
--- /dev/null
+++ b/metadata/md5-cache/games-fps/prboom-2.5.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=media-libs/libsdl[joystick,video] media-libs/sdl-mixer media-libs/sdl-net !<games-fps/lsdldoom-1.5 virtual/opengl virtual/glu
+DESCRIPTION=Port of ID's doom to SDL and OpenGL
+EAPI=6
+HOMEPAGE=http://prboom.sourceforge.net/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[joystick,video] media-libs/sdl-mixer media-libs/sdl-net !<games-fps/lsdldoom-1.5 virtual/opengl virtual/glu
+SLOT=0
+SRC_URI=mirror://sourceforge/prboom/prboom-2.5.0.tar.gz mirror://gentoo/prboom.png
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 multilib 97f470f374f2e94ccab04a2fb21d811e readme.gentoo-r1 6f03e110529650f57fc7d1fb908b8986 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=4b810e04c77b642653282950bec9291b
diff --git a/metadata/md5-cache/games-fps/transfusion-bin-1.01 b/metadata/md5-cache/games-fps/transfusion-bin-1.01
deleted file mode 100644
index 936e1f57ddb7..000000000000
--- a/metadata/md5-cache/games-fps/transfusion-bin-1.01
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=sys-libs/glibc app-arch/unzip
-DESCRIPTION=Blood remake
-EAPI=5
-HOMEPAGE=http://www.transfusion-game.com/
-KEYWORDS=-* ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/glibc games-misc/games-envd
-RESTRICT=strip
-SLOT=0
-SRC_URI=mirror://sourceforge/blood/transfusion-1.0-linux.i386.zip mirror://sourceforge/blood/transfusion-patch-1.01-linux.i386.zip mirror://gentoo/transfusion.png
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=993f3b5b27158be645e74beb94ca749a
diff --git a/metadata/md5-cache/games-fps/transfusion-bin-1.01-r1 b/metadata/md5-cache/games-fps/transfusion-bin-1.01-r1
new file mode 100644
index 000000000000..a8264539cd3e
--- /dev/null
+++ b/metadata/md5-cache/games-fps/transfusion-bin-1.01-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install
+DEPEND=sys-libs/glibc app-arch/unzip
+DESCRIPTION=Blood remake
+EAPI=6
+HOMEPAGE=http://www.transfusion-game.com/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/glibc
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/blood/transfusion-1.0-linux.i386.zip mirror://sourceforge/blood/transfusion-patch-1.01-linux.i386.zip mirror://gentoo/transfusion.png
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c123632b9e1261ee42b51ac516b3f2de
diff --git a/metadata/md5-cache/games-fps/worldofpadman-1.6 b/metadata/md5-cache/games-fps/worldofpadman-1.6
deleted file mode 100644
index fe5d848b7306..000000000000
--- a/metadata/md5-cache/games-fps/worldofpadman-1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=sys-libs/zlib !dedicated? ( media-libs/libsdl[opengl,video,X] >=media-libs/speex-1.2.0 media-libs/speexdsp virtual/glu virtual/jpeg:0 virtual/opengl openal? ( media-libs/openal ) curl? ( net-misc/curl ) vorbis? ( media-libs/libvorbis ) theora? ( media-libs/libtheora media-libs/libogg ) ) app-arch/unzip
-DESCRIPTION=A cartoon style multiplayer first-person shooter
-EAPI=5
-HOMEPAGE=http://worldofpadman.net/
-IUSE=+curl dedicated maps +openal +theora +vorbis
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 worldofpadman
-RDEPEND=sys-libs/zlib !dedicated? ( media-libs/libsdl[opengl,video,X] >=media-libs/speex-1.2.0 media-libs/speexdsp virtual/glu virtual/jpeg:0 virtual/opengl openal? ( media-libs/openal ) curl? ( net-misc/curl ) vorbis? ( media-libs/libvorbis ) theora? ( media-libs/libtheora media-libs/libogg ) ) games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/worldofpadman/wop-1.5-unified.zip mirror://sourceforge/worldofpadman/wop-1.5.x-to-1.6-patch-unified.zip
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=328f8a6b760199ea68026d29f58fca56
diff --git a/metadata/md5-cache/games-fps/worldofpadman-1.6-r1 b/metadata/md5-cache/games-fps/worldofpadman-1.6-r1
new file mode 100644
index 000000000000..d91cbfbcff13
--- /dev/null
+++ b/metadata/md5-cache/games-fps/worldofpadman-1.6-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=sys-libs/zlib !dedicated? ( >=media-libs/speex-1.2.0 media-libs/speexdsp virtual/jpeg:0 media-libs/libsdl[opengl,video,X] virtual/opengl virtual/glu openal? ( media-libs/openal ) curl? ( net-misc/curl ) vorbis? ( media-libs/libvorbis ) theora? ( media-libs/libtheora media-libs/libogg ) ) app-arch/unzip
+DESCRIPTION=A cartoon style multiplayer first-person shooter
+EAPI=6
+HOMEPAGE=http://worldofpadman.net/
+IUSE=+curl dedicated maps +openal +theora +vorbis
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 worldofpadman
+RDEPEND=sys-libs/zlib !dedicated? ( >=media-libs/speex-1.2.0 media-libs/speexdsp virtual/jpeg:0 media-libs/libsdl[opengl,video,X] virtual/opengl virtual/glu openal? ( media-libs/openal ) curl? ( net-misc/curl ) vorbis? ( media-libs/libvorbis ) theora? ( media-libs/libtheora media-libs/libogg ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/worldofpadman/wop-1.5-unified.zip mirror://sourceforge/worldofpadman/wop-1.5.x-to-1.6-patch-unified.zip
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6
+_md5_=801cc98bc4ca6c26293e6acff08509a7
diff --git a/metadata/md5-cache/games-kids/memonix-1.6 b/metadata/md5-cache/games-kids/memonix-1.6
deleted file mode 100644
index 8a622e779e4c..000000000000
--- a/metadata/md5-cache/games-kids/memonix-1.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=media-libs/libsdl:0[sound,opengl,video,X] media-libs/sdl-image[jpeg] media-libs/sdl-mixer[vorbis] !games-kids/memonix-bin sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Brain teasers, puzzle and memory games for kid's in one pack
-EAPI=5
-HOMEPAGE=http://www.viewizard.com/memonix/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=media-libs/libsdl:0[sound,opengl,video,X] media-libs/sdl-image[jpeg] media-libs/sdl-mixer[vorbis] !games-kids/memonix-bin games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.viewizard.com/download/memonix_1.6_src.tar.bz2
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 cmake-utils d2f8cff68b90b869ef9d460c6f3c4e2e desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=592c8a59096b42af4c873af5e48269f0
diff --git a/metadata/md5-cache/games-kids/memonix-1.6-r1 b/metadata/md5-cache/games-kids/memonix-1.6-r1
new file mode 100644
index 000000000000..2587a8ae5a12
--- /dev/null
+++ b/metadata/md5-cache/games-kids/memonix-1.6-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/libsdl:0[sound,opengl,video,X] media-libs/sdl-image[jpeg] media-libs/sdl-mixer[vorbis] sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Brain teasers, puzzle and memory games for kid's in one pack
+EAPI=6
+HOMEPAGE=http://www.viewizard.com/memonix/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=media-libs/libsdl:0[sound,opengl,video,X] media-libs/sdl-image[jpeg] media-libs/sdl-mixer[vorbis]
+SLOT=0
+SRC_URI=http://www.viewizard.com/download/memonix_1.6_src.tar.bz2
+_eclasses_=cmake-utils d2f8cff68b90b869ef9d460c6f3c4e2e desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2c853ed4be13daa5ea431f53519dfe1e
diff --git a/metadata/md5-cache/games-misc/exult-sound-0 b/metadata/md5-cache/games-misc/exult-sound-0
deleted file mode 100644
index fc216bd105c0..000000000000
--- a/metadata/md5-cache/games-misc/exult-sound-0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=!<games-engines/exult-9999
-DESCRIPTION=sound data for games-engines/exult
-EAPI=5
-HOMEPAGE=http://exult.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/exult/U7MusicOGG_1of2.zip mirror://sourceforge/exult/U7MusicOGG_2of2.zip mirror://sourceforge/exult/jmsfx.zip mirror://sourceforge/exult/jmsfxsi.zip
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=83915e60bc5f4822ca2b8d209c4e662d
diff --git a/metadata/md5-cache/games-misc/exult-sound-0-r1 b/metadata/md5-cache/games-misc/exult-sound-0-r1
new file mode 100644
index 000000000000..d1f9549d3ac7
--- /dev/null
+++ b/metadata/md5-cache/games-misc/exult-sound-0-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DEPEND=!<games-engines/exult-9999
+DESCRIPTION=Sound data for games-engines/exult
+EAPI=6
+HOMEPAGE=http://exult.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/exult/U7MusicOGG_1of2.zip mirror://sourceforge/exult/U7MusicOGG_2of2.zip mirror://sourceforge/exult/jmsfx.zip mirror://sourceforge/exult/jmsfxsi.zip
+_md5_=6ba21de73cc05ab910631249a81cf9de
diff --git a/metadata/md5-cache/games-misc/typespeed-0.6.5 b/metadata/md5-cache/games-misc/typespeed-0.6.5
deleted file mode 100644
index df88cdb9bad2..000000000000
--- a/metadata/md5-cache/games-misc/typespeed-0.6.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=sys-libs/ncurses:0 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=Test your typing speed, and get your fingers CPS
-EAPI=5
-HOMEPAGE=http://typespeed.sourceforge.net/
-IUSE=nls
-KEYWORDS=~alpha ~amd64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0 nls? ( virtual/libintl ) games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/typespeed/typespeed-0.6.5.tar.gz
-_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=93ec221ee4a7c36643615f1aaeabd1b0
diff --git a/metadata/md5-cache/games-misc/typespeed-0.6.5-r1 b/metadata/md5-cache/games-misc/typespeed-0.6.5-r1
new file mode 100644
index 000000000000..ca64b9425134
--- /dev/null
+++ b/metadata/md5-cache/games-misc/typespeed-0.6.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=sys-libs/ncurses:0= 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=Test your typing speed, and get your fingers CPS
+EAPI=6
+HOMEPAGE=http://typespeed.sourceforge.net/
+IUSE=nls
+KEYWORDS=~alpha ~amd64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0= nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://sourceforge/typespeed/typespeed-0.6.5.tar.gz
+_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=286b4eb8cae4eddf435920acc670c6f7
diff --git a/metadata/md5-cache/games-puzzle/4stattack-2.1.4 b/metadata/md5-cache/games-puzzle/4stattack-2.1.4
deleted file mode 100644
index a1066652097e..000000000000
--- a/metadata/md5-cache/games-puzzle/4stattack-2.1.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DESCRIPTION=Connect-4 game, single or network multiplayer
-EAPI=5
-HOMEPAGE=http://forcedattack.sourceforge.net/
-KEYWORDS=~amd64 ~hppa ~x86
-LICENSE=GPL-2
-RDEPEND=dev-python/pygame games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/forcedattack/4stAttack-2.1.4.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=81b52b97483f2059c7f88e19fafd3c82
diff --git a/metadata/md5-cache/games-puzzle/4stattack-2.1.4-r1 b/metadata/md5-cache/games-puzzle/4stattack-2.1.4-r1
new file mode 100644
index 000000000000..c928cadf6242
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/4stattack-2.1.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare setup
+DESCRIPTION=Connect-4 game, single or network multiplayer
+EAPI=6
+HOMEPAGE=http://forcedattack.sourceforge.net/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://sourceforge/forcedattack/4stAttack-2.1.4.tar.gz
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=432fafc865caa46a4224d9a2f1d3277f
diff --git a/metadata/md5-cache/games-puzzle/anagramarama-0.2 b/metadata/md5-cache/games-puzzle/anagramarama-0.2
deleted file mode 100644
index adb813269cf1..000000000000
--- a/metadata/md5-cache/games-puzzle/anagramarama-0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=media-libs/libsdl-1.2 >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-image-1.2
-DESCRIPTION=Create as many words as you can before the time runs out
-EAPI=5
-HOMEPAGE=http://www.coralquest.com/anagramarama/
-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 games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.omega.clara.net/anagramarama/dist/anagramarama-0.2.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=66a94f6d661b4b9ac1174b50aeb7204f
diff --git a/metadata/md5-cache/games-puzzle/anagramarama-0.2-r1 b/metadata/md5-cache/games-puzzle/anagramarama-0.2-r1
new file mode 100644
index 000000000000..7c525ab391e1
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/anagramarama-0.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=media-libs/libsdl-1.2 >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-image-1.2
+DESCRIPTION=Create as many words as you can before the time runs out
+EAPI=6
+HOMEPAGE=http://www.coralquest.com/anagramarama/
+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 2ccd1dd1dd7bfb8795eea024a4f91bb6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1b9a4977cc7752821cb6985c79003ad0
diff --git a/metadata/md5-cache/games-puzzle/angrydd-1.0.1-r1 b/metadata/md5-cache/games-puzzle/angrydd-1.0.1-r1
deleted file mode 100644
index 09cb0e4d65b9..000000000000
--- a/metadata/md5-cache/games-puzzle/angrydd-1.0.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
-DESCRIPTION=Angry, Drunken Dwarves, a falling blocks game similar to Puzzle Fighter
-EAPI=5
-HOMEPAGE=https://www.sacredchao.net/~piman/angrydd/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] games-misc/games-envd
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://www.sacredchao.net/~piman/angrydd/angrydd-1.0.1.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=93f1d8c31ff43461e10a6f57d568c4c9
diff --git a/metadata/md5-cache/games-puzzle/angrydd-1.0.1-r2 b/metadata/md5-cache/games-puzzle/angrydd-1.0.1-r2
new file mode 100644
index 000000000000..6c3d8214f748
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/angrydd-1.0.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
+DESCRIPTION=Angry, Drunken Dwarves, a falling blocks game similar to Puzzle Fighter
+EAPI=6
+HOMEPAGE=https://www.sacredchao.net/~piman/angrydd/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://www.sacredchao.net/~piman/angrydd/angrydd-1.0.1.tar.gz
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=1d951cea0d4049e8838f68371520673c
diff --git a/metadata/md5-cache/games-puzzle/color-lines-0.6 b/metadata/md5-cache/games-puzzle/color-lines-0.6
deleted file mode 100644
index ad6bdba90ba8..000000000000
--- a/metadata/md5-cache/games-puzzle/color-lines-0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[X,sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[wav,mod]
-DESCRIPTION=Color lines game written with SDL with bonus features
-EAPI=5
-HOMEPAGE=https://github.com/OpenA/color-lines-sdl
-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] games-misc/games-envd
-SLOT=0
-SRC_URI=https://color-lines.googlecode.com/files/lines_0.6.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=24d49d8acd3b8417152cba89b4932c16
diff --git a/metadata/md5-cache/games-puzzle/color-lines-0.6-r1 b/metadata/md5-cache/games-puzzle/color-lines-0.6-r1
new file mode 100644
index 000000000000..7796da25aa10
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/color-lines-0.6-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/libsdl[X,sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[wav,mod]
+DESCRIPTION=Color lines game written with SDL with bonus features
+EAPI=6
+HOMEPAGE=https://github.com/OpenA/color-lines-sdl
+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 2ccd1dd1dd7bfb8795eea024a4f91bb6
+_md5_=8bdaad715e716713d0f8c0d61f1a109d
diff --git a/metadata/md5-cache/games-puzzle/concentration-1.2-r1 b/metadata/md5-cache/games-puzzle/concentration-1.2-r1
deleted file mode 100644
index b735bae006b2..000000000000
--- a/metadata/md5-cache/games-puzzle/concentration-1.2-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/sdl-mixer[vorbis] media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf
-DESCRIPTION=The classic memory game with some new life
-EAPI=5
-HOMEPAGE=https://packages.gentoo.org/package/games-puzzle/concentration
-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 games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://gentoo/concentration-1.2.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1919bed6d83ac0a66f329463ddec008e
diff --git a/metadata/md5-cache/games-puzzle/concentration-1.2-r2 b/metadata/md5-cache/games-puzzle/concentration-1.2-r2
new file mode 100644
index 000000000000..bde2e9a48033
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/concentration-1.2-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer[vorbis] media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf
+DESCRIPTION=The classic memory game with some new life
+EAPI=6
+HOMEPAGE=https://packages.gentoo.org/package/games-puzzle/concentration
+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
+SLOT=0
+SRC_URI=mirror://gentoo/concentration-1.2.tar.gz
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6
+_md5_=d5aebd2609f1d4af129b817feb7ed6cb
diff --git a/metadata/md5-cache/games-puzzle/connectagram-1.2.1 b/metadata/md5-cache/games-puzzle/connectagram-1.2.1
deleted file mode 100644
index 0d0593e2519b..000000000000
--- a/metadata/md5-cache/games-puzzle/connectagram-1.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-qt/qtcore-5.2:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=dev-qt/qtgui-5.2:5 >=sys-apps/sed-4
-DESCRIPTION=A word unscrambling game
-EAPI=5
-HOMEPAGE=https://gottcode.org/connectagram/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-qt/qtcore-5.2:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=dev-qt/qtgui-5.2:5 games-misc/games-envd
-SLOT=0
-SRC_URI=https://gottcode.org/connectagram/connectagram-1.2.1-src.tar.bz2
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ace2e68a1b2eb9c500ab3cf9d8e451fb
diff --git a/metadata/md5-cache/games-puzzle/connectagram-1.2.1-r1 b/metadata/md5-cache/games-puzzle/connectagram-1.2.1-r1
new file mode 100644
index 000000000000..8f5e8d810b75
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/connectagram-1.2.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=>=dev-qt/qtcore-5.2:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=dev-qt/qtgui-5.2:5 >=sys-apps/sed-4
+DESCRIPTION=A word unscrambling game
+EAPI=6
+HOMEPAGE=https://gottcode.org/connectagram/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-qt/qtcore-5.2:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 >=dev-qt/qtgui-5.2:5
+SLOT=0
+SRC_URI=https://gottcode.org/connectagram/connectagram-1.2.1-src.tar.bz2
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ad48e95a6d2e5715e6c8aba8346d931e
diff --git a/metadata/md5-cache/games-puzzle/construo-0.2.2 b/metadata/md5-cache/games-puzzle/construo-0.2.2
deleted file mode 100644
index 9a77dab49366..000000000000
--- a/metadata/md5-cache/games-puzzle/construo-0.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=virtual/opengl virtual/glu media-libs/freeglut x11-libs/libXxf86vm x11-proto/xf86vidmodeproto >=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=2d construction toy with objects that react on physical forces
-EAPI=5
-HOMEPAGE=http://www.nongnu.org/construo/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/opengl virtual/glu media-libs/freeglut x11-libs/libXxf86vm games-misc/games-envd
-SLOT=0
-SRC_URI=http://freesoftware.fsf.org/download/construo/construo.pkg/0.2.2/construo-0.2.2.tar.gz
-_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bd5d56c5e0363a9d95c7bcab3f2f59e9
diff --git a/metadata/md5-cache/games-puzzle/construo-0.2.2-r1 b/metadata/md5-cache/games-puzzle/construo-0.2.2-r1
new file mode 100644
index 000000000000..331fb5685b10
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/construo-0.2.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=virtual/opengl virtual/glu media-libs/freeglut x11-libs/libXxf86vm x11-proto/xf86vidmodeproto >=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=2d construction toy with objects that react on physical forces
+EAPI=6
+HOMEPAGE=http://www.nongnu.org/construo/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/opengl virtual/glu media-libs/freeglut x11-libs/libXxf86vm
+SLOT=0
+SRC_URI=http://freesoftware.fsf.org/download/construo/construo.pkg/0.2.2/construo-0.2.2.tar.gz
+_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=bd59746d9520ea9e14a1eba94abf1cf5
diff --git a/metadata/md5-cache/games-puzzle/cuyo-2.1.1 b/metadata/md5-cache/games-puzzle/cuyo-2.1.1
deleted file mode 100644
index e9db7f1ad1a4..000000000000
--- a/metadata/md5-cache/games-puzzle/cuyo-2.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=sys-libs/zlib media-libs/libsdl[sound,video] media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mod] ) media-libs/sdl-image >=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=highly addictive and remotely related to tetris
-EAPI=5
-HOMEPAGE=http://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 games-misc/games-envd
-SLOT=0
-SRC_URI=https://savannah.nongnu.org/download/cuyo/cuyo-2.~-1.1.tar.gz
-_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde gnome2-utils 4d211d7614f303710fca59db6ec12c88 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=37f535bdb2f3637ad45cc9a8f97b7dd7
diff --git a/metadata/md5-cache/games-puzzle/cuyo-2.1.1-r1 b/metadata/md5-cache/games-puzzle/cuyo-2.1.1-r1
new file mode 100644
index 000000000000..9aff1b7e110e
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/cuyo-2.1.1-r1
@@ -0,0 +1,13 @@
+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 >=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=highly addictive and remotely related to tetris
+EAPI=6
+HOMEPAGE=http://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 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 gnome2-utils 4d211d7614f303710fca59db6ec12c88 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9c42543f2c8d1db4c3683c0c17c1a874
diff --git a/metadata/md5-cache/games-puzzle/einstein-2.0 b/metadata/md5-cache/games-puzzle/einstein-2.0
deleted file mode 100644
index 0cd16f9f0492..000000000000
--- a/metadata/md5-cache/games-puzzle/einstein-2.0
+++ /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 media-libs/sdl-ttf
-DESCRIPTION=A puzzle game inspired by Albert Einstein
-EAPI=5
-HOMEPAGE=https://freecode.com/projects/einsteinpuzzle
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer media-libs/sdl-ttf games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://gentoo/einstein-2.0-src.tar.gz mirror://gentoo/einstein.png
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e7ec5b085480a3e4f64af27fcf06af48
diff --git a/metadata/md5-cache/games-puzzle/einstein-2.1.1 b/metadata/md5-cache/games-puzzle/einstein-2.1.1
new file mode 100644
index 000000000000..5f9a34a5c5c5
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/einstein-2.1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+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
+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 mirror://gentoo/einstein.png
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6
+_md5_=9d1e1e23d6b6e391f09c66e3e042cf4e
diff --git a/metadata/md5-cache/games-puzzle/enigma-1.21-r2 b/metadata/md5-cache/games-puzzle/enigma-1.21-r2
deleted file mode 100644
index 674650192791..000000000000
--- a/metadata/md5-cache/games-puzzle/enigma-1.21-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=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 ) 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 >=sys-apps/sed-4
-DESCRIPTION=puzzle game similar to Oxyd
-EAPI=5
-HOMEPAGE=http://www.nongnu.org/enigma/
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=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 ) media-fonts/dejavu x11-misc/xdg-utils games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/enigma-game/enigma-1.21.tar.gz
-_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde gnome2-utils 4d211d7614f303710fca59db6ec12c88 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=40244447f34dd5d989f0350232d965a0
diff --git a/metadata/md5-cache/games-puzzle/enigma-1.21-r3 b/metadata/md5-cache/games-puzzle/enigma-1.21-r3
new file mode 100644
index 000000000000..f81381223a1b
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/enigma-1.21-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=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 ) 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 >=sys-apps/sed-4
+DESCRIPTION=Puzzle game similar to Oxyd
+EAPI=6
+HOMEPAGE=http://www.nongnu.org/enigma/
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=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 ) media-fonts/dejavu x11-misc/xdg-utils
+SLOT=0
+SRC_URI=mirror://sourceforge/enigma-game/enigma-1.21.tar.gz
+_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 gnome2-utils 4d211d7614f303710fca59db6ec12c88 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7a39fe1a5cc89e9ee6eb309833d4a085
diff --git a/metadata/md5-cache/games-puzzle/fbg-0.9-r1 b/metadata/md5-cache/games-puzzle/fbg-0.9-r1
deleted file mode 100644
index 97d032c14af0..000000000000
--- a/metadata/md5-cache/games-puzzle/fbg-0.9-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=virtual/opengl virtual/glu dev-games/physfs media-libs/libsdl[opengl,video] media-libs/libmikmod x11-libs/libXt
-DESCRIPTION=A Tetris clone written in OpenGL
-EAPI=5
-HOMEPAGE=http://fbg.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/opengl virtual/glu dev-games/physfs media-libs/libsdl[opengl,video] media-libs/libmikmod x11-libs/libXt games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/fbg/fbg-0.9.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0b9e0e57eccb662943e801be95373b35
diff --git a/metadata/md5-cache/games-puzzle/fbg-0.9-r2 b/metadata/md5-cache/games-puzzle/fbg-0.9-r2
new file mode 100644
index 000000000000..18d1c3d5a7cc
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/fbg-0.9-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=virtual/opengl virtual/glu dev-games/physfs media-libs/libsdl[opengl,video] media-libs/libmikmod x11-libs/libXt
+DESCRIPTION=A Tetris clone written in OpenGL
+EAPI=6
+HOMEPAGE=http://fbg.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/opengl virtual/glu dev-games/physfs media-libs/libsdl[opengl,video] media-libs/libmikmod x11-libs/libXt
+SLOT=0
+SRC_URI=mirror://sourceforge/fbg/fbg-0.9.tar.gz
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6
+_md5_=6496846e678673ab39646f9b6685c86c
diff --git a/metadata/md5-cache/games-puzzle/fish-fillets-1.0.1 b/metadata/md5-cache/games-puzzle/fish-fillets-1.0.1-r1
index d54f150d91f6..3044b76b0fa6 100644
--- a/metadata/md5-cache/games-puzzle/fish-fillets-1.0.1
+++ b/metadata/md5-cache/games-puzzle/fish-fillets-1.0.1-r1
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEFINED_PHASES=configure install prepare
DEPEND=>=media-libs/libsdl-1.2[sound,video] >=media-libs/sdl-mixer-1.2.5[vorbis] >=media-libs/sdl-image-1.2.2[png] media-libs/smpeg x11-libs/libX11 media-libs/sdl-ttf dev-libs/fribidi >=dev-lang/lua-5:0 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=Underwater puzzle game - find a safe way out
-EAPI=5
+EAPI=6
HOMEPAGE=http://fillets.sourceforge.net/
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
-RDEPEND=>=media-libs/libsdl-1.2[sound,video] >=media-libs/sdl-mixer-1.2.5[vorbis] >=media-libs/sdl-image-1.2.2[png] media-libs/smpeg x11-libs/libX11 media-libs/sdl-ttf dev-libs/fribidi >=dev-lang/lua-5:0 games-misc/games-envd
+RDEPEND=>=media-libs/libsdl-1.2[sound,video] >=media-libs/sdl-mixer-1.2.5[vorbis] >=media-libs/sdl-image-1.2.2[png] media-libs/smpeg x11-libs/libX11 media-libs/sdl-ttf dev-libs/fribidi >=dev-lang/lua-5:0
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 4842e626555a9a4344f34cef2e190b67 base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ff7502ab4a169e7e810e71f0d8a9bcae
+_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=de86afe409d07ddab620efb86ccdf5b6
diff --git a/metadata/md5-cache/games-puzzle/flobopuyo-0.20-r1 b/metadata/md5-cache/games-puzzle/flobopuyo-0.20-r1
deleted file mode 100644
index 0eb02d111dbd..000000000000
--- a/metadata/md5-cache/games-puzzle/flobopuyo-0.20-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod] opengl? ( virtual/opengl )
-DESCRIPTION=Clone of the famous PuyoPuyo game
-EAPI=5
-HOMEPAGE=http://www.ios-software.com/?page=projet&quoi=29
-IUSE=opengl
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod] opengl? ( virtual/opengl ) games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.ios-software.com/flobopuyo/flobopuyo-0.20.tgz mirror://gentoo/flobopuyo.png
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=41ebe9d5b90b798fe6b89923ac8670a2
diff --git a/metadata/md5-cache/games-puzzle/flobopuyo-0.20-r2 b/metadata/md5-cache/games-puzzle/flobopuyo-0.20-r2
new file mode 100644
index 000000000000..954cbc59b958
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/flobopuyo-0.20-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/libsdl media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod] opengl? ( virtual/opengl )
+DESCRIPTION=Clone of the famous PuyoPuyo game
+EAPI=6
+HOMEPAGE=http://www.ios-software.com/?page=projet&quoi=29
+IUSE=opengl
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod] opengl? ( virtual/opengl )
+SLOT=0
+SRC_URI=http://www.ios-software.com/flobopuyo/flobopuyo-0.20.tgz mirror://gentoo/flobopuyo.png
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=4757271660e5a721706e1fd8071b6c6b
diff --git a/metadata/md5-cache/games-puzzle/freesweep-0.92 b/metadata/md5-cache/games-puzzle/freesweep-0.92
deleted file mode 100644
index 23870c508228..000000000000
--- a/metadata/md5-cache/games-puzzle/freesweep-0.92
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=sys-libs/ncurses:0 virtual/pkgconfig
-DESCRIPTION=Console Minesweeper
-EAPI=5
-HOMEPAGE=http://freshmeat.net/projects/freesweep
-KEYWORDS=~amd64 ~x86 ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0 games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.upl.cs.wisc.edu/~hartmann/sweep/freesweep-0.92.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d556a4ac6132cc89cae98a1fbd3200cd
diff --git a/metadata/md5-cache/games-puzzle/freesweep-0.92-r1 b/metadata/md5-cache/games-puzzle/freesweep-0.92-r1
new file mode 100644
index 000000000000..cb4414a3d291
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/freesweep-0.92-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=sys-libs/ncurses:0= virtual/pkgconfig
+DESCRIPTION=Console Minesweeper
+EAPI=6
+HOMEPAGE=http://freshmeat.net/projects/freesweep
+KEYWORDS=~amd64 ~x86 ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=http://www.upl.cs.wisc.edu/~hartmann/sweep/freesweep-0.92.tar.gz
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=b75af3d4dc92cd83588e18171e0064c6
diff --git a/metadata/md5-cache/games-puzzle/galaxis-1.8 b/metadata/md5-cache/games-puzzle/galaxis-1.8
deleted file mode 100644
index d0a568d3301c..000000000000
--- a/metadata/md5-cache/games-puzzle/galaxis-1.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=sys-libs/ncurses-5.3:0
-DESCRIPTION=Curses-based clone of the nifty little Macintosh freeware game Galaxis
-EAPI=5
-HOMEPAGE=http://www.catb.org/~esr/galaxis/
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/ncurses-5.3:0 games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.catb.org/~esr/galaxis/galaxis-1.8.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2193ed1f81c1ec9c1ac095c5945db73f
diff --git a/metadata/md5-cache/games-puzzle/galaxis-1.8-r1 b/metadata/md5-cache/games-puzzle/galaxis-1.8-r1
new file mode 100644
index 000000000000..843fa2c2286e
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/galaxis-1.8-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=>=sys-libs/ncurses-5.3:0=
+DESCRIPTION=Curses-based clone of the nifty little Macintosh freeware game Galaxis
+EAPI=6
+HOMEPAGE=http://www.catb.org/~esr/galaxis/
+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
+_md5_=5bcba8b0402b86405ec1e49e356250dd
diff --git a/metadata/md5-cache/games-puzzle/gemdropx-0.9-r1 b/metadata/md5-cache/games-puzzle/gemdropx-0.9-r1
deleted file mode 100644
index 9145b11ad72f..000000000000
--- a/metadata/md5-cache/games-puzzle/gemdropx-0.9-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=media-libs/libsdl-1.2.3-r1[joystick,video] >=media-libs/sdl-mixer-1.2.1[mod]
-DESCRIPTION=A puzzle game where it's your job to clear the screen of gems
-EAPI=5
-HOMEPAGE=http://www.newbreedsoftware.com/gemdropx/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libsdl-1.2.3-r1[joystick,video] >=media-libs/sdl-mixer-1.2.1[mod] games-misc/games-envd
-SLOT=0
-SRC_URI=ftp://ftp.sonic.net/pub/users/nbs/unix/x/gemdropx/gemdropx-0.9.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=001883140b03a0e8953c780ddd928dc6
diff --git a/metadata/md5-cache/games-puzzle/gemdropx-0.9-r2 b/metadata/md5-cache/games-puzzle/gemdropx-0.9-r2
new file mode 100644
index 000000000000..fa6aa56dfeb3
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/gemdropx-0.9-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=>=media-libs/libsdl-1.2.3-r1[joystick,video] >=media-libs/sdl-mixer-1.2.1[mod]
+DESCRIPTION=A puzzle game where it's your job to clear the screen of gems
+EAPI=6
+HOMEPAGE=http://www.newbreedsoftware.com/gemdropx/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libsdl-1.2.3-r1[joystick,video] >=media-libs/sdl-mixer-1.2.1[mod]
+SLOT=0
+SRC_URI=ftp://ftp.sonic.net/pub/users/nbs/unix/x/gemdropx/gemdropx-0.9.tar.gz
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6
+_md5_=e6ff3ad024f7e2ddaac256dd84c1b987
diff --git a/metadata/md5-cache/games-puzzle/gfifteen-1.0.3 b/metadata/md5-cache/games-puzzle/gfifteen-1.0.3
deleted file mode 100644
index 7ce9da8ccbf3..000000000000
--- a/metadata/md5-cache/games-puzzle/gfifteen-1.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=x11-libs/gtk+:3 virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=graphical implementation of the sliding puzzle game fifteen
-EAPI=5
-HOMEPAGE=https://frigidcode.com/code/gfifteen/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=x11-libs/gtk+:3 games-misc/games-envd
-SLOT=0
-SRC_URI=https://frigidcode.com/code/gfifteen/gfifteen-1.0.3.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e6b540e5293f0a82fc2e45790e53da42
diff --git a/metadata/md5-cache/games-puzzle/gfifteen-1.0.3-r1 b/metadata/md5-cache/games-puzzle/gfifteen-1.0.3-r1
new file mode 100644
index 000000000000..5a2e69439363
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/gfifteen-1.0.3-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=x11-libs/gtk+:3 virtual/pkgconfig >=sys-apps/sed-4
+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 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d6067d752571b1e31c60ea9d134b142a
diff --git a/metadata/md5-cache/games-puzzle/gnudoku-0.93 b/metadata/md5-cache/games-puzzle/gnudoku-0.93
deleted file mode 100644
index 2d615c5f0b27..000000000000
--- a/metadata/md5-cache/games-puzzle/gnudoku-0.93
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=dev-cpp/gtkmm-2.6:2.4 virtual/pkgconfig
-DESCRIPTION=A program for creating and solving Su Doku puzzles
-EAPI=5
-HOMEPAGE=http://www.icculus.org/~jcspray/GNUDoku
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-cpp/gtkmm-2.6:2.4 games-misc/games-envd
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.icculus.org/~jcspray/GNUDoku/GNUDoku-0.93.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=83c7000d54fe77557d95c3e90fb843a1
diff --git a/metadata/md5-cache/games-puzzle/gnudoku-0.93-r1 b/metadata/md5-cache/games-puzzle/gnudoku-0.93-r1
new file mode 100644
index 000000000000..d827cbb6406a
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/gnudoku-0.93-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=dev-cpp/gtkmm-2.6:2.4 virtual/pkgconfig
+DESCRIPTION=A program for creating and solving Su Doku puzzles
+EAPI=6
+HOMEPAGE=http://www.icculus.org/~jcspray/GNUDoku
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-cpp/gtkmm-2.6:2.4
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.icculus.org/~jcspray/GNUDoku/GNUDoku-0.93.tar.gz
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=95eb1f668fb50f3cd66916f94a8e9b31
diff --git a/metadata/md5-cache/games-puzzle/gnurobbo-0.66 b/metadata/md5-cache/games-puzzle/gnurobbo-0.66
deleted file mode 100644
index 1992b2ca16a0..000000000000
--- a/metadata/md5-cache/games-puzzle/gnurobbo-0.66
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[sound,video,joystick] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf
-DESCRIPTION=Robbo, a popular Atari XE/XL game ported to Linux
-EAPI=5
-HOMEPAGE=http://gnurobbo.sourceforge.net/
-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 games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/gnurobbo/gnurobbo-0.66-source.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a108091f9b21d989c575af21773bc245
diff --git a/metadata/md5-cache/games-puzzle/gnurobbo-0.66-r1 b/metadata/md5-cache/games-puzzle/gnurobbo-0.66-r1
new file mode 100644
index 000000000000..68a3e7e0e792
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/gnurobbo-0.66-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=media-libs/libsdl[sound,video,joystick] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf
+DESCRIPTION=Robbo, a popular Atari XE/XL game ported to Linux
+EAPI=6
+HOMEPAGE=http://gnurobbo.sourceforge.net/
+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.66-source.tar.gz
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6
+_md5_=0a434e079fbb44a64b5fb3bd81037b16
diff --git a/metadata/md5-cache/games-puzzle/groundhog-1.4 b/metadata/md5-cache/games-puzzle/groundhog-1.4
deleted file mode 100644
index b59f72c6f611..000000000000
--- a/metadata/md5-cache/games-puzzle/groundhog-1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=x11-libs/gtk+:2 nls? ( virtual/libintl ) virtual/pkgconfig 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=Put the balls in the pockets of the same color by manipulating a maze of tubes
-EAPI=5
-HOMEPAGE=http://home-2.consunet.nl/~cb007736/groundhog.html
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 nls? ( virtual/libintl ) games-misc/games-envd
-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 4842e626555a9a4344f34cef2e190b67 base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cce2090166aa26806bd742d1ccf75ca7
diff --git a/metadata/md5-cache/games-puzzle/groundhog-1.4-r1 b/metadata/md5-cache/games-puzzle/groundhog-1.4-r1
new file mode 100644
index 000000000000..918bf15e1629
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/groundhog-1.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=x11-libs/gtk+:2 nls? ( virtual/libintl ) virtual/pkgconfig 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=Put the balls in the pockets of the same color by manipulating a maze of tubes
+EAPI=6
+HOMEPAGE=http://home-2.consunet.nl/~cb007736/groundhog.html
+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 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=f02b04e82a09b036001de4a0fe143c4d
diff --git a/metadata/md5-cache/games-puzzle/gtkballs-3.1.5-r1 b/metadata/md5-cache/games-puzzle/gtkballs-3.1.5-r1
deleted file mode 100644
index 49a1a84ad241..000000000000
--- a/metadata/md5-cache/games-puzzle/gtkballs-3.1.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=x11-libs/gtk+:2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( >=sys-devel/gettext-0.10.38 )
-DESCRIPTION=An entertaining game based on the old DOS game lines
-EAPI=5
-HOMEPAGE=http://gtkballs.antex.ru/
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 nls? ( virtual/libintl ) games-misc/games-envd
-SLOT=0
-SRC_URI=http://gtkballs.antex.ru/dist/gtkballs-3.1.5.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2e937185680c172d9bb2b07856e27ca1
diff --git a/metadata/md5-cache/games-puzzle/gtkballs-3.1.5-r2 b/metadata/md5-cache/games-puzzle/gtkballs-3.1.5-r2
new file mode 100644
index 000000000000..ec53e15ee72f
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/gtkballs-3.1.5-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=x11-libs/gtk+:2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( >=sys-devel/gettext-0.10.38 )
+DESCRIPTION=An entertaining game based on the old DOS game lines
+EAPI=6
+HOMEPAGE=http://gtkballs.antex.ru/
+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 2ccd1dd1dd7bfb8795eea024a4f91bb6
+_md5_=73c20bf967cb11593ef98ecc9a728a01
diff --git a/metadata/md5-cache/games-puzzle/gweled-0.9.1-r1 b/metadata/md5-cache/games-puzzle/gweled-0.9.1-r1
deleted file mode 100644
index eb43c45e1be0..000000000000
--- a/metadata/md5-cache/games-puzzle/gweled-0.9.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=x11-libs/gtk+:2 media-libs/libmikmod gnome-base/librsvg: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
-DESCRIPTION=Bejeweled clone game
-EAPI=5
-HOMEPAGE=http://www.gweled.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 media-libs/libmikmod gnome-base/librsvg:2 games-misc/games-envd
-SLOT=0
-SRC_URI=https://launchpad.net/gweled/trunk/0.9.1/+download/gweled-0.9.1.tar.gz
-_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 games 2bb3ede665927a68ffdb7c41eec7efde libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=48fd2712fcce115c16a3dfdfded9a995
diff --git a/metadata/md5-cache/games-puzzle/gweled-0.9.1-r2 b/metadata/md5-cache/games-puzzle/gweled-0.9.1-r2
new file mode 100644
index 000000000000..38eacadda03d
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/gweled-0.9.1-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare
+DEPEND=x11-libs/gtk+:2 media-libs/libmikmod gnome-base/librsvg: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
+DESCRIPTION=Bejeweled clone game
+EAPI=6
+HOMEPAGE=http://www.gweled.org/
+KEYWORDS=~amd64 ~x86
+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 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1c9b35f160ff6c6abe81faf6ab5d394c
diff --git a/metadata/md5-cache/games-puzzle/hangman-0.9.2 b/metadata/md5-cache/games-puzzle/hangman-0.9.2
deleted file mode 100644
index 85a825239e36..000000000000
--- a/metadata/md5-cache/games-puzzle/hangman-0.9.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=!games-misc/bsd-games media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-image media-libs/sdl-ttf
-DESCRIPTION=The classic word guessing game
-EAPI=5
-HOMEPAGE=http://www.shiftygames.com/hangman/hangman.html
-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 games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.shiftygames.com/hangman/hangman-0.9.2.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e81c36db1f19bf7260ad4a6ffe042945
diff --git a/metadata/md5-cache/games-puzzle/hangman-0.9.2-r1 b/metadata/md5-cache/games-puzzle/hangman-0.9.2-r1
new file mode 100644
index 000000000000..7746a5fb2536
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/hangman-0.9.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=!games-misc/bsd-games media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-image media-libs/sdl-ttf
+DESCRIPTION=The classic word guessing game
+EAPI=6
+HOMEPAGE=http://www.shiftygames.com/hangman/hangman.html
+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 2ccd1dd1dd7bfb8795eea024a4f91bb6
+_md5_=ee3bcaf5cbb1c580b0fd4fdf851f1629
diff --git a/metadata/md5-cache/games-puzzle/hexamine-0.2.1 b/metadata/md5-cache/games-puzzle/hexamine-0.2.1
deleted file mode 100644
index 0a54d3cd2826..000000000000
--- a/metadata/md5-cache/games-puzzle/hexamine-0.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
-DESCRIPTION=Hexagonal Minesweeper
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/hexamine
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-python/pygame python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] games-misc/games-envd
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://sourceforge/hexamine/hexamine-0.2.1.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9041029df79f27480138439d7d747b83
diff --git a/metadata/md5-cache/games-puzzle/hexamine-0.2.1-r1 b/metadata/md5-cache/games-puzzle/hexamine-0.2.1-r1
new file mode 100644
index 000000000000..74fcab21c985
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/hexamine-0.2.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare setup
+DESCRIPTION=Hexagonal Minesweeper
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/hexamine
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygame
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://sourceforge/hexamine/hexamine-0.2.1.tar.gz
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=b3260ee21c0171f3448cf22c8a331325
diff --git a/metadata/md5-cache/games-puzzle/icebreaker-1.9.6 b/metadata/md5-cache/games-puzzle/icebreaker-1.9.6
deleted file mode 100644
index 6f8808309048..000000000000
--- a/metadata/md5-cache/games-puzzle/icebreaker-1.9.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer
-DESCRIPTION=Trap and capture penguins on Antarctica
-EAPI=5
-HOMEPAGE=http://www.mattdm.org/icebreaker/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.mattdm.org/icebreaker/1.9.x/icebreaker-1.9.6.tgz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3ae52d6c2cd4b7b155d8c3cd229219b5
diff --git a/metadata/md5-cache/games-puzzle/icebreaker-1.9.6-r1 b/metadata/md5-cache/games-puzzle/icebreaker-1.9.6-r1
new file mode 100644
index 000000000000..da90a6c9abf8
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/icebreaker-1.9.6-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer
+DESCRIPTION=Trap and capture penguins on Antarctica
+EAPI=6
+HOMEPAGE=http://www.mattdm.org/icebreaker/
+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 2ccd1dd1dd7bfb8795eea024a4f91bb6
+_md5_=bb9cb78444bbc02e6ae914bf81ccd920
diff --git a/metadata/md5-cache/games-puzzle/jools-0.20-r2 b/metadata/md5-cache/games-puzzle/jools-0.20-r2
deleted file mode 100644
index 193a05cb5936..000000000000
--- a/metadata/md5-cache/games-puzzle/jools-0.20-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
-DESCRIPTION=clone of Bejeweled, a popular pattern-matching game
-EAPI=5
-HOMEPAGE=http://pessimization.com/software/jools/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] games-misc/games-envd
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://pessimization.com/software/jools/jools-0.20.tar.gz http://pessimization.com/software/jools/jools-musicpack-1.0.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e78300852274a3cd55993672941bcd52
diff --git a/metadata/md5-cache/games-puzzle/jools-0.20-r3 b/metadata/md5-cache/games-puzzle/jools-0.20-r3
new file mode 100644
index 000000000000..9e3873a2fa47
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/jools-0.20-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
+DESCRIPTION=clone of Bejeweled, a popular pattern-matching game
+EAPI=6
+HOMEPAGE=http://pessimization.com/software/jools/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://pessimization.com/software/jools/jools-0.20.tar.gz http://pessimization.com/software/jools/jools-musicpack-1.0.tar.gz
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 317a2557b4d7319a7418225f65accf77 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f3ea436543d2e76a9a781d8e2090a843
diff --git a/metadata/md5-cache/games-puzzle/lpairs-1.0.4 b/metadata/md5-cache/games-puzzle/lpairs-1.0.4
deleted file mode 100644
index d555233d7982..000000000000
--- a/metadata/md5-cache/games-puzzle/lpairs-1.0.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[sound?,video] nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
-DESCRIPTION=A classical memory game
-EAPI=5
-HOMEPAGE=http://lgames.sourceforge.net/LPairs/
-IUSE=nls sound
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=media-libs/libsdl[sound?,video] nls? ( virtual/libintl ) games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/lgames/lpairs-1.0.4.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2ed2a6322864919043fba7e21f53912a
diff --git a/metadata/md5-cache/games-puzzle/lpairs-1.0.4-r1 b/metadata/md5-cache/games-puzzle/lpairs-1.0.4-r1
new file mode 100644
index 000000000000..f15d7b404fb8
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/lpairs-1.0.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=media-libs/libsdl[sound?,video] nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
+DESCRIPTION=A classical memory game
+EAPI=6
+HOMEPAGE=http://lgames.sourceforge.net/LPairs/
+IUSE=nls sound
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/libsdl[sound?,video] nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://sourceforge/lgames/lpairs-1.0.4.tar.gz
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6
+_md5_=779780f0046420930872d322047081d6
diff --git a/metadata/md5-cache/games-puzzle/ltris-1.0.19 b/metadata/md5-cache/games-puzzle/ltris-1.0.19
deleted file mode 100644
index fd4c35c01816..000000000000
--- a/metadata/md5-cache/games-puzzle/ltris-1.0.19
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer 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=very polished Tetris clone
-EAPI=5
-HOMEPAGE=http://lgames.sourceforge.net/LTris/
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer nls? ( virtual/libintl ) games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/lgames/ltris-1.0.19.tar.gz
-_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 games 2bb3ede665927a68ffdb7c41eec7efde libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2860defa2989fe81aecde5e222757039
diff --git a/metadata/md5-cache/games-puzzle/ltris-1.0.19-r1 b/metadata/md5-cache/games-puzzle/ltris-1.0.19-r1
new file mode 100644
index 000000000000..089f34e01259
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/ltris-1.0.19-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer 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=Very polished Tetris clone
+EAPI=6
+HOMEPAGE=http://lgames.sourceforge.net/LTris/
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+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 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=343a241586ab5af9c0a7c1423fda32a6
diff --git a/metadata/md5-cache/games-puzzle/magiccube4d-2.2 b/metadata/md5-cache/games-puzzle/magiccube4d-2.2
deleted file mode 100644
index c1c32a88d12d..000000000000
--- a/metadata/md5-cache/games-puzzle/magiccube4d-2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=x11-libs/libXaw
-DESCRIPTION=four-dimensional analog of Rubik's cube
-EAPI=5
-HOMEPAGE=http://www.superliminal.com/cube/cube.htm
-KEYWORDS=~amd64 ~x86
-LICENSE=free-noncomm
-RDEPEND=x11-libs/libXaw games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.superliminal.com/cube/mc4d-src-2_2.tgz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=943377d4b67a52b7d1d88a59e51d96db
diff --git a/metadata/md5-cache/games-puzzle/magiccube4d-2.2-r1 b/metadata/md5-cache/games-puzzle/magiccube4d-2.2-r1
new file mode 100644
index 000000000000..4a6e7954195c
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/magiccube4d-2.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=x11-libs/libXaw
+DESCRIPTION=Four-dimensional analog of Rubik's cube
+EAPI=6
+HOMEPAGE=http://www.superliminal.com/cube/cube.htm
+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 2ccd1dd1dd7bfb8795eea024a4f91bb6
+_md5_=e214163ade0cde5381a80522bb08f8b2
diff --git a/metadata/md5-cache/games-puzzle/meandmyshadow-0.4 b/metadata/md5-cache/games-puzzle/meandmyshadow-0.4
deleted file mode 100644
index ed441a981083..000000000000
--- a/metadata/md5-cache/games-puzzle/meandmyshadow-0.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=media-libs/libsdl[sound,video,X] media-libs/sdl-gfx media-libs/sdl-ttf media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png] dev-libs/openssl:0= net-misc/curl app-arch/libarchive x11-libs/libX11 opengl? ( virtual/opengl ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=A puzzle/platform game with a player and its shadow
-EAPI=5
-HOMEPAGE=http://meandmyshadow.sourceforge.net/
-IUSE=opengl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 OFL-1.1 CC-BY-SA-2.5
-RDEPEND=media-libs/libsdl[sound,video,X] media-libs/sdl-gfx media-libs/sdl-ttf media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png] dev-libs/openssl:0= net-misc/curl app-arch/libarchive x11-libs/libX11 opengl? ( virtual/opengl ) games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/meandmyshadow/0.4/meandmyshadow-0.4-src.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 cmake-utils d2f8cff68b90b869ef9d460c6f3c4e2e desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 games 2bb3ede665927a68ffdb7c41eec7efde gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2cd5dee90afec13fd503b593f770c53f
diff --git a/metadata/md5-cache/games-puzzle/meandmyshadow-0.4-r1 b/metadata/md5-cache/games-puzzle/meandmyshadow-0.4-r1
new file mode 100644
index 000000000000..62dff67ba8da
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/meandmyshadow-0.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=media-libs/libsdl[sound,video,X] media-libs/sdl-gfx media-libs/sdl-ttf media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png] dev-libs/openssl:0= net-misc/curl app-arch/libarchive x11-libs/libX11 opengl? ( virtual/opengl ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=A puzzle/platform game with a player and its shadow
+EAPI=5
+HOMEPAGE=http://meandmyshadow.sourceforge.net/
+IUSE=opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 OFL-1.1 CC-BY-SA-2.5
+RDEPEND=media-libs/libsdl[sound,video,X] media-libs/sdl-gfx media-libs/sdl-ttf media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png] dev-libs/openssl:0= net-misc/curl app-arch/libarchive x11-libs/libX11 opengl? ( virtual/opengl )
+SLOT=0
+SRC_URI=mirror://sourceforge/meandmyshadow/0.4/meandmyshadow-0.4-src.tar.gz
+_eclasses_=cmake-utils d2f8cff68b90b869ef9d460c6f3c4e2e desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=247d19bae9cfaead53908f659fe08140
diff --git a/metadata/md5-cache/games-puzzle/mindless-1.6 b/metadata/md5-cache/games-puzzle/mindless-1.6
deleted file mode 100644
index c30091663431..000000000000
--- a/metadata/md5-cache/games-puzzle/mindless-1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=x11-libs/gtk+:2 media-fonts/font-schumacher-misc gnome-base/librsvg virtual/pkgconfig
-DESCRIPTION=Play trading card games (Magic: the Gathering etc.) against other people
-EAPI=5
-HOMEPAGE=http://mindless.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 media-fonts/font-schumacher-misc games-misc/games-envd
-RESTRICT=mirror
-SLOT=0
-SRC_URI=mirror://sourceforge/mindless/mindless-1.6.tar.gz http://www.wizards.com/dci/oracle/OracleAll_050523.txt
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7f303a2c81164a70e6cf7bf33560f359
diff --git a/metadata/md5-cache/games-puzzle/mindless-1.6-r1 b/metadata/md5-cache/games-puzzle/mindless-1.6-r1
new file mode 100644
index 000000000000..154532b43719
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/mindless-1.6-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare unpack
+DEPEND=x11-libs/gtk+:2 media-fonts/font-schumacher-misc gnome-base/librsvg:2 virtual/pkgconfig
+DESCRIPTION=Play trading card games (Magic: the Gathering etc.) against other people
+EAPI=6
+HOMEPAGE=http://mindless.sourceforge.net/
+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 2ccd1dd1dd7bfb8795eea024a4f91bb6 readme.gentoo-r1 6f03e110529650f57fc7d1fb908b8986
+_md5_=27140614cc9cf4cccdb3d4fe45d8994f
diff --git a/metadata/md5-cache/games-puzzle/mirrormagic-2.0.2-r1 b/metadata/md5-cache/games-puzzle/mirrormagic-2.0.2-r1
deleted file mode 100644
index 20fdd4c157b1..000000000000
--- a/metadata/md5-cache/games-puzzle/mirrormagic-2.0.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=!sdl? ( x11-libs/libX11 ) sdl? ( media-libs/libsdl[video] media-libs/sdl-mixer media-libs/sdl-image ) !sdl? ( x11-libs/libXt )
-DESCRIPTION=a game like Deflektor (C 64) or Mindbender (Amiga)
-EAPI=5
-HOMEPAGE=http://www.artsoft.org/mirrormagic/
-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 ) games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.artsoft.org/RELEASES/unix/mirrormagic/mirrormagic-2.0.2.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c7c0a38b67e2e9a5c46de3d40f990561
diff --git a/metadata/md5-cache/games-puzzle/mirrormagic-2.0.2-r2 b/metadata/md5-cache/games-puzzle/mirrormagic-2.0.2-r2
new file mode 100644
index 000000000000..d5cfe21113f2
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/mirrormagic-2.0.2-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=!sdl? ( x11-libs/libX11 ) sdl? ( media-libs/libsdl[video] media-libs/sdl-mixer media-libs/sdl-image ) !sdl? ( x11-libs/libXt )
+DESCRIPTION=A game like Deflektor (C 64) or Mindbender (Amiga)
+EAPI=6
+HOMEPAGE=http://www.artsoft.org/mirrormagic/
+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=http://www.artsoft.org/RELEASES/unix/mirrormagic/mirrormagic-2.0.2.tar.gz
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=c9f3f0d80a3f5569451ef709b84b4f74
diff --git a/metadata/md5-cache/games-puzzle/monsterz-0.7.1-r3 b/metadata/md5-cache/games-puzzle/monsterz-0.7.1-r3
deleted file mode 100644
index d167d4795907..000000000000
--- a/metadata/md5-cache/games-puzzle/monsterz-0.7.1-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/sdl-image[png] media-libs/sdl-mixer[mod]
-DESCRIPTION=a little puzzle game, similar to the famous Bejeweled or Zookeeper
-EAPI=5
-HOMEPAGE=http://sam.zoy.org/projects/monsterz/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~hppa ~x86
-LICENSE=GPL-1+ LGPL-2+ WTFPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/sdl-image[png] media-libs/sdl-mixer[mod] games-misc/games-envd
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://sam.zoy.org/projects/monsterz/monsterz-0.7.1.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=34214a795eacc1111edf4e5bf8b85871
diff --git a/metadata/md5-cache/games-puzzle/monsterz-0.7.1-r4 b/metadata/md5-cache/games-puzzle/monsterz-0.7.1-r4
new file mode 100644
index 000000000000..1dad4cb30295
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/monsterz-0.7.1-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/sdl-image[png] media-libs/sdl-mixer[mod]
+DESCRIPTION=A little puzzle game, similar to the famous Bejeweled or Zookeeper
+EAPI=6
+HOMEPAGE=http://sam.zoy.org/projects/monsterz/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=GPL-1+ LGPL-2+ WTFPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/sdl-image[png] media-libs/sdl-mixer[mod]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://sam.zoy.org/projects/monsterz/monsterz-0.7.1.tar.gz
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=e46ffe7dc890d1c777c5087567866d6a
diff --git a/metadata/md5-cache/games-puzzle/mures-0.5 b/metadata/md5-cache/games-puzzle/mures-0.5
deleted file mode 100644
index 407535ab8146..000000000000
--- a/metadata/md5-cache/games-puzzle/mures-0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl media-libs/sdl-image media-libs/sdl-net media-libs/sdl-ttf opengl? ( virtual/opengl ) >=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 clone of Sega's Chu Chu Rocket
-EAPI=5
-HOMEPAGE=http://mures.sourceforge.net/
-IUSE=opengl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl media-libs/sdl-image media-libs/sdl-net media-libs/sdl-ttf opengl? ( virtual/opengl ) games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/mures/mures-0.5.tar.gz
-_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0017271e80afb4de6e7b2ab5193c499c
diff --git a/metadata/md5-cache/games-puzzle/mures-0.5-r1 b/metadata/md5-cache/games-puzzle/mures-0.5-r1
new file mode 100644
index 000000000000..e752f22e5526
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/mures-0.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libsdl media-libs/sdl-image media-libs/sdl-net media-libs/sdl-ttf opengl? ( virtual/opengl ) >=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 clone of Sega's Chu Chu Rocket
+EAPI=6
+HOMEPAGE=http://mures.sourceforge.net/
+IUSE=opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl 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 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=ddd0ab80ab34d043bff861d4b385cae5
diff --git a/metadata/md5-cache/games-puzzle/neverball-1.6.0 b/metadata/md5-cache/games-puzzle/neverball-1.6.0
deleted file mode 100644
index 3284063ed013..000000000000
--- a/metadata/md5-cache/games-puzzle/neverball-1.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-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 >=sys-apps/sed-4
-DESCRIPTION=Clone of Super Monkey Ball using SDL/OpenGL
-EAPI=5
-HOMEPAGE=http://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 ) games-misc/games-envd
-RESTRICT=test
-SLOT=0
-SRC_URI=http://neverball.org/neverball-1.6.0.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=96d49a42717f081d50c786f966c537b2
diff --git a/metadata/md5-cache/games-puzzle/neverball-1.6.0-r1 b/metadata/md5-cache/games-puzzle/neverball-1.6.0-r1
new file mode 100644
index 000000000000..874a6d4d77e9
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/neverball-1.6.0-r1
@@ -0,0 +1,14 @@
+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 >=sys-apps/sed-4
+DESCRIPTION=Clone of Super Monkey Ball using SDL/OpenGL
+EAPI=6
+HOMEPAGE=http://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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://neverball.org/neverball-1.6.0.tar.gz
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b97e83ff0a4a0618eddc30da1c2d0013
diff --git a/metadata/md5-cache/games-puzzle/pauker-1.8 b/metadata/md5-cache/games-puzzle/pauker-1.8
deleted file mode 100644
index a777edb3bed1..000000000000
--- a/metadata/md5-cache/games-puzzle/pauker-1.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip dev-java/browserlauncher2:1.0 dev-java/javahelp dev-java/lucene:2.4 dev-java/swing-layout:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A java based flashcard program
-EAPI=5
-HOMEPAGE=http://pauker.sourceforge.net/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.5 dev-java/browserlauncher2:1.0 dev-java/javahelp dev-java/lucene:2.4 dev-java/swing-layout:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/pauker/pauker-1.8.src.jar
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde java-ant-2 ea15ab9e838d1062abd6b53de2045d50 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c8816f912863c1a311f1d34ac2d58186
diff --git a/metadata/md5-cache/games-puzzle/pauker-1.8-r1 b/metadata/md5-cache/games-puzzle/pauker-1.8-r1
new file mode 100644
index 000000000000..c0f6623a0191
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/pauker-1.8-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=dev-java/browserlauncher2:1.0 dev-java/javahelp dev-java/lucene:2.4 dev-java/swing-layout:1 >=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=A java based flashcard program
+EAPI=6
+HOMEPAGE=http://pauker.sourceforge.net/
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+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.5 >=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 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 java-ant-2 ea15ab9e838d1062abd6b53de2045d50 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0403618efb9058285364cfa647a7afe3
diff --git a/metadata/md5-cache/games-puzzle/penguzzle-1.0-r1 b/metadata/md5-cache/games-puzzle/penguzzle-1.0-r1
deleted file mode 100644
index 07f6a16c1da8..000000000000
--- a/metadata/md5-cache/games-puzzle/penguzzle-1.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Tcl/Tk variant of the well-known 15-puzzle game
-EAPI=5
-HOMEPAGE=http://www.naskita.com/linux/penguzzle/penguzzle.shtml
-KEYWORDS=~amd64 ~x86
-LICENSE=penguzzle
-RDEPEND=dev-lang/tk dev-tcltk/tclx games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.naskita.com/linux/penguzzle/penguzzle.zip
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=39870d1cdfa345dd76d97f361355f1bd
diff --git a/metadata/md5-cache/games-puzzle/penguzzle-1.0-r2 b/metadata/md5-cache/games-puzzle/penguzzle-1.0-r2
new file mode 100644
index 000000000000..2de93bc0912b
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/penguzzle-1.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=app-arch/unzip
+DESCRIPTION=Tcl/Tk variant of the well-known 15-puzzle game
+EAPI=6
+HOMEPAGE=http://www.naskita.com/linux/penguzzle/penguzzle.shtml
+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
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6
+_md5_=1541fd8ee0d9ee97371e3e1e5148f1b4
diff --git a/metadata/md5-cache/games-puzzle/picpuz-2.5 b/metadata/md5-cache/games-puzzle/picpuz-2.5
deleted file mode 100644
index adf5d8bfba83..000000000000
--- a/metadata/md5-cache/games-puzzle/picpuz-2.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=x11-libs/gtk+:3 virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=A jigsaw puzzle program
-EAPI=5
-HOMEPAGE=http://kornelix.squarespace.com/picpuz/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:3 games-misc/games-envd
-SLOT=0
-SRC_URI=http://kornelix.squarespace.com/storage/downloads/picpuz-2.5.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a051dcae8f5246f8ab5da07923a04614
diff --git a/metadata/md5-cache/games-puzzle/picpuz-2.5-r1 b/metadata/md5-cache/games-puzzle/picpuz-2.5-r1
new file mode 100644
index 000000000000..3c1731ebb4d1
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/picpuz-2.5-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm preinst
+DEPEND=x11-libs/gtk+:3 virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=A jigsaw puzzle program
+EAPI=6
+HOMEPAGE=http://kornelix.squarespace.com/picpuz/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:3
+SLOT=0
+SRC_URI=http://kornelix.squarespace.com/storage/downloads/picpuz-2.5.tar.gz
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3c9e9a90f88b221e752a70f252ba1b0b
diff --git a/metadata/md5-cache/games-puzzle/pipepanic-0.1.3 b/metadata/md5-cache/games-puzzle/pipepanic-0.1.3
deleted file mode 100644
index 4f6d9479aa3b..000000000000
--- a/metadata/md5-cache/games-puzzle/pipepanic-0.1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[video]
-DESCRIPTION=A simple pipe connecting game
-EAPI=5
-HOMEPAGE=http://www.users.waitrose.com/~thunor/pipepanic/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 FreeArt
-RDEPEND=games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.users.waitrose.com/~thunor/pipepanic/dload/pipepanic-0.1.3-source.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=93409c72fa955e274c0a58022350c622
diff --git a/metadata/md5-cache/games-puzzle/pipepanic-0.1.3-r1 b/metadata/md5-cache/games-puzzle/pipepanic-0.1.3-r1
new file mode 100644
index 000000000000..dd6ad352a712
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/pipepanic-0.1.3-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libsdl[video]
+DESCRIPTION=A simple pipe connecting game
+EAPI=6
+HOMEPAGE=http://www.users.waitrose.com/~thunor/pipepanic/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 FreeArt
+SLOT=0
+SRC_URI=http://www.users.waitrose.com/~thunor/pipepanic/dload/pipepanic-0.1.3-source.tar.gz
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6
+_md5_=18b1ddd84168a77f76f89b2e4322ba4b
diff --git a/metadata/md5-cache/games-puzzle/pipewalker-0.9.4 b/metadata/md5-cache/games-puzzle/pipewalker-0.9.4
deleted file mode 100644
index 5e139f763418..000000000000
--- a/metadata/md5-cache/games-puzzle/pipewalker-0.9.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[opengl,video] virtual/opengl virtual/glu
-DESCRIPTION=Rotating pieces puzzle game
-EAPI=5
-HOMEPAGE=http://pipewalker.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=media-libs/libsdl[opengl,video] virtual/opengl virtual/glu games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/pipewalker/pipewalker-0.9.4.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ec75ab8824029fcf501ed58273a8fbab
diff --git a/metadata/md5-cache/games-puzzle/pipewalker-0.9.4-r1 b/metadata/md5-cache/games-puzzle/pipewalker-0.9.4-r1
new file mode 100644
index 000000000000..69916c43b021
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/pipewalker-0.9.4-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=media-libs/libsdl[opengl,video] virtual/opengl virtual/glu
+DESCRIPTION=Rotating pieces puzzle game
+EAPI=6
+HOMEPAGE=http://pipewalker.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=media-libs/libsdl[opengl,video] virtual/opengl virtual/glu
+SLOT=0
+SRC_URI=mirror://sourceforge/pipewalker/pipewalker-0.9.4.tar.gz
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=fe502f2a63c0916f37efe06c421419a0
diff --git a/metadata/md5-cache/games-puzzle/quadra-1.2.0 b/metadata/md5-cache/games-puzzle/quadra-1.2.0
deleted file mode 100644
index f041692e83fa..000000000000
--- a/metadata/md5-cache/games-puzzle/quadra-1.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86vm x11-libs/libXext media-libs/libpng:0 sys-libs/zlib sys-devel/bc x11-proto/xextproto
-DESCRIPTION=A tetris clone with multiplayer support
-EAPI=5
-HOMEPAGE=https://github.com/quadra-game/quadra
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86vm x11-libs/libXext media-libs/libpng:0 sys-libs/zlib games-misc/games-envd
-SLOT=0
-SRC_URI=https://github.com/quadra-game/quadra/archive/v1.2.0.tar.gz -> quadra-1.2.0.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=539875c1e59b073619ddd9671322b050
diff --git a/metadata/md5-cache/games-puzzle/quadra-1.2.0-r1 b/metadata/md5-cache/games-puzzle/quadra-1.2.0-r1
new file mode 100644
index 000000000000..17de75b77fc1
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/quadra-1.2.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86vm x11-libs/libXext media-libs/libpng:0= sys-libs/zlib sys-devel/bc x11-proto/xextproto
+DESCRIPTION=A tetris clone with multiplayer support
+EAPI=6
+HOMEPAGE=https://github.com/quadra-game/quadra
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86vm x11-libs/libXext media-libs/libpng:0= sys-libs/zlib
+SLOT=0
+SRC_URI=https://github.com/quadra-game/quadra/archive/v1.2.0.tar.gz -> quadra-1.2.0.tar.gz
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6
+_md5_=b0e8e322556e50f97f892aa0736a82c7
diff --git a/metadata/md5-cache/games-puzzle/rezerwar-0.4.2 b/metadata/md5-cache/games-puzzle/rezerwar-0.4.2
deleted file mode 100644
index 49389a5446f2..000000000000
--- a/metadata/md5-cache/games-puzzle/rezerwar-0.4.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-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=5
-HOMEPAGE=http://tamentis.com/projects/rezerwar/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-mixer[vorbis] games-misc/games-envd
-SLOT=0
-SRC_URI=http://tamentis.com/projects/rezerwar/files/rezerwar-0.4.2.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=81e02a90136df5ccb83f51163fc4b3f8
diff --git a/metadata/md5-cache/games-puzzle/rezerwar-0.4.2-r1 b/metadata/md5-cache/games-puzzle/rezerwar-0.4.2-r1
new file mode 100644
index 000000000000..98f144f3e997
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/rezerwar-0.4.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+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=6
+HOMEPAGE=http://tamentis.com/projects/rezerwar/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-mixer[vorbis]
+SLOT=0
+SRC_URI=http://tamentis.com/projects/rezerwar/files/rezerwar-0.4.2.tar.gz
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6
+_md5_=e3167945521888ff630b1232d03b7d82
diff --git a/metadata/md5-cache/games-puzzle/scramble-0.9.5 b/metadata/md5-cache/games-puzzle/scramble-0.9.5
deleted file mode 100644
index 9f4f507c67f2..000000000000
--- a/metadata/md5-cache/games-puzzle/scramble-0.9.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=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 >=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=Create as many words as you can before the time runs out
-EAPI=5
-HOMEPAGE=http://www.shiftygames.com/scramble/scramble.html
-KEYWORDS=~amd64 ~x86
-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 sys-apps/miscfiles games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.shiftygames.com/scramble/scramble-0.9.5.tar.gz
-_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 games 2bb3ede665927a68ffdb7c41eec7efde libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=61229c3b319075afed8504dc86d3a83f
diff --git a/metadata/md5-cache/games-puzzle/scramble-0.9.5-r1 b/metadata/md5-cache/games-puzzle/scramble-0.9.5-r1
new file mode 100644
index 000000000000..492883da5b64
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/scramble-0.9.5-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=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 media-libs/libpng:0 sys-apps/miscfiles >=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=Create as many words as you can before the time runs out
+EAPI=6
+HOMEPAGE=http://www.shiftygames.com/scramble/scramble.html
+KEYWORDS=~amd64 ~x86
+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 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=22c7f934147e914c51c80fae8418f85f
diff --git a/metadata/md5-cache/games-puzzle/sdl-jewels-1.1.1 b/metadata/md5-cache/games-puzzle/sdl-jewels-1.1.1
deleted file mode 100644
index d5e8ab726584..000000000000
--- a/metadata/md5-cache/games-puzzle/sdl-jewels-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-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=5
-HOMEPAGE=http://www.linuxmotors.com/gljewel/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[opengl,video] virtual/opengl games-misc/games-envd
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.linuxmotors.com/gljewel/downloads/SDL_jewels-1.1.1.tgz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6cf46151bb5183d30386d2f1111fc29f
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
new file mode 100644
index 000000000000..6015d23a1ae1
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/sdl-jewels-1.1.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+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/
+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 2ccd1dd1dd7bfb8795eea024a4f91bb6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=add4b9d26537ab66f22c9995879e93d3
diff --git a/metadata/md5-cache/games-puzzle/tanglet-1.3.1 b/metadata/md5-cache/games-puzzle/tanglet-1.3.1
deleted file mode 100644
index 3f3b9daa3bc1..000000000000
--- a/metadata/md5-cache/games-puzzle/tanglet-1.3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 >=sys-apps/sed-4
-DESCRIPTION=A single player word finding game based on Boggle
-EAPI=5
-HOMEPAGE=https://gottcode.org/tanglet/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 games-misc/games-envd
-SLOT=0
-SRC_URI=https://gottcode.org/tanglet/tanglet-1.3.1-src.tar.bz2
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=890e1dfe534bf2be2cbcc1c7ae391aa8
diff --git a/metadata/md5-cache/games-puzzle/tanglet-1.3.1-r1 b/metadata/md5-cache/games-puzzle/tanglet-1.3.1-r1
new file mode 100644
index 000000000000..ce8308a3f4c7
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/tanglet-1.3.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5 >=sys-apps/sed-4
+DESCRIPTION=A single player word finding game based on Boggle
+EAPI=6
+HOMEPAGE=https://gottcode.org/tanglet/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtgui:5
+SLOT=0
+SRC_URI=https://gottcode.org/tanglet/tanglet-1.3.1-src.tar.bz2
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=63e8f4189c61a6911c822691bb89dff7
diff --git a/metadata/md5-cache/games-puzzle/tetrinet-0.11 b/metadata/md5-cache/games-puzzle/tetrinet-0.11
deleted file mode 100644
index 2bf5ccb550e0..000000000000
--- a/metadata/md5-cache/games-puzzle/tetrinet-0.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=sys-libs/ncurses-5:0 virtual/pkgconfig
-DESCRIPTION=console based tetrinet inc. standalone server
-EAPI=5
-HOMEPAGE=http://tetrinet.or.cz/
-IUSE=ipv6
-KEYWORDS=~amd64 ~x86
-LICENSE=public-domain
-RDEPEND=>=sys-libs/ncurses-5:0 games-misc/games-envd
-SLOT=0
-SRC_URI=http://tetrinet.or.cz/download/tetrinet-0.11.tar.bz2
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=92107d69332404c3024e95d88129a964
diff --git a/metadata/md5-cache/games-puzzle/tetrinet-0.11-r1 b/metadata/md5-cache/games-puzzle/tetrinet-0.11-r1
new file mode 100644
index 000000000000..c37c158c96ee
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/tetrinet-0.11-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=sys-libs/ncurses-5:0= virtual/pkgconfig
+DESCRIPTION=Console based tetrinet inc. standalone server
+EAPI=6
+HOMEPAGE=http://tetrinet.or.cz/
+IUSE=ipv6
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain
+RDEPEND=>=sys-libs/ncurses-5:0=
+SLOT=0
+SRC_URI=http://tetrinet.or.cz/download/tetrinet-0.11.tar.bz2
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f915e222c86f112588e4c4a4a52aa64c
diff --git a/metadata/md5-cache/games-puzzle/textmaze-1.2 b/metadata/md5-cache/games-puzzle/textmaze-1.2
deleted file mode 100644
index 8cd5f6b42ba4..000000000000
--- a/metadata/md5-cache/games-puzzle/textmaze-1.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DESCRIPTION=An ncurses-based maze solving game written in Perl
-EAPI=5
-HOMEPAGE=http://robobunny.com/projects/textmaze/html/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-perl/Curses games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.robobunny.com/projects/textmaze/textmaze_v1.2.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6cc77b91f11b661279183e96c65a971a
diff --git a/metadata/md5-cache/games-puzzle/textmaze-1.2-r1 b/metadata/md5-cache/games-puzzle/textmaze-1.2-r1
new file mode 100644
index 000000000000..306eaf179075
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/textmaze-1.2-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=An ncurses-based maze solving game written in Perl
+EAPI=6
+HOMEPAGE=http://robobunny.com/projects/textmaze/html/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-perl/Curses
+SLOT=0
+SRC_URI=http://www.robobunny.com/projects/textmaze/textmaze_v1.2.tar.gz
+_md5_=960719f25146395a0938628732a531e6
diff --git a/metadata/md5-cache/games-puzzle/tint-0.03b b/metadata/md5-cache/games-puzzle/tint-0.03b
deleted file mode 100644
index 8254a484d6a2..000000000000
--- a/metadata/md5-cache/games-puzzle/tint-0.03b
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=sys-libs/ncurses-5.4-r1:0
-DESCRIPTION=Tint Is Not Tetris, a ncurses based clone of the original Tetris(tm) game
-EAPI=5
-HOMEPAGE=http://oasis.frogfoot.net/code/tint/
-KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=>=sys-libs/ncurses-5.4-r1:0 games-misc/games-envd
-SLOT=0
-SRC_URI=http://oasis.frogfoot.net/code/tint/download/0.03b/tint_0.03b.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6db1285059341e5ae5697b1cf074a5ac
diff --git a/metadata/md5-cache/games-puzzle/tint-0.03b-r1 b/metadata/md5-cache/games-puzzle/tint-0.03b-r1
new file mode 100644
index 000000000000..8fce94e812d1
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/tint-0.03b-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DEPEND=>=sys-libs/ncurses-5.4-r1:0=
+DESCRIPTION=Tint Is Not Tetris, a ncurses based clone of the original Tetris(tm) game
+EAPI=6
+HOMEPAGE=http://oasis.frogfoot.net/code/tint/
+KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd
+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
+_md5_=e49bbb7058639af5c79d069570b26cd7
diff --git a/metadata/md5-cache/games-puzzle/tod-0 b/metadata/md5-cache/games-puzzle/tod-0
deleted file mode 100644
index 288bfe6903f6..000000000000
--- a/metadata/md5-cache/games-puzzle/tod-0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/allegro:0[X] app-arch/unzip
-DESCRIPTION=Tetanus On Drugs simulates playing Tetris under the influence of drugs
-EAPI=5
-HOMEPAGE=http://www.pineight.com/tod/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/allegro:0[X] games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.pineight.com/pc/wintod.zip
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=68588c17b753d69d01a1797b43aec180
diff --git a/metadata/md5-cache/games-puzzle/tod-0-r1 b/metadata/md5-cache/games-puzzle/tod-0-r1
new file mode 100644
index 000000000000..c66502baff9a
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/tod-0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/allegro:0[X] app-arch/unzip
+DESCRIPTION=Tetanus On Drugs simulates playing Tetris under the influence of drugs
+EAPI=6
+HOMEPAGE=http://www.pineight.com/tod/
+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 2ccd1dd1dd7bfb8795eea024a4f91bb6
+_md5_=8049a612202b49240ebcdba0b6b521d8
diff --git a/metadata/md5-cache/games-puzzle/tong-1.2 b/metadata/md5-cache/games-puzzle/tong-1.2
deleted file mode 100644
index efd5e60a52b9..000000000000
--- a/metadata/md5-cache/games-puzzle/tong-1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis]
-DESCRIPTION=Tetris and Pong in the same place at the same time
-EAPI=5
-HOMEPAGE=http://www.nongnu.org/tong/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.nongnu.org/tong/tong-1.2.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3ace8320e8b6ae2d3f86e010fe3fb8f9
diff --git a/metadata/md5-cache/games-puzzle/tong-1.2-r1 b/metadata/md5-cache/games-puzzle/tong-1.2-r1
new file mode 100644
index 000000000000..3f07dafeb88f
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/tong-1.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis]
+DESCRIPTION=Tetris and Pong in the same place at the same time
+EAPI=6
+HOMEPAGE=http://www.nongnu.org/tong/
+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 2ccd1dd1dd7bfb8795eea024a4f91bb6
+_md5_=6aa120c4e5260a069b954a092b3bca49
diff --git a/metadata/md5-cache/games-puzzle/toppler-1.1.6 b/metadata/md5-cache/games-puzzle/toppler-1.1.6
deleted file mode 100644
index 169fd7a57a3a..000000000000
--- a/metadata/md5-cache/games-puzzle/toppler-1.1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer[vorbis] nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
-DESCRIPTION=Reimplementation of Nebulous using SDL
-EAPI=5
-HOMEPAGE=http://toppler.sourceforge.net/
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer[vorbis] nls? ( virtual/libintl ) games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/toppler/toppler-1.1.6.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1990849e7ae270ba8addcb3ffe9c7ad8
diff --git a/metadata/md5-cache/games-puzzle/toppler-1.1.6-r1 b/metadata/md5-cache/games-puzzle/toppler-1.1.6-r1
new file mode 100644
index 000000000000..fc326ce4573e
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/toppler-1.1.6-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer[vorbis] nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
+DESCRIPTION=Reimplementation of Nebulous using SDL
+EAPI=6
+HOMEPAGE=http://toppler.sourceforge.net/
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer[vorbis] nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://sourceforge/toppler/toppler-1.1.6.tar.gz
+_md5_=768162c55d0cb726eb5abb31ba39c88a
diff --git a/metadata/md5-cache/games-puzzle/torrent-0.8.2 b/metadata/md5-cache/games-puzzle/torrent-0.8.2
deleted file mode 100644
index f91b13a7d0d8..000000000000
--- a/metadata/md5-cache/games-puzzle/torrent-0.8.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=media-libs/libsdl-1.2.4 >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-image-1.2 media-libs/sdl-ttf
-DESCRIPTION=Match rising tiles before reaching the top to score as many points as possible
-EAPI=5
-HOMEPAGE=http://www.shiftygames.com/torrent/torrent.html
-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 games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.shiftygames.com/torrent/torrent-0.8.2.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3333e960db05b20854367abd309579fc
diff --git a/metadata/md5-cache/games-puzzle/torrent-0.8.2-r1 b/metadata/md5-cache/games-puzzle/torrent-0.8.2-r1
new file mode 100644
index 000000000000..bf8a3ea8f349
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/torrent-0.8.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=media-libs/libsdl-1.2.4 >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-image-1.2 media-libs/sdl-ttf
+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
+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 2ccd1dd1dd7bfb8795eea024a4f91bb6
+_md5_=8bc56a032dda80c80d0ce25aa780ba7f
diff --git a/metadata/md5-cache/games-puzzle/wakkabox-1.1.0 b/metadata/md5-cache/games-puzzle/wakkabox-1.1.0
deleted file mode 100644
index 90eab2e0b11a..000000000000
--- a/metadata/md5-cache/games-puzzle/wakkabox-1.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=media-libs/libsdl-1.0.1 >=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 simple block-pushing game
-EAPI=5
-HOMEPAGE=http://kenn.frap.net/wakkabox/
-KEYWORDS=~x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libsdl-1.0.1 games-misc/games-envd
-SLOT=0
-SRC_URI=http://kenn.frap.net/wakkabox/wakkabox-1.1.0.tar.gz
-_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bcb24c519b68adfc8fa33e269a773f00
diff --git a/metadata/md5-cache/games-puzzle/wakkabox-1.1.0-r1 b/metadata/md5-cache/games-puzzle/wakkabox-1.1.0-r1
new file mode 100644
index 000000000000..40c63351c9fb
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/wakkabox-1.1.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=media-libs/libsdl-1.0.1 >=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 simple block-pushing game
+EAPI=6
+HOMEPAGE=http://kenn.frap.net/wakkabox/
+KEYWORDS=~amd64 ~x86
+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 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=f1b7249ac8506af28067b012f338d2bb
diff --git a/metadata/md5-cache/games-puzzle/wizznic-369 b/metadata/md5-cache/games-puzzle/wizznic-369
deleted file mode 100644
index 3f8181082217..000000000000
--- a/metadata/md5-cache/games-puzzle/wizznic-369
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[sound,joystick,opengl,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] virtual/opengl
-DESCRIPTION=Block-clearing puzzle game
-EAPI=5
-HOMEPAGE=http://wizznic.org/
-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 games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/wizznic/Wizznic_src_build_369.tar.bz2
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c1ad81702e183af3ca4b959b582e0f47
diff --git a/metadata/md5-cache/games-puzzle/wizznic-369-r1 b/metadata/md5-cache/games-puzzle/wizznic-369-r1
new file mode 100644
index 000000000000..54015456ed1d
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/wizznic-369-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/libsdl[sound,joystick,opengl,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] virtual/opengl
+DESCRIPTION=Block-clearing puzzle game
+EAPI=6
+HOMEPAGE=http://wizznic.org/
+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 2ccd1dd1dd7bfb8795eea024a4f91bb6
+_md5_=1b30b1885ab03355271e7807c9717595
diff --git a/metadata/md5-cache/games-puzzle/world-of-goo-demo-1.41-r1 b/metadata/md5-cache/games-puzzle/world-of-goo-demo-1.41-r1
deleted file mode 100644
index 9326f186675e..000000000000
--- a/metadata/md5-cache/games-puzzle/world-of-goo-demo-1.41-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DESCRIPTION=A puzzle game with a strong emphasis on physics
-EAPI=5
-HOMEPAGE=http://2dboy.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=2dboy-EULA
-RDEPEND=media-libs/libsdl[sound,opengl,video] media-libs/sdl-mixer[vorbis] sys-libs/glibc virtual/opengl virtual/glu >=sys-devel/gcc-3.4 games-misc/games-envd
-RESTRICT=fetch strip
-SLOT=0
-SRC_URI=WorldOfGooDemo.1.41.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a0e0ee10f284fce8a7df823aa9f9d875
diff --git a/metadata/md5-cache/games-puzzle/world-of-goo-demo-1.41-r2 b/metadata/md5-cache/games-puzzle/world-of-goo-demo-1.41-r2
new file mode 100644
index 000000000000..639e059bc1fe
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/world-of-goo-demo-1.41-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=A puzzle game with a strong emphasis on physics
+EAPI=6
+HOMEPAGE=http://2dboy.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=2dboy-EULA
+RDEPEND=media-libs/libsdl[sound,opengl,video] media-libs/sdl-mixer[vorbis] sys-libs/glibc virtual/opengl virtual/glu >=sys-devel/gcc-3.4
+RESTRICT=fetch strip
+SLOT=0
+SRC_URI=WorldOfGooDemo.1.41.tar.gz
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=13a42cddadb3853aa16c93d2d76b375c
diff --git a/metadata/md5-cache/games-puzzle/xblockout-1.1.6 b/metadata/md5-cache/games-puzzle/xblockout-1.1.6
deleted file mode 100644
index f77cdab30df2..000000000000
--- a/metadata/md5-cache/games-puzzle/xblockout-1.1.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=x11-libs/libX11 x11-libs/libXext >=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=X Window block dropping game in 3 Dimension
-EAPI=5
-HOMEPAGE=http://perso.univ-lyon1.fr/thierry.excoffier/XBL/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-1
-RDEPEND=x11-libs/libX11 x11-libs/libXext games-misc/games-envd
-SLOT=0
-SRC_URI=http://perso.univ-lyon1.fr/thierry.excoffier/XBL/xbl-1.1.6.tar.gz
-_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 games 2bb3ede665927a68ffdb7c41eec7efde libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0a92d069164f8a45b9144e417a6dacef
diff --git a/metadata/md5-cache/games-puzzle/xblockout-1.1.6-r1 b/metadata/md5-cache/games-puzzle/xblockout-1.1.6-r1
new file mode 100644
index 000000000000..c1c24a661e57
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/xblockout-1.1.6-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=x11-libs/libX11 x11-libs/libXext >=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=X Window block dropping game in 3 Dimension
+EAPI=6
+HOMEPAGE=http://perso.univ-lyon1.fr/thierry.excoffier/XBL/
+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 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a53a5d54fdb6f05464d0137f8d246aa2
diff --git a/metadata/md5-cache/games-puzzle/xpired-1.22 b/metadata/md5-cache/games-puzzle/xpired-1.22
deleted file mode 100644
index 1ae3902217be..000000000000
--- a/metadata/md5-cache/games-puzzle/xpired-1.22
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-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=5
-HOMEPAGE=http://xpired.sourceforge.net
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/sdl-gfx media-libs/sdl-image[jpeg] media-libs/sdl-mixer[mod] games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/xpired/xpired-1.22-linux_source.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cd39e7ab707bea5940a03c7cf662634e
diff --git a/metadata/md5-cache/games-puzzle/xpired-1.22-r1 b/metadata/md5-cache/games-puzzle/xpired-1.22-r1
new file mode 100644
index 000000000000..e2571e8acbf9
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/xpired-1.22-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+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
+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 2ccd1dd1dd7bfb8795eea024a4f91bb6
+_md5_=ea1131c8817277602d817515c4d45821
diff --git a/metadata/md5-cache/games-puzzle/xtris-1.15 b/metadata/md5-cache/games-puzzle/xtris-1.15
deleted file mode 100644
index 7edeb25b274d..000000000000
--- a/metadata/md5-cache/games-puzzle/xtris-1.15
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=x11-libs/libX11
-DESCRIPTION=a networked Tetris-like game
-EAPI=5
-HOMEPAGE=http://www.iagora.com/~espel/xtris/xtris.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.iagora.com/~espel/xtris/xtris-1.15.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=28c4622acec96b9196850ce5dd30cfc3
diff --git a/metadata/md5-cache/games-puzzle/xtris-1.15-r1 b/metadata/md5-cache/games-puzzle/xtris-1.15-r1
new file mode 100644
index 000000000000..f63c36b41d05
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/xtris-1.15-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=x11-libs/libX11
+DESCRIPTION=A networked Tetris-like game
+EAPI=5
+HOMEPAGE=http://www.iagora.com/~espel/xtris/xtris.html
+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 2ccd1dd1dd7bfb8795eea024a4f91bb6 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=6fc9261a1dd1675b7307c1a12bc8a65a
diff --git a/metadata/md5-cache/games-puzzle/zaz-1.0.0 b/metadata/md5-cache/games-puzzle/zaz-1.0.0
deleted file mode 100644
index e0338df84033..000000000000
--- a/metadata/md5-cache/games-puzzle/zaz-1.0.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=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 virtual/pkgconfig 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=A puzzle game where the player has to arrange balls in triplets
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/zaz/
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-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 games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/zaz/zaz-1.0.0.tar.bz2
-_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 games 2bb3ede665927a68ffdb7c41eec7efde libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f26ef6c1d4659d7fed4beb7148ccd35a
diff --git a/metadata/md5-cache/games-puzzle/zaz-1.0.0-r1 b/metadata/md5-cache/games-puzzle/zaz-1.0.0-r1
new file mode 100644
index 000000000000..2df998708a82
--- /dev/null
+++ b/metadata/md5-cache/games-puzzle/zaz-1.0.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=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 virtual/pkgconfig 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=A puzzle game where the player has to arrange balls in triplets
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/zaz/
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+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 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=94619645d32bc3a694562f2fde294d4b
diff --git a/metadata/md5-cache/games-rpg/bass-1.2-r1 b/metadata/md5-cache/games-rpg/bass-1.2-r1
deleted file mode 100644
index d5a59327b946..000000000000
--- a/metadata/md5-cache/games-rpg/bass-1.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=games-engines/scummvm-0.5.0 app-arch/unzip
-DESCRIPTION=Beneath a Steel Sky: a SciFi thriller set in a bleak vision of the future
-EAPI=5
-HOMEPAGE=https://en.wikipedia.org/wiki/Beneath_a_Steel_Sky
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=bass
-RDEPEND=>=games-engines/scummvm-0.5.0 games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/scummvm/bass-cd-1.2.zip mirror://gentoo/bass.png
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8e05dc9be4e1ffc0dbd204824c3defec
diff --git a/metadata/md5-cache/games-rpg/bass-1.3 b/metadata/md5-cache/games-rpg/bass-1.3
new file mode 100644
index 000000000000..95ff3e3a4bc2
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/bass-1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=>=games-engines/scummvm-0.5.0 app-arch/unzip
+DESCRIPTION=Beneath a Steel Sky: a SciFi thriller set in a bleak vision of the future
+EAPI=6
+HOMEPAGE=https://en.wikipedia.org/wiki/Beneath_a_Steel_Sky
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=bass
+RDEPEND=>=games-engines/scummvm-0.5.0
+SLOT=0
+SRC_URI=http://downloads.sourceforge.net/scummvm/BASS-Floppy-1.3.zip mirror://gentoo/bass.png
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a1e0c4752dae783a1f46b73b33ab9125
diff --git a/metadata/md5-cache/games-rpg/draci-historie-2012 b/metadata/md5-cache/games-rpg/draci-historie-2012
deleted file mode 100644
index 51d41c2ce4be..000000000000
--- a/metadata/md5-cache/games-rpg/draci-historie-2012
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip
-DESCRIPTION=Bert the little dragon searches for his father
-EAPI=5
-HOMEPAGE=http://www.ucw.cz/draci-historie/index-en.html
-IUSE=l10n_cs l10n_de l10n_en l10n_pl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=games-engines/scummvm-1.1 games-misc/games-envd
-SLOT=0
-SRC_URI=l10n_cs? ( http://www.ucw.cz/draci-historie/binary/dh-cz-2012.zip ) l10n_de? ( http://www.ucw.cz/draci-historie/binary/dh-de-2012.zip ) l10n_en? ( http://www.ucw.cz/draci-historie/binary/dh-en-2012.zip ) l10n_pl? ( http://www.ucw.cz/draci-historie/binary/dh-pl-2012.zip ) !l10n_cs? ( !l10n_de? ( !l10n_en? ( !l10n_pl? ( http://www.ucw.cz/draci-historie/binary/dh-en-2012.zip ) ) ) )
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1cc5d291aa0ef15c1fb278c9e00f8ef3
diff --git a/metadata/md5-cache/games-rpg/draci-historie-2012-r1 b/metadata/md5-cache/games-rpg/draci-historie-2012-r1
new file mode 100644
index 000000000000..ec47ba903977
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/draci-historie-2012-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Bert the little dragon searches for his father
+EAPI=6
+HOMEPAGE=http://www.ucw.cz/draci-historie/index-en.html
+IUSE=l10n_cs l10n_de l10n_en l10n_pl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=games-engines/scummvm-1.1
+SLOT=0
+SRC_URI=l10n_cs? ( http://www.ucw.cz/draci-historie/binary/dh-cz-2012.zip ) l10n_de? ( http://www.ucw.cz/draci-historie/binary/dh-de-2012.zip ) l10n_en? ( http://www.ucw.cz/draci-historie/binary/dh-en-2012.zip ) l10n_pl? ( http://www.ucw.cz/draci-historie/binary/dh-pl-2012.zip ) !l10n_cs? ( !l10n_de? ( !l10n_en? ( !l10n_pl? ( http://www.ucw.cz/draci-historie/binary/dh-en-2012.zip ) ) ) )
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=db476b07b7fe12bf6a1a240898034693
diff --git a/metadata/md5-cache/games-rpg/drascula-1.0-r2 b/metadata/md5-cache/games-rpg/drascula-1.0-r2
deleted file mode 100644
index 8e9df9d9633a..000000000000
--- a/metadata/md5-cache/games-rpg/drascula-1.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=games-engines/scummvm-0.13.1 app-arch/unzip
-DESCRIPTION=Drascula: The Vampire Strikes Back
-EAPI=5
-HOMEPAGE=http://www.alcachofasoft.com/
-IUSE=l10n_es l10n_de l10n_fr l10n_it +sound
-KEYWORDS=~amd64 ~x86
-LICENSE=drascula
-RDEPEND=>=games-engines/scummvm-0.13.1 games-misc/games-envd
-RESTRICT=mirror
-SLOT=0
-SRC_URI=mirror://sourceforge/scummvm/drascula-1.0.zip https://github.com/scummvm/scummvm/raw/v1.5.0/dists/engine-data/drascula.dat -> drascula-1.5.0.dat sound? ( mirror://sourceforge/scummvm/drascula-audio-2.0.zip ) l10n_es? ( mirror://sourceforge/scummvm/drascula-int-1.1.zip ) l10n_de? ( mirror://sourceforge/scummvm/drascula-int-1.1.zip ) l10n_fr? ( mirror://sourceforge/scummvm/drascula-int-1.1.zip ) l10n_it? ( mirror://sourceforge/scummvm/drascula-int-1.1.zip )
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=46f8676bf690b6c472763f4bf4085ce5
diff --git a/metadata/md5-cache/games-rpg/drascula-1.0-r3 b/metadata/md5-cache/games-rpg/drascula-1.0-r3
new file mode 100644
index 000000000000..34694aad2528
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/drascula-1.0-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install unpack
+DEPEND=>=games-engines/scummvm-0.13.1 app-arch/unzip
+DESCRIPTION=Drascula: The Vampire Strikes Back
+EAPI=6
+HOMEPAGE=http://www.alcachofasoft.com/
+IUSE=l10n_es l10n_de l10n_fr l10n_it +sound
+KEYWORDS=~amd64 ~x86
+LICENSE=drascula
+RDEPEND=>=games-engines/scummvm-0.13.1
+RESTRICT=mirror
+SLOT=0
+SRC_URI=mirror://sourceforge/scummvm/drascula-1.0.zip https://github.com/scummvm/scummvm/raw/v2.0.0/dists/engine-data/drascula.dat -> drascula-2.0.0.dat sound? ( mirror://sourceforge/scummvm/drascula-audio-2.0.zip ) https://salsa.debian.org/games-team/drascula/raw/master/debian/icons/drascula.png l10n_es? ( mirror://sourceforge/scummvm/drascula-int-1.1.zip ) l10n_de? ( mirror://sourceforge/scummvm/drascula-int-1.1.zip ) l10n_fr? ( mirror://sourceforge/scummvm/drascula-int-1.1.zip ) l10n_it? ( mirror://sourceforge/scummvm/drascula-int-1.1.zip )
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8a358e5c03ec6b98a9759e6724bfffb4
diff --git a/metadata/md5-cache/games-rpg/dreamweb-1.1 b/metadata/md5-cache/games-rpg/dreamweb-1.1
deleted file mode 100644
index 2b597ba18353..000000000000
--- a/metadata/md5-cache/games-rpg/dreamweb-1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip
-DESCRIPTION=Top-down adventure game set in a gritty futuristic/dystopian city
-EAPI=5
-HOMEPAGE=http://wiki.scummvm.org/index.php/Dreamweb
-IUSE=doc l10n_de l10n_en l10n_en-GB l10n_es l10n_fr l10n_it
-KEYWORDS=~amd64 ~x86
-LICENSE=Dreamweb
-RDEPEND=>=games-engines/scummvm-1.7[flac] games-misc/games-envd
-SLOT=0
-SRC_URI=doc? ( mirror://sourceforge/scummvm/dreamweb-manuals-en-highres.zip ) l10n_de? ( mirror://sourceforge/scummvm/dreamweb-cd-de-1.1.zip ) l10n_en? ( mirror://sourceforge/scummvm/dreamweb-cd-us-1.1.zip ) l10n_en-GB? ( mirror://sourceforge/scummvm/dreamweb-cd-uk-1.1.zip ) l10n_es? ( mirror://sourceforge/scummvm/dreamweb-cd-es-1.1.zip ) l10n_fr? ( mirror://sourceforge/scummvm/dreamweb-cd-fr-1.1.zip ) l10n_it? ( mirror://sourceforge/scummvm/dreamweb-cd-it-1.1.zip ) !l10n_de? ( !l10n_en? ( !l10n_en-GB? ( !l10n_es? ( !l10n_fr? ( !l10n_it? ( mirror://sourceforge/scummvm/dreamweb-cd-us-1.1.zip ) ) ) ) ) ) http://www.scummvm.org/images/cat-dreamweb.png
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9e14af04868ebbd6f82528baaa32e95a
diff --git a/metadata/md5-cache/games-rpg/dreamweb-1.1-r1 b/metadata/md5-cache/games-rpg/dreamweb-1.1-r1
new file mode 100644
index 000000000000..8de12a083757
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/dreamweb-1.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Top-down adventure game set in a gritty futuristic/dystopian city
+EAPI=6
+HOMEPAGE=http://wiki.scummvm.org/index.php/Dreamweb
+IUSE=doc l10n_de l10n_en l10n_en-GB l10n_es l10n_fr l10n_it
+KEYWORDS=~amd64 ~x86
+LICENSE=Dreamweb
+RDEPEND=>=games-engines/scummvm-1.7[flac]
+SLOT=0
+SRC_URI=doc? ( mirror://sourceforge/scummvm/dreamweb-manuals-en-highres.zip ) l10n_de? ( mirror://sourceforge/scummvm/dreamweb-cd-de-1.1.zip ) l10n_en? ( mirror://sourceforge/scummvm/dreamweb-cd-us-1.1.zip ) l10n_en-GB? ( mirror://sourceforge/scummvm/dreamweb-cd-uk-1.1.zip ) l10n_es? ( mirror://sourceforge/scummvm/dreamweb-cd-es-1.1.zip ) l10n_fr? ( mirror://sourceforge/scummvm/dreamweb-cd-fr-1.1.zip ) l10n_it? ( mirror://sourceforge/scummvm/dreamweb-cd-it-1.1.zip ) !l10n_de? ( !l10n_en? ( !l10n_en-GB? ( !l10n_es? ( !l10n_fr? ( !l10n_it? ( mirror://sourceforge/scummvm/dreamweb-cd-us-1.1.zip ) ) ) ) ) ) http://www.scummvm.org/images/cat-dreamweb.png
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=268e071a149a0a376e403757912be2be
diff --git a/metadata/md5-cache/games-rpg/freedink-108.4 b/metadata/md5-cache/games-rpg/freedink-108.4
deleted file mode 100644
index 296b27b88d52..000000000000
--- a/metadata/md5-cache/games-rpg/freedink-108.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=media-libs/fontconfig-2.4 >=media-libs/libsdl-1.2[X,sound,joystick,video] >=media-libs/sdl-gfx-2.0 >=media-libs/sdl-image-1.2 >=media-libs/sdl-mixer-1.2[midi,vorbis,wav] >=media-libs/sdl-ttf-2.0.9 dev-libs/check virtual/pkgconfig sys-devel/gettext
-DESCRIPTION=Dink Smallwood is an adventure/role-playing game, similar to Zelda (2D top view)
-EAPI=5
-HOMEPAGE=http://www.freedink.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=media-libs/fontconfig-2.4 >=media-libs/libsdl-1.2[X,sound,joystick,video] >=media-libs/sdl-gfx-2.0 >=media-libs/sdl-image-1.2 >=media-libs/sdl-mixer-1.2[midi,vorbis,wav] >=media-libs/sdl-ttf-2.0.9 ~games-rpg/freedink-data-1.08.20140901 games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://gnu/freedink/freedink-108.4.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=88c626227ac4af1883b9cbf6a5310a45
diff --git a/metadata/md5-cache/games-rpg/freedink-108.4-r1 b/metadata/md5-cache/games-rpg/freedink-108.4-r1
new file mode 100644
index 000000000000..b37f37b8ec2c
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/freedink-108.4-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=media-libs/fontconfig-2.4 >=media-libs/libsdl-1.2[X,sound,joystick,video] >=media-libs/sdl-gfx-2.0 >=media-libs/sdl-image-1.2 >=media-libs/sdl-mixer-1.2[midi,vorbis,wav] >=media-libs/sdl-ttf-2.0.9 dev-libs/check virtual/pkgconfig sys-devel/gettext
+DESCRIPTION=Dink Smallwood is an adventure/role-playing game, similar to Zelda (2D top view)
+EAPI=6
+HOMEPAGE=http://www.freedink.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=media-libs/fontconfig-2.4 >=media-libs/libsdl-1.2[X,sound,joystick,video] >=media-libs/sdl-gfx-2.0 >=media-libs/sdl-image-1.2 >=media-libs/sdl-mixer-1.2[midi,vorbis,wav] >=media-libs/sdl-ttf-2.0.9 ~games-rpg/freedink-data-1.08.20140901
+SLOT=0
+SRC_URI=mirror://gnu/freedink/freedink-108.4.tar.gz
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=bce64860ec13470d3a76e8413118f848
diff --git a/metadata/md5-cache/games-rpg/freedink-data-1.08.20140901 b/metadata/md5-cache/games-rpg/freedink-data-1.08.20140901
deleted file mode 100644
index cb4aea3974a4..000000000000
--- a/metadata/md5-cache/games-rpg/freedink-data-1.08.20140901
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DESCRIPTION=Freedink game data
-EAPI=5
-HOMEPAGE=http://www.freedink.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=ZLIB CC-BY-SA-3.0 CC-BY-3.0 FreeArt GPL-2 GPL-3 WTFPL-2 OAL-1.0.1 public-domain
-RDEPEND=games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://gnu/freedink/freedink-data-1.08.20140901.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=68731fcd97d034648e0071a7dcaf3362
diff --git a/metadata/md5-cache/games-rpg/freedink-data-1.08.20140901-r1 b/metadata/md5-cache/games-rpg/freedink-data-1.08.20140901-r1
new file mode 100644
index 000000000000..83ddde8a9778
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/freedink-data-1.08.20140901-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Freedink game data
+EAPI=6
+HOMEPAGE=http://www.freedink.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=ZLIB CC-BY-SA-3.0 CC-BY-3.0 FreeArt GPL-2 GPL-3 WTFPL-2 OAL-1.0.1 public-domain
+SLOT=0
+SRC_URI=mirror://gnu/freedink/freedink-data-1.08.20140901.tar.gz
+_md5_=d4d7ad4de5190e01896c21682fba95dc
diff --git a/metadata/md5-cache/games-rpg/queen-1 b/metadata/md5-cache/games-rpg/queen-1-r1
index 401ac6f332db..6aaa3fd906ad 100644
--- a/metadata/md5-cache/games-rpg/queen-1
+++ b/metadata/md5-cache/games-rpg/queen-1-r1
@@ -1,14 +1,14 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEFINED_PHASES=install unpack
DEPEND=l10n_de? ( games-engines/scummvm[vorbis] ) l10n_en? ( games-engines/scummvm[mp3?] ) l10n_fr? ( games-engines/scummvm[vorbis] ) l10n_he? ( games-engines/scummvm[vorbis] ) l10n_it? ( games-engines/scummvm[vorbis] ) l10n_de? ( app-arch/unzip ) l10n_en? ( mp3? ( app-arch/unzip ) ) l10n_fr? ( app-arch/unzip ) l10n_he? ( app-arch/unzip ) l10n_it? ( app-arch/unzip )
DESCRIPTION=Flight of the Amazon Queen - 2D point-and-click adventure game set in the 1940s
-EAPI=5
+EAPI=6
HOMEPAGE=http://scummvm.sourceforge.net/
IUSE=mp3 l10n_de +l10n_en l10n_fr l10n_he l10n_it
KEYWORDS=~amd64 ~ppc64 ~x86
LICENSE=queen
-RDEPEND=l10n_de? ( games-engines/scummvm[vorbis] ) l10n_en? ( games-engines/scummvm[mp3?] ) l10n_fr? ( games-engines/scummvm[vorbis] ) l10n_he? ( games-engines/scummvm[vorbis] ) l10n_it? ( games-engines/scummvm[vorbis] ) games-misc/games-envd
+RDEPEND=l10n_de? ( games-engines/scummvm[vorbis] ) l10n_en? ( games-engines/scummvm[mp3?] ) l10n_fr? ( games-engines/scummvm[vorbis] ) l10n_he? ( games-engines/scummvm[vorbis] ) l10n_it? ( games-engines/scummvm[vorbis] )
REQUIRED_USE=|| ( l10n_de l10n_en l10n_fr l10n_he l10n_it )
SLOT=0
SRC_URI=l10n_de? ( mirror://sourceforge/scummvm/FOTAQ_Ger_talkie-1.0.zip http://www.lysator.liu.se/~zino/scummvm/queen/readme.txt -> queen-readme.txt ) l10n_en? ( mp3? ( mirror://sourceforge/scummvm/FOTAQ_Talkie-1.1.zip ) !mp3? ( http://www.lysator.liu.se/~zino/scummvm/queen/queen.1.bz2 http://www.lysator.liu.se/~zino/scummvm/queen/readme.txt -> queen-readme.txt ) ) l10n_fr? ( mirror://sourceforge/scummvm/FOTAQ_Fr_Talkie_1.0.zip ) l10n_he? ( mirror://sourceforge/scummvm/FOTAQ_Heb_talkie.zip http://www.lysator.liu.se/~zino/scummvm/queen/readme.txt -> queen-readme.txt ) l10n_it? ( mirror://sourceforge/scummvm/FOTAQ_It_Talkie_1.0.zip ) http://www.scummvm.org/images/cat-queen.png
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=daac662093d949fc97eba4dc691634a6
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4dd867ef6ff08929f6191b45dd339901
diff --git a/metadata/md5-cache/games-rpg/soltys-1.0-r1 b/metadata/md5-cache/games-rpg/soltys-1.0-r1
deleted file mode 100644
index 7a1adb917446..000000000000
--- a/metadata/md5-cache/games-rpg/soltys-1.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip app-arch/unzip
-DESCRIPTION=Classic adventure game
-EAPI=5
-HOMEPAGE=http://wiki.scummvm.org/index.php/Soltys
-IUSE=l10n_en l10n_es l10n_pl
-KEYWORDS=~amd64 ~x86
-LICENSE=Soltys
-RDEPEND=>=games-engines/scummvm-1.5 games-misc/games-envd
-SLOT=0
-SRC_URI=l10n_en? ( mirror://sourceforge/scummvm/soltys-en-v1.0.zip ) l10n_es? ( mirror://sourceforge/scummvm/soltys-es-v1.0.zip ) l10n_pl? ( mirror://sourceforge/scummvm/soltys-pl-v1.0.zip ) !l10n_en? ( !l10n_es? ( !l10n_pl? ( mirror://sourceforge/scummvm/soltys-en-v1.0.zip ) ) ) http://www.scummvm.org/images/cat-soltys.png
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c3d9bc6ba96fc9f9b19d7e6576676c93
diff --git a/metadata/md5-cache/games-rpg/soltys-1.0-r2 b/metadata/md5-cache/games-rpg/soltys-1.0-r2
new file mode 100644
index 000000000000..837c57705989
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/soltys-1.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Classic adventure game
+EAPI=6
+HOMEPAGE=http://wiki.scummvm.org/index.php/Soltys
+IUSE=l10n_en l10n_es l10n_pl
+KEYWORDS=~amd64 ~x86
+LICENSE=Soltys
+RDEPEND=>=games-engines/scummvm-1.5
+SLOT=0
+SRC_URI=l10n_en? ( mirror://sourceforge/scummvm/soltys-en-v1.0.zip ) l10n_es? ( mirror://sourceforge/scummvm/soltys-es-v1.0.zip ) l10n_pl? ( mirror://sourceforge/scummvm/soltys-pl-v1.0.zip ) !l10n_en? ( !l10n_es? ( !l10n_pl? ( mirror://sourceforge/scummvm/soltys-en-v1.0.zip ) ) ) http://www.scummvm.org/images/cat-soltys.png
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d28cfeac5f360134d05071fccd170a53
diff --git a/metadata/md5-cache/games-rpg/zsdx-1.9.0 b/metadata/md5-cache/games-rpg/zsdx-1.9.0
deleted file mode 100644
index 11a64d415b2f..000000000000
--- a/metadata/md5-cache/games-rpg/zsdx-1.9.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/zip sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=A free 2D Zelda fangame
-EAPI=5
-HOMEPAGE=http://www.solarus-games.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=all-rights-reserved CC-BY-SA-3.0 GPL-3
-RDEPEND=>=games-engines/solarus-1.3.0 <games-engines/solarus-1.4.0 games-misc/games-envd
-RESTRICT=mirror
-SLOT=0
-SRC_URI=http://www.zelda-solarus.com/downloads/zsdx/zsdx-1.9.0.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 cmake-utils d2f8cff68b90b869ef9d460c6f3c4e2e desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 games 2bb3ede665927a68ffdb7c41eec7efde gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d77589544d004d2fc495127d6b3ec3d7
diff --git a/metadata/md5-cache/games-rpg/zsdx-1.9.0-r1 b/metadata/md5-cache/games-rpg/zsdx-1.9.0-r1
new file mode 100644
index 000000000000..6d7716b3d90b
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/zsdx-1.9.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-arch/zip sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=A free 2D Zelda fangame
+EAPI=6
+HOMEPAGE=http://www.solarus-games.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved CC-BY-SA-3.0 GPL-3
+RDEPEND=>=games-engines/solarus-1.3.0 <games-engines/solarus-1.4.0
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://www.zelda-solarus.com/downloads/zsdx/zsdx-1.9.0.tar.gz
+_eclasses_=cmake-utils d2f8cff68b90b869ef9d460c6f3c4e2e desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 4d211d7614f303710fca59db6ec12c88 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils ebb2eaddc6331c4fa000b8eb8f6fe074 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2d1b2186d0dfb0437248eb489ef2ee36
diff --git a/metadata/md5-cache/games-server/crossfire-server-1.71.0 b/metadata/md5-cache/games-server/crossfire-server-1.71.0
deleted file mode 100644
index c8325a1977aa..000000000000
--- a/metadata/md5-cache/games-server/crossfire-server-1.71.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=net-misc/curl X? ( x11-libs/libXaw media-libs/libpng:0 )
-DESCRIPTION=server for the crossfire clients
-EAPI=5
-HOMEPAGE=http://crossfire.real-time.com/
-IUSE=X
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=net-misc/curl X? ( x11-libs/libXaw media-libs/libpng:0 ) games-misc/games-envd
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/crossfire/crossfire-server/1.71.0/crossfire-1.71.0.tar.bz2 mirror://sourceforge/crossfire/crossfire-server/1.71.0/crossfire-1.71.0.maps.tar.bz2 mirror://sourceforge/crossfire/crossfire-server/1.71.0/crossfire-1.71.0.arch.tar.bz2
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bbd2b5e8abf58b6f624ba1a50363068a
diff --git a/metadata/md5-cache/games-server/crossfire-server-1.71.0-r1 b/metadata/md5-cache/games-server/crossfire-server-1.71.0-r1
new file mode 100644
index 000000000000..9584e4e3377b
--- /dev/null
+++ b/metadata/md5-cache/games-server/crossfire-server-1.71.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=net-misc/curl X? ( x11-libs/libXaw media-libs/libpng:0= )
+DESCRIPTION=Server for the crossfire clients
+EAPI=6
+HOMEPAGE=http://crossfire.real-time.com/
+IUSE=X
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=net-misc/curl X? ( x11-libs/libXaw media-libs/libpng:0= )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/crossfire/crossfire-server/1.71.0/crossfire-1.71.0.tar.bz2 mirror://sourceforge/crossfire/crossfire-server/1.71.0/crossfire-1.71.0.maps.tar.bz2 mirror://sourceforge/crossfire/crossfire-server/1.71.0/crossfire-1.71.0.arch.tar.bz2
+_md5_=e4b5af9428a46b8df5740eb3ca1df58c
diff --git a/metadata/md5-cache/games-simulation/cannonsmash-0.6.6 b/metadata/md5-cache/games-simulation/cannonsmash-0.6.6
deleted file mode 100644
index 4ed86c6d9930..000000000000
--- a/metadata/md5-cache/games-simulation/cannonsmash-0.6.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=virtual/opengl virtual/glu media-libs/libsdl[sound,video] media-libs/sdl-mixer[vorbis?] media-libs/sdl-image[jpeg,png] x11-libs/gtk+:2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=3D tabletennis game
-EAPI=5
-HOMEPAGE=http://cannonsmash.sourceforge.net/
-IUSE=vorbis nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/opengl virtual/glu media-libs/libsdl[sound,video] media-libs/sdl-mixer[vorbis?] media-libs/sdl-image[jpeg,png] x11-libs/gtk+:2 nls? ( virtual/libintl ) games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/cannonsmash/csmash-0.6.6.tar.gz vorbis? ( http://nan.p.utmc.or.jp/danslatristesse2-48.ogg )
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=de74ee9f5567c9b46030ef74cb9ab620
diff --git a/metadata/md5-cache/games-simulation/cannonsmash-0.6.6-r1 b/metadata/md5-cache/games-simulation/cannonsmash-0.6.6-r1
new file mode 100644
index 000000000000..802529e4f18f
--- /dev/null
+++ b/metadata/md5-cache/games-simulation/cannonsmash-0.6.6-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=virtual/opengl virtual/glu media-libs/libsdl[sound,video] media-libs/sdl-mixer[vorbis?] media-libs/sdl-image[jpeg,png] x11-libs/gtk+:2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=3D tabletennis game
+EAPI=6
+HOMEPAGE=http://cannonsmash.sourceforge.net/
+IUSE=vorbis nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/opengl virtual/glu media-libs/libsdl[sound,video] media-libs/sdl-mixer[vorbis?] media-libs/sdl-image[jpeg,png] x11-libs/gtk+:2 nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://sourceforge/cannonsmash/csmash-0.6.6.tar.gz vorbis? ( http://nan.p.utmc.or.jp/danslatristesse2-48.ogg )
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6
+_md5_=f362e4c841491dc21b6796281ae71a30
diff --git a/metadata/md5-cache/games-simulation/pmars-sdl-0.9.2e b/metadata/md5-cache/games-simulation/pmars-sdl-0.9.2e
deleted file mode 100644
index 4f0e3d79f144..000000000000
--- a/metadata/md5-cache/games-simulation/pmars-sdl-0.9.2e
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=sdl? ( x11-libs/libX11 media-libs/libsdl[video] ) X? ( x11-libs/libX11 ) !sdl? ( !X? ( sys-libs/ncurses:0 ) )
-DESCRIPTION=Portable redcode simulator's sdl port for core war
-EAPI=5
-HOMEPAGE=http://corewar.co.uk/pihlaja/pmars-sdl/
-IUSE=sdl X
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD GPL-2
-RDEPEND=sdl? ( x11-libs/libX11 media-libs/libsdl[video] ) X? ( x11-libs/libX11 ) !sdl? ( !X? ( sys-libs/ncurses:0 ) ) games-misc/games-envd
-SLOT=0
-SRC_URI=http://corewar.co.uk/pihlaja/pmars-sdl/pmars-0.9.2-5.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e1e99a521be4f7fa0be783efa198df02
diff --git a/metadata/md5-cache/games-simulation/pmars-sdl-0.9.2e-r1 b/metadata/md5-cache/games-simulation/pmars-sdl-0.9.2e-r1
new file mode 100644
index 000000000000..ad86eb36843f
--- /dev/null
+++ b/metadata/md5-cache/games-simulation/pmars-sdl-0.9.2e-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst
+DEPEND=sdl? ( x11-libs/libX11 media-libs/libsdl[video] ) X? ( x11-libs/libX11 ) !sdl? ( !X? ( sys-libs/ncurses:0= ) )
+DESCRIPTION=Portable redcode simulator's sdl port for core war
+EAPI=6
+HOMEPAGE=http://corewar.co.uk/pihlaja/pmars-sdl/
+IUSE=sdl X
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD GPL-2
+RDEPEND=sdl? ( x11-libs/libX11 media-libs/libsdl[video] ) X? ( x11-libs/libX11 ) !sdl? ( !X? ( sys-libs/ncurses:0= ) )
+SLOT=0
+SRC_URI=http://corewar.co.uk/pihlaja/pmars-sdl/pmars-0.9.2-5.tar.gz
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e readme.gentoo-r1 6f03e110529650f57fc7d1fb908b8986 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=86ab54130f1149f89e68ccf344797170
diff --git a/metadata/md5-cache/games-sports/foobillard-3.0a b/metadata/md5-cache/games-sports/foobillard-3.0a
deleted file mode 100644
index 3744cc4cc9a8..000000000000
--- a/metadata/md5-cache/games-sports/foobillard-3.0a
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=x11-libs/libXaw x11-libs/libXi virtual/opengl virtual/glu >=media-libs/freetype-2.0.9 media-libs/libpng:0 sdl? ( media-libs/libsdl[video] ) !sdl? ( media-libs/freeglut ) >=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=8ball, 9ball, snooker and carambol game
-EAPI=5
-HOMEPAGE=http://foobillard.sourceforge.net/
-IUSE=sdl video_cards_nvidia
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=x11-libs/libXaw x11-libs/libXi virtual/opengl virtual/glu >=media-libs/freetype-2.0.9 media-libs/libpng:0 sdl? ( media-libs/libsdl[video] ) !sdl? ( media-libs/freeglut ) games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://gentoo/foobillard-3.0a.tar.gz
-_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 games 2bb3ede665927a68ffdb7c41eec7efde libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=603d659c9e7c8ab3c3e6639dd4d7aec6
diff --git a/metadata/md5-cache/games-sports/foobillard-3.0a-r1 b/metadata/md5-cache/games-sports/foobillard-3.0a-r1
new file mode 100644
index 000000000000..11f9962a6d93
--- /dev/null
+++ b/metadata/md5-cache/games-sports/foobillard-3.0a-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=x11-libs/libXaw x11-libs/libXi virtual/opengl virtual/glu >=media-libs/freetype-2.0.9:2 media-libs/libpng:0= sdl? ( media-libs/libsdl[video] ) !sdl? ( media-libs/freeglut ) >=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=8ball, 9ball, snooker and carambol game
+EAPI=6
+HOMEPAGE=http://foobillard.sourceforge.net/
+IUSE=sdl video_cards_nvidia
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=x11-libs/libXaw x11-libs/libXi virtual/opengl virtual/glu >=media-libs/freetype-2.0.9:2 media-libs/libpng:0= sdl? ( media-libs/libsdl[video] ) !sdl? ( media-libs/freeglut )
+SLOT=0
+SRC_URI=mirror://gentoo/foobillard-3.0a.tar.gz
+_eclasses_=autotools 4842e626555a9a4344f34cef2e190b67 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c8de5c2898249e6fae1afcf8d1088cbb
diff --git a/metadata/md5-cache/games-strategy/crimson-0.5.3 b/metadata/md5-cache/games-strategy/crimson-0.5.3
deleted file mode 100644
index 836e3d0cf426..000000000000
--- a/metadata/md5-cache/games-strategy/crimson-0.5.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer media-libs/sdl-ttf media-libs/sdl-net zlib? ( sys-libs/zlib ) dev-libs/libxslt test? ( =app-text/docbook-xml-dtd-4.2* dev-libs/libxml2 )
-DESCRIPTION=Tactical war game in the tradition of Battle Isle
-EAPI=5
-HOMEPAGE=http://crimson.seul.org/
-IUSE=test zlib
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer media-libs/sdl-ttf media-libs/sdl-net zlib? ( sys-libs/zlib ) games-misc/games-envd
-SLOT=0
-SRC_URI=http://crimson.seul.org/files/crimson-0.5.3.tar.bz2
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7af54b3cd86fc09db4d0b796a4152afe
diff --git a/metadata/md5-cache/games-strategy/crimson-0.5.3-r1 b/metadata/md5-cache/games-strategy/crimson-0.5.3-r1
new file mode 100644
index 000000000000..e448ad8d6376
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/crimson-0.5.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer media-libs/sdl-ttf media-libs/sdl-net zlib? ( sys-libs/zlib ) dev-libs/libxslt test? ( app-text/docbook-xml-dtd:4.2 dev-libs/libxml2 )
+DESCRIPTION=Tactical war game in the tradition of Battle Isle
+EAPI=6
+HOMEPAGE=http://crimson.seul.org/
+IUSE=test zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer media-libs/sdl-ttf media-libs/sdl-net zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=http://crimson.seul.org/files/crimson-0.5.3.tar.bz2
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6
+_md5_=44f49e27fa1305345c0db056d701f072
diff --git a/metadata/md5-cache/games-strategy/dopewars-1.5.12-r2 b/metadata/md5-cache/games-strategy/dopewars-1.5.12-r2
deleted file mode 100644
index 70294f488ab2..000000000000
--- a/metadata/md5-cache/games-strategy/dopewars-1.5.12-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=ncurses? ( >=sys-libs/ncurses-5.2:0 ) gtk? ( x11-libs/gtk+:2 ) dev-libs/glib:2 nls? ( virtual/libintl ) sdl? ( media-libs/libsdl media-libs/sdl-mixer ) virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=Re-Write of the game Drug Wars
-EAPI=5
-HOMEPAGE=http://dopewars.sourceforge.net/
-IUSE=nls ncurses gtk gnome sdl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=ncurses? ( >=sys-libs/ncurses-5.2:0 ) gtk? ( x11-libs/gtk+:2 ) dev-libs/glib:2 nls? ( virtual/libintl ) sdl? ( media-libs/libsdl media-libs/sdl-mixer ) games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/dopewars/dopewars-1.5.12.tar.gz
-_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 63392afb034aad67f17fa129019eb4d9 games 2bb3ede665927a68ffdb7c41eec7efde ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 885c7d8dd70a58825f3d17e35a3cd1e9 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=037cc86513b639e968f0d0f4cc217e43
diff --git a/metadata/md5-cache/games-strategy/dopewars-1.5.12-r3 b/metadata/md5-cache/games-strategy/dopewars-1.5.12-r3
new file mode 100644
index 000000000000..d5f36b5c0c31
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/dopewars-1.5.12-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=ncurses? ( >=sys-libs/ncurses-5.2:0= ) gtk? ( x11-libs/gtk+:2 ) dev-libs/glib:2 nls? ( virtual/libintl ) sdl? ( media-libs/libsdl media-libs/sdl-mixer ) virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=Re-Write of the game Drug Wars
+EAPI=6
+HOMEPAGE=http://dopewars.sourceforge.net/
+IUSE=nls ncurses gtk gnome sdl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=ncurses? ( >=sys-libs/ncurses-5.2:0= ) gtk? ( x11-libs/gtk+:2 ) dev-libs/glib:2 nls? ( virtual/libintl ) sdl? ( media-libs/libsdl media-libs/sdl-mixer )
+SLOT=0
+SRC_URI=mirror://sourceforge/dopewars/dopewars-1.5.12.tar.gz
+_eclasses_=desktop 2ccd1dd1dd7bfb8795eea024a4f91bb6
+_md5_=d48af901b202d3bfd667757f70352d6a
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 75d35dc070b5..883c926253b4 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 01 May 2018 19:26:14 +0000
+Tue, 01 May 2018 19:46:24 +0000