gentoo resync : 14.07.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 20:58:29 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 20:58:29 +0100
commit: 0cf2f20608308acdf3cb922c3736446bbd8f3388 (patch)
tree: 07815070629c7c11000a7f51ceb8ccbccb49a809 /games-rpg
parent: 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (diff)
215 files changed, 612 insertions, 5525 deletions
diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index 37a901ac4d4a..49d34aa1c4f3 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/adonthell-0.3.5-r2 b/games-rpg/adonthell-0.3.5-r2
new file mode 100644
index 000000000000..1f8ab50e9722
--- /dev/null
+++ b/games-rpg/adonthell-0.3.5-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure 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_python3_7(-),python_single_target_python2_7(+)] media-libs/freetype media-libs/libogg media-libs/libsdl:0[X,video,sound] media-libs/libvorbis media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf sys-libs/zlib nls? ( virtual/libintl ) dev-lang/swig virtual/pkgconfig doc? ( app-doc/doxygen media-gfx/graphviz ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=roleplaying game engine
+EAPI=6
+HOMEPAGE=http://adonthell.nongnu.org/
+IUSE=doc nls 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_python3_7(-),python_single_target_python2_7(+)] media-libs/freetype media-libs/libogg media-libs/libsdl:0[X,video,sound] media-libs/libvorbis media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf sys-libs/zlib nls? ( virtual/libintl )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/adonthell/adonthell-src-0.3.5.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=09f13c61477b8cdf7b1c4017559d55dc
diff --git a/games-rpg/adonthell/Manifest b/games-rpg/adonthell/Manifest
deleted file mode 100644
index 71027757e66c..000000000000
--- a/games-rpg/adonthell/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX adonthell-0.3.5-configure.in.patch 3314 BLAKE2B 8361ee19dae579666d6adc585a6ac3da1b0059fdf70f446c0db9a75ee34df86f26f781624ed736f1b23c598e30359b2a6d4e006fb7da9b619c51ed9ad7518cd9 SHA512 4bd82920dac28c28b96b4ec0e5251c3627a3284ebe6e55eb889e542494ba44b13de8e24210b229e9f37f2259c941743792133d0e9a4b91219b6dc366584d16ed
-AUX adonthell-0.3.5-format.patch 320 BLAKE2B c73d15a7aefc3b15df17740c3db7bfa9eabf0d5e322cf5db040d1a202c8a17b5fed6e485815a797eca3b1a98fce1c05d893c5c61231cb38196d6efacf5a1e2d0 SHA512 901d0cc307b1fbf78708a2d6cd8e6d6284ee66c9ac23bed64b1bd0685bc5adc113a8816bca80c44999d5558e6b6e635bd58c1d1894d8e8631fa97da6309b554f
-AUX adonthell-0.3.5-freetype_pkgconfig.patch 422 BLAKE2B 302dd008224d1e5a48bbd7a450c0b9dfcf533c3e75dfdcf5b170a91c16ad27c23553484ad652dfbbbc623ca7bd40fa55ed690b1a43093b2dd1545dd4bc95c1f8 SHA512 027d2b6ddd9448e305b5a2fea80a345d9af578fe37361501e8653e9647acb4b046887438f8dee7c2c38c371f6b001e3d2fcb0662e61d049876c4425954af4bcf
-AUX adonthell-0.3.5-gcc46.patch 432 BLAKE2B 66706aea9dbcd8827dd3a7054242066a49546e742ff3c2b8edc6262a786230f1269cb1f7f552373af5da95ee3b8136a6fbba490ffeda60ea56236ed992c073d6 SHA512 57d23fc4ef209b6e07b5e9d039db257c564e874914d0b9d9abda5d62608b9f6b32252667fa4638e9dfc7632111cafec5fad634992dce7b76309d177450fb0404
-AUX adonthell-0.3.5-glibc-2.10.patch 792 BLAKE2B 26a724ff84b31a66f6a8ed2dfdc917b220dc1083a017b4a2311c7a91d8ed5b493ca4ba3ac507c2e243980dd18dd1f9fffb434ad38968bb950a3747a5fb16b812 SHA512 6aaf6eced04b777804271dbee082c3ac0d39381e079065ff714bbb66b3ac8be96094e37bfa5e5f986ef91ffe6902f91f8ca7777ae7f3b277c56db37562958aff
-DIST adonthell-src-0.3.5.tar.gz 877439 BLAKE2B 995102c30b5557aaa02ab463a9c609251175b1a590e8bc89b457feead74391dc3756c8c06bba580a5f2b02cbe4cd87f27249364be3355409e3507269fb653094 SHA512 bf970b809b22a8563b196d6817553dd58dc9cb09b3bd99eb99d5c8e6f0828cf59965633acd4fdf7835dd9cb732cbb3290d3663521201ece7569cad2f494fb15d
-EBUILD adonthell-0.3.5-r2.ebuild 1499 BLAKE2B 2c786671b7f8dfdebe8d861f1e665134e3c50395cf36b7e99f4087e6863fddc1a8192401c2ed232b8c82709f512e5144af393219030b9ecc5cb0d3d8f926ff2e SHA512 2b5c22570ee96b127f89fb85640e61b6a46ec7d213fe28a16bfb7ed5f3ea21da18599924d3f2a450f88932c86ffbcc2db4522c6fd6dce5f91c7345c856588dd9
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild b/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild
deleted file mode 100644
index f8dc851093b5..000000000000
--- a/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils python-single-r1
-
-DESCRIPTION="roleplaying game engine"
-HOMEPAGE="http://adonthell.nongnu.org/"
-SRC_URI="https://savannah.nongnu.org/download/${PN}/${PN}-src-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	media-libs/freetype
-	media-libs/libogg
-	media-libs/libsdl:0[X,video,sound]
-	media-libs/libvorbis
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-ttf
-	sys-libs/zlib
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${PN}-${PV/a/}
-
-PATCHES=(
-		"${FILESDIR}"/${P}-configure.in.patch
-		"${FILESDIR}"/${P}-format.patch
-		"${FILESDIR}"/${P}-gcc46.patch
-		"${FILESDIR}"/${P}-glibc-2.10.patch
-		"${FILESDIR}"/${P}-freetype_pkgconfig.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "/AC_PATH_PROGS/s:python:${EPYTHON}:" \
-		configure.in || die "sed failed"
-	rm -f ac{local,include}.m4
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-py-debug \
-		$(use_enable nls) \
-		$(use_enable doc)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	keepdir /usr/share/${PN}/games
-	dodoc AUTHORS ChangeLog FULLSCREEN.howto NEWBIE NEWS README
-}
diff --git a/games-rpg/adonthell/files/adonthell-0.3.5-configure.in.patch b/games-rpg/adonthell/files/adonthell-0.3.5-configure.in.patch
deleted file mode 100644
index 8aaad58894b7..000000000000
--- a/games-rpg/adonthell/files/adonthell-0.3.5-configure.in.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -13,7 +13,7 @@
- AM_INIT_AUTOMAKE([])
- AM_CONFIG_HEADER(config.h)
- 
--CFLAGS="-g -Wall -fno-exceptions"
-+CXXFLAGS="$CXXFLAGS -Wall -fno-exceptions"
- CPPFLAGS=""
- DEFS=""
- 
-@@ -163,10 +163,8 @@
- 
-    dnl Extract the version using Python, check against 2.2+
- 
--   changequote(<<, >>)
--   PYTHON_VERSION=`$PYPACKAGE -c 'import sys ; print (int(sys.version[0]) * 10 + int(sys.version[2]))'`
--   PY_VERSION=`$PYPACKAGE -c 'import sys ; print sys.version[0:3]'`
--   changequote([, ])
-+   PYTHON_VERSION=`$PYPACKAGE -c 'import sys ; print (int(sys.version@<:@0@:>@) * 10 + int(sys.version@<:@2@:>@))'`
-+   PY_VERSION=`$PYPACKAGE -c 'import sys ; print sys.version@<:@0:3@:>@'`
- 
-    if test $PYTHON_VERSION -lt 22; then
- 	echo "Sorry, you need to have Python 2.2+ installed - update your version!"
-@@ -176,9 +174,7 @@
-    dnl Find the Python.h header file
- 
-    AC_MSG_CHECKING(for Python header files)
--   changequote(<<, >>)
--   PYINCLUDE=`$PYPACKAGE -c 'import sys ; print "%s/include/python%s" % (sys.prefix, sys.version[:3])'`
--   changequote([, ])
-+   PYINCLUDE=`$PYPACKAGE -c 'import sys ; print "%s/include/python%s" % (sys.prefix, sys.version@<:@:3@:>@)'`
- 
-    if test -r "$PYINCLUDE/Python.h"; then
-       PY_CFLAGS="-I$PYINCLUDE"
-@@ -191,10 +187,8 @@
-    dnl Find the Python library
-    AC_MSG_CHECKING(for Python library)
-    PYLIB=""
--   changequote(<<, >>)
-    PYPREFIX=`$PYPACKAGE -c 'import sys; print sys.prefix'`
--   PYLIBVER=`$PYPACKAGE -c 'import sys; print sys.version[:3]'`
--   changequote([, ])
-+   PYLIBVER=`$PYPACKAGE -c 'import sys; print sys.version@<:@:3@:>@'`
- 
-    dnl look for a framework build of python first
-    fw=`echo "$PYPREFIX" | sed 's/.*\(Python\.framework\).*/\1/;'`
-@@ -233,19 +227,9 @@
-    fi
-    dnl Get the libraries that python depends on
- 
--   AC_PATH_PROG(haveldd, ldd)
-    AC_MSG_CHECKING(for Python's dependencies)
- 
--   if test x$haveldd != x ; then
--       changequote(<<, >>)
--       py_deps=`ldd $PYPACKAGE | sed 's/\( *.*lib\([^\/]*\)\.so.*=.*$\)/-l\2/p; d' | grep -v 'stdc++'`
--       for py_lib in $py_deps ; do
--         if test "$py_lib" != "-lm" && test "$py_lib" != "-lc" ; then
--            PY_DEPS="$PY_DEPS $py_lib"
--         fi
--      done
--      changequote([, ])
--   fi
-+   PY_DEPS="$PY_DEPS `python-config --libs` -lutil"
- 
-    case $target in
-        *-sun-solaris*)
-@@ -293,11 +277,9 @@
- if test "$P_SWIG" != "no" ; then
-     $P_SWIG -version &> swig.ver
- 
--    changequote(<<, >>)
--    swig_major_ver=`more swig.ver | sed 's/.* \([0-9]*\)\.[0-9]*\.[0-9]*.*/\1/p; d'`
--    swig_minor_ver=`more swig.ver | sed 's/.* [0-9]*\.\([0-9]*\)\.[0-9]*.*/\1/p; d'`
--    swig_micro_ver=`more swig.ver | sed 's/.* [0-9]*\.[0-9]*\.\([0-9]*\).*/\1/p; d'`
--    changequote([, ])
-+    swig_major_ver=`more swig.ver | sed 's/.* \(@<:@0-9@:>@*\)\.@<:@0-9@:>@*\.@<:@0-9@:>@*.*/\1/p; d'`
-+    swig_minor_ver=`more swig.ver | sed 's/.* @<:@0-9@:>@*\.\(@<:@0-9@:>@*\)\.@<:@0-9@:>@*.*/\1/p; d'`
-+    swig_micro_ver=`more swig.ver | sed 's/.* @<:@0-9@:>@*\.@<:@0-9@:>@*\.\(@<:@0-9@:>@*\).*/\1/p; d'`
- 
-     rm -f swig.ver
- 
-@@ -387,7 +369,7 @@
- dnl Generate our compiler arguements
- dnl ********************************
- 
--CXXFLAGS="$CFLAGS $DEFS $INCLUDES"
-+CXXFLAGS="$CXXFLAGS $DEFS $INCLUDES"
- 
- AC_SUBST(CXX) 
- AC_SUBST(CXXFLAGS) 
diff --git a/games-rpg/adonthell/files/adonthell-0.3.5-format.patch b/games-rpg/adonthell/files/adonthell-0.3.5-format.patch
deleted file mode 100644
index fa85d7858109..000000000000
--- a/games-rpg/adonthell/files/adonthell-0.3.5-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/py_adonthell_wrap.cc	2014-10-20 14:21:57.495642785 +0200
-+++ b/src/py_adonthell_wrap.cc	2014-10-20 14:22:35.019293237 +0200
-@@ -867,7 +867,7 @@
-     Py_DECREF(old_str);
-     Py_DECREF(value);
-   } else {
--    PyErr_Format(PyExc_RuntimeError, mesg);
-+    PyErr_Format(PyExc_RuntimeError, "%s", mesg);
-   }
- }
- 
diff --git a/games-rpg/adonthell/files/adonthell-0.3.5-freetype_pkgconfig.patch b/games-rpg/adonthell/files/adonthell-0.3.5-freetype_pkgconfig.patch
deleted file mode 100644
index ff11ffa96f5f..000000000000
--- a/games-rpg/adonthell/files/adonthell-0.3.5-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- adonthell-0.3.5/configure.in
-+++ adonthell-0.3.5/configure.in
-@@ -17,6 +17,8 @@
- CPPFLAGS=""
- DEFS=""
- 
-+PKG_PROG_PKG_CONFIG
-+
- dnl ********************
- dnl Checks for programs.
- dnl ********************
-@@ -144,8 +146,7 @@
- dnl Check for FreeType2
- dnl *******************
- 
--AC_CHECK_FT2(6.0.0,
--    :,
-+PKG_CHECK_MODULES(FT2, freetype2 >= 6.0.0,,
-     AC_MSG_ERROR([*** Freetype version >= 6.0.0 not found!])
- )
- 
diff --git a/games-rpg/adonthell/files/adonthell-0.3.5-gcc46.patch b/games-rpg/adonthell/files/adonthell-0.3.5-gcc46.patch
deleted file mode 100644
index 7e54ec5ee03a..000000000000
--- a/games-rpg/adonthell/files/adonthell-0.3.5-gcc46.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/win_event.cc	2011-04-18 08:24:16.000000000 +0200
-+++ b/src/win_event.cc	2011-04-18 08:25:18.000000000 +0200
-@@ -34,8 +34,9 @@
- 	
- 	    case DESTROY:
- 	    {
-+		Functor0wRet<bool> func0ret;
- 	        set_callback_destroy (
--	        makeFunctor (&Functor0wRet<bool>(), *callback, &py_callback::callback_func0ret));
-+	        makeFunctor (&func0ret, *callback, &py_callback::callback_func0ret));
- 	        break;
- 	    }
- 	
diff --git a/games-rpg/adonthell/files/adonthell-0.3.5-glibc-2.10.patch b/games-rpg/adonthell/files/adonthell-0.3.5-glibc-2.10.patch
deleted file mode 100644
index 7aec808cd5f1..000000000000
--- a/games-rpg/adonthell/files/adonthell-0.3.5-glibc-2.10.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naurp adonthell-0.3.4-orig/src/dialog.cc adonthell-0.3.4/src/dialog.cc
---- adonthell-0.3.4-orig/src/dialog.cc	2005-03-10 12:39:41.000000000 -0600
-+++ adonthell-0.3.4/src/dialog.cc	2009-07-26 15:57:01.410882131 -0600
-@@ -265,7 +265,8 @@ string dialog::scan_string (const char *
- {
-     u_int32 begin, end, len;
-     PyObject *result;
--    char *tmp, *start, *mid, *str = NULL;
-+    const char *start;
-+    char *tmp, *mid, *str = NULL;
-     character *the_player = data::the_player;
-     string newstr (s); 
- 
-@@ -318,7 +319,7 @@ string dialog::scan_string (const char *
- 
-         // Error!
-         cout << "\n*** Error, unknown macro " << start << flush;
--        start[0] = ' ';
-+        newstr[newstr.length () - strlen (start)] = ' ';
-     }
-     
-     // execute python functions
diff --git a/games-rpg/adonthell/metadata.xml b/games-rpg/adonthell/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-rpg/adonthell/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/arx-fatalis-data-1.21-r4 b/games-rpg/arx-fatalis-data-1.21-r4
new file mode 100644
index 000000000000..b88c5d487cf0
--- /dev/null
+++ b/games-rpg/arx-fatalis-data-1.21-r4
@@ -0,0 +1,16 @@
+DEFINED_PHASES=install nofetch pretend setup unpack
+DEPEND=app-arch/innoextract cdinstall? ( app-arch/cabextract )
+DESCRIPTION=Arx Fatalis data files
+EAPI=5
+HOMEPAGE=https://www.arkane-studios.com/uk/arx.php
+IUSE=gog cdinstall
+KEYWORDS=~amd64 ~x86
+LICENSE=cdinstall? ( ArxFatalis-EULA-JoWooD ) gog? ( GOG-EULA )
+PROPERTIES=cdinstall? ( interactive )
+RDEPEND=games-rpg/arx-libertatis
+REQUIRED_USE=^^ ( cdinstall gog )
+RESTRICT=binchecks mirror gog? ( fetch )
+SLOT=0
+SRC_URI=cdinstall? ( http://download.zenimax.com/arxfatalis/patches/1.21/ArxFatalis_1.21_MULTILANG.exe ) gog? ( setup_arx_fatalis_2.0.0.7.exe )
+_eclasses_=cdrom	c64e4c5e9cbf2a58be31431e015a6210	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=58ce7c26e30b70096fffb5dc61ffa0ee
diff --git a/games-rpg/arx-fatalis-data/Manifest b/games-rpg/arx-fatalis-data/Manifest
deleted file mode 100644
index ee19c2b54f9e..000000000000
--- a/games-rpg/arx-fatalis-data/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ArxFatalis_1.21_MULTILANG.exe 9064611 BLAKE2B 42a81491ff470843a80bd6f801a1d8d5b1295603c3b6ec759f545d6fed9530b64ca684b772735f92187eb4eb613b12f68ce7d0491a157123578476b835bb40eb SHA512 885260c6173ee5f2d6d6072bcfd14d085f11b997a0ce45cbdee9a347612e96da13477ef7d71b9c015fb02f2e47bdfb968a2aa89b0c92e9327abbd75b724e47c2
-DIST setup_arx_fatalis_2.0.0.7.exe 525046992 BLAKE2B 558bffc8f4a0096761a9b1c8003b8127480bf03b1198b943dfe3c0bc8c6b9642275f86f5f4e9c6bbc2211bf48e38bebef634b24196b48d1d5520abf75254033f SHA512 08be7870d02ed6da8cedceb652906ea169eedcb44497a4517ef6a42d9db37403b5146b9e5a3a628a465f23088b0c09d958719e05454dcbb5ac12225c32d35942
-EBUILD arx-fatalis-data-1.21-r4.ebuild 2744 BLAKE2B ae9e493f0c251a118593bf5df93604f108ab221deb91d5eee16bf50b54d5b36968b437a3fbbf4dc6c76bf3a66cf971d8a5f9b80c2f6e7b8ad64c4195fb81d4d0 SHA512 38259961c0613a2e7eb349f5fecaf9fdb609070cd8613506945c6fcd41c7fabe0b687055404ef50183561398c51a50a576873e5046282d8ecfb725fc0715b810
-MISC metadata.xml 568 BLAKE2B df7b3692077bfc0e63f920d5bdb61072498ec1de1de6add84d2756ccf384930f2552aa5f5ee50f1732e7030a9d266c6888ee5bf1fe91098e550cef16e50b970d SHA512 a4fd63f6c3ce3eb957694c1a2e61fa13783a09b7072832371c6ac8dd65490d0cc9206467fb88c494a864ae6e1df1d530a52f38b663df9f601feeeba8df5f0555
diff --git a/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r4.ebuild b/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r4.ebuild
deleted file mode 100644
index e8f9d5770890..000000000000
--- a/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CDROM_OPTIONAL="yes"
-inherit eutils cdrom check-reqs
-
-DESCRIPTION="Arx Fatalis data files"
-HOMEPAGE="https://www.arkane-studios.com/uk/arx.php"
-SRC_URI="cdinstall? ( http://download.zenimax.com/arxfatalis/patches/1.21/ArxFatalis_1.21_MULTILANG.exe )
-	gog? ( setup_arx_fatalis_2.0.0.7.exe )"
-
-LICENSE="cdinstall? ( ArxFatalis-EULA-JoWooD ) gog? ( GOG-EULA )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gog"
-REQUIRED_USE="^^ ( cdinstall gog )"
-RESTRICT="binchecks mirror gog? ( fetch )"
-
-RDEPEND="games-rpg/arx-libertatis"
-DEPEND="app-arch/innoextract
-	cdinstall? ( app-arch/cabextract )"
-
-CHECKREQS_DISK_BUILD="621M"
-CHECKREQS_DISK_USR="617M"
-
-S=${WORKDIR}
-
-detect_language() {
-	speech_checksum=$(find '.' -iname "speech.pak" \
-		-exec md5sum -b '{}' \; | sed "s/ .*//g")
-	if [[ -z $speech_checksum ]] ; then
-		speech_checksum=$(find '.' -iname "speech_default.pak" \
-			-exec md5sum -b '{}' \; | sed "s/ .*//g")
-	fi
-
-	# check if the checksum is of a known localisation and set data_lang to
-	# the language string to be used with the 1.21 patch installer
-	case "$speech_checksum" in
-		'4c3fdb1f702700255924afde49081b6e') data_lang='german' ;;
-		# Bundled version of AF included with NVIDIA card
-		'ab8a93161688d793a7c78fbefd7d133e') data_lang='german' ;;
-		'4e8f962d8204bcfd79ce6f3226d6d6de') data_lang='english' ;;
-		'2f88c67ae1537919e69386d27583125b') data_lang='spanish' ;;
-		'4edf9f8c799190590b4cd52cfa5f91b1') data_lang='french' ;;
-		'81f05dea47c52d43f01c9b44dd8fe962') data_lang='italian' ;;
-		'677163bc319cd1e9aa1b53b5fb3e9402') data_lang='russian' ;;
-		'') eerror "speech*.pak not found"
-			die "speech*.pak not found" ;;
-		*) eerror "unsupported data language - speech*.pak checksum:" \
-		        "$speech_checksum" \
-				"please file a gentoo bug"
-			die "unsupported data language, file a gentoo bug" ;;
-	esac
-}
-
-pkg_nofetch() {
-	einfo "Please download ${A} from your GOG.com account after buying Arx Fatalis"
-	einfo "and put it into ${DISTDIR}."
-}
-
-src_unpack() {
-	local data_lang
-
-	if use cdinstall ; then
-		cdrom_get_cds bin/Arx.ttf
-		find "${CDROM_ROOT}" -iname "setup*.cab" -exec cabextract '{}' \;
-		detect_language
-	else
-		# gog only offers english
-		data_lang="english"
-	fi
-
-	einfo "Data language: $data_lang"
-	innoextract --lowercase --language=${data_lang} \
-		"${DISTDIR}"/${A} || die
-}
-
-src_install() {
-	insinto /usr/share/arx
-	doins -r app/{graph,misc}
-	find . -iname "*.pak" -exec doins '{}' \;
-
-	dodoc app/{manual,map}.pdf
-
-	# convert to lowercase
-	cd "${D}"
-	find . -type f -exec sh -c 'echo "${1}"
-	lower="`echo "${1}" | tr [:upper:] [:lower:]`"
-	[ "${1}" = "${lower}" ] || mv "${1}" "${lower}"' - {} \;
-}
diff --git a/games-rpg/arx-fatalis-data/metadata.xml b/games-rpg/arx-fatalis-data/metadata.xml
deleted file mode 100644
index 5890880ff15c..000000000000
--- a/games-rpg/arx-fatalis-data/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>daniel@constexpr.org</email>
-		<name>Daniel Scharrer</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="gog">Extract the data from the GOG.com installer.</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-rpg/arx-fatalis-demo-0 b/games-rpg/arx-fatalis-demo-0
new file mode 100644
index 000000000000..9ca063371f37
--- /dev/null
+++ b/games-rpg/arx-fatalis-demo-0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
+DEPEND=app-arch/cabextract app-arch/unzip
+DESCRIPTION=Arx Fatalis demo
+EAPI=4
+HOMEPAGE=https://www.arkane-studios.com/uk/arx.php
+KEYWORDS=~amd64 ~x86
+LICENSE=ArxFatalisDemo
+RDEPEND=games-rpg/arx-libertatis games-misc/games-envd
+RESTRICT=fetch
+SLOT=0
+SRC_URI=arx_demo_english.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c4e62dc54be25cd597cd6cabb75b6dcd
diff --git a/games-rpg/arx-fatalis-demo/Manifest b/games-rpg/arx-fatalis-demo/Manifest
deleted file mode 100644
index c39d62a34cdc..000000000000
--- a/games-rpg/arx-fatalis-demo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST arx_demo_english.zip 160545354 BLAKE2B 2693bdd2546c8788eb8c9fc303065f880c3995cfa1d75ca613b8ebb32238a3852dd7eeb20731f7c685521b669c47df45bcf22842772227be5cc3483ec3869c77 SHA512 0cbf0d6da1a373ed29edc49c65ed431117c868ec7bcab04166abd59f5d799460faec506baf191c83fa7c61372888009abb260d8a50e28507a5ec8ab7913a9ad7
-EBUILD arx-fatalis-demo-0.ebuild 1289 BLAKE2B 0936a3355f2ae853783df034db76246b0a953b6315b1e46b173c9337d00609111eccdf43094ec7741444c9e74b32494f94ad1c9e9edc2182454ae738464af955 SHA512 99a20d0f550aff284c062c5c7da2444ec9b713fd0ee610e406d55f9d8eee7f0b2857ddc16e3515a7143daf0538d69b53045044e1695c2ebc26b5833f676a73c5
-MISC metadata.xml 481 BLAKE2B 3200a8ff8937163cf8132a3387d21516b532df01bddcdd377eaf84b3c43ba54b766f2c8def173b2ef4bc32d660b022282295207918809437d3daa85d28b3bf7a SHA512 25957616a3defb79f4ffe4ea925d7eea8f121995bbef149ad8176735eba4597b05d0467457834387ebab951a7b205ff7a1dfd5b272de36aa2ab783553d649e18
diff --git a/games-rpg/arx-fatalis-demo/arx-fatalis-demo-0.ebuild b/games-rpg/arx-fatalis-demo/arx-fatalis-demo-0.ebuild
deleted file mode 100644
index b3c07e2abd36..000000000000
--- a/games-rpg/arx-fatalis-demo/arx-fatalis-demo-0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils games
-
-DESCRIPTION="Arx Fatalis demo"
-HOMEPAGE="https://www.arkane-studios.com/uk/arx.php"
-SRC_URI="arx_demo_english.zip"
-
-LICENSE="ArxFatalisDemo"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="fetch"
-
-RDEPEND="games-rpg/arx-libertatis"
-DEPEND="app-arch/cabextract
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-pkg_nofetch() {
-	einfo "Please find and download ${SRC_URI} and put it into ${DISTDIR}."
-	einfo "There is a list of possible download locations at"
-	einfo "http://wiki.arx-libertatis.org/Getting_the_game_data#Demo"
-}
-
-src_unpack() {
-	unpack ${A}
-	cabextract Setup1.cab || die "cabextract failed"
-	cabextract Setup2.cab || die "cabextract failed"
-	cabextract Setup3.cab || die "cabextract failed"
-}
-
-src_install() {
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r *.pak bin/*.pak
-	insinto "${GAMES_DATADIR}/${PN}/misc"
-	doins bin/Logo.bmp bin/Arx.ttf
-
-	# convert to lowercase
-	cd "${D}"
-	find . -type f -exec sh -c 'echo "${1}"
-	lower="`echo "${1}" | tr [:upper:] [:lower:]`"
-	[ "${1}" = "${lower}" ] || mv "${1}" "${lower}"' - {} \;
-
-	make_desktop_entry "arx --data-dir=${GAMES_DATADIR}/arx-fatalis-demo" \
-		"Arx Fatalis Demo" arx-libertatis
-
-	prepgamesdirs
-}
diff --git a/games-rpg/arx-fatalis-demo/metadata.xml b/games-rpg/arx-fatalis-demo/metadata.xml
deleted file mode 100644
index a1d60835a707..000000000000
--- a/games-rpg/arx-fatalis-demo/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>daniel@constexpr.org</email>
-		<name>Daniel Scharrer</name>
-	</maintainer>
-<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/arx-libertatis-1.1.2-r1 b/games-rpg/arx-libertatis-1.1.2-r1
new file mode 100644
index 000000000000..0b1442c577da
--- /dev/null
+++ b/games-rpg/arx-libertatis-1.1.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=media-libs/freetype media-libs/libsdl[X,video,opengl] media-libs/openal sys-libs/zlib virtual/opengl crash-reporter? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 ) !static? ( media-libs/glew ) dev-libs/boost virtual/pkgconfig static? ( media-libs/glew[static-libs] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=Cross-platform port of Arx Fatalis, a first-person role-playing game
+EAPI=5
+HOMEPAGE=http://arx-libertatis.org/
+IUSE=c++0x debug +unity-build crash-reporter static tools
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=media-libs/freetype media-libs/libsdl[X,video,opengl] media-libs/openal sys-libs/zlib virtual/opengl crash-reporter? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 ) !static? ( media-libs/glew ) crash-reporter? ( sys-devel/gdb ) games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://sourceforge/arx/arx-libertatis-1.1.2/arx-libertatis-1.1.2.tar.xz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0c5ab8bdff03c9405726e7029f35a503
diff --git a/games-rpg/arx-libertatis/Manifest b/games-rpg/arx-libertatis/Manifest
deleted file mode 100644
index bab50e20be0b..000000000000
--- a/games-rpg/arx-libertatis/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX arx-libertatis-1.1.2-cmake-3.5.patch 888 BLAKE2B 4294247d6ee5f24c7619e9b4cdfafa3efa5d5caf89d5c639a7083b4d408debfa985b95985eb0adfa680d4e2dd49f5afce0f295219eb31fe3762eca8487bff223 SHA512 c1da4981c407bc94ce87b520e2b6288fd6bac437a14dc3b54e8c2c7b01cbda0938b6995581938a2381d1f035ace95df58f3d894e8f7c6070986a5bc43f5e54c2
-DIST arx-libertatis-1.1.2.tar.xz 970608 BLAKE2B 1d4cef400db8223a930d1ff7b3bffbdcd46e47836d99f0c4545ad1bfc575b2b0ed972c9962272c043830be75a54be7992a70429d2692e5811865786370c35d6d SHA512 d4cb8187e7f63934408e38a51a44b7da03c8628820d43139507ff97ebd463b9cd7baf6cc4e85a3d4191d6e5f56850d77d07cfffc33d8f5a51378dfb41f719fb8
-EBUILD arx-libertatis-1.1.2-r1.ebuild 2475 BLAKE2B d97ee646fc453258b83ff90305887e429321cb85c41e8b8b3690afe344a85cb22b9d2cf846d36f30e7088073b1422d74af75ee0e952ee9dd988aa88a395b5797 SHA512 5bd56b938de00f8864194a3575bc7a43afe81315e2728f0e138ccbf273d7a2acafd7f035262c1dbec0912f28b34c542b4841014c360e5073e24be565f0ed51dd
-MISC metadata.xml 2564 BLAKE2B 13a668c7bbdb5a7184dbc3334a49d7e342c6400c39af01945ec9fb25ce001faa5267ef874237bafdca399acd38e322ea49f0fcf2a1b5c5eb4089a5be2decb2e3 SHA512 c34718413d4e273abffb224a307075529a3845ac3ceeef7bd38157e16ba0b222c77a2d4b7de2508901a6e0c6602462d907e269d8b83f1554639e97e3dc7133cb
diff --git a/games-rpg/arx-libertatis/arx-libertatis-1.1.2-r1.ebuild b/games-rpg/arx-libertatis/arx-libertatis-1.1.2-r1.ebuild
deleted file mode 100644
index 6d505c464f01..000000000000
--- a/games-rpg/arx-libertatis/arx-libertatis-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CMAKE_WARN_UNUSED_CLI=yes
-inherit eutils cmake-utils gnome2-utils games
-
-DESCRIPTION="Cross-platform port of Arx Fatalis, a first-person role-playing game"
-HOMEPAGE="http://arx-libertatis.org/"
-SRC_URI="mirror://sourceforge/arx/${P}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="c++0x debug +unity-build crash-reporter static tools"
-
-COMMON_DEPEND="
-	media-libs/freetype
-	media-libs/libsdl[X,video,opengl]
-	media-libs/openal
-	sys-libs/zlib
-	virtual/opengl
-	crash-reporter? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtwidgets:5
-	)
-	!static? ( media-libs/glew )"
-RDEPEND="${COMMON_DEPEND}
-	crash-reporter? ( sys-devel/gdb )"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	virtual/pkgconfig
-	static? ( media-libs/glew[static-libs] )"
-
-DOCS=( README.md AUTHORS CHANGELOG )
-
-PATCHES=( "${FILESDIR}"/${P}-cmake-3.5.patch )
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# editor does not build
-	local mycmakeargs=(
-		$(cmake-utils_use_build crash-reporter CRASHREPORTER)
-		-DBUILD_EDITOR=OFF
-		$(cmake-utils_use_build tools TOOLS)
-		-DCMAKE_INSTALL_DATAROOTDIR="${GAMES_DATADIR_BASE}"
-		-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
-		$(cmake-utils_use debug DEBUG)
-		-DGAMESBINDIR="${GAMES_BINDIR}"
-		-DICONDIR=/usr/share/icons/hicolor/128x128/apps
-		-DINSTALL_SCRIPTS=ON
-		-DSET_OPTIMIZATION_FLAGS=OFF
-		-DSTRICT_USE=ON
-		$(cmake-utils_use unity-build UNITY_BUILD)
-		$(cmake-utils_use_use c++0x CXX11)
-		-DUSE_NATIVE_FS=ON
-		-DUSE_OPENAL=ON
-		-DUSE_OPENGL=ON
-		-DUSE_SDL=ON
-		$(usex crash-reporter "-DUSE_QT5=ON" "")
-		$(cmake-utils_use_use static STATIC_LIBS)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	elog "optional dependencies:"
-	elog "  games-rpg/arx-fatalis-data (from CD or GOG)"
-	elog "  games-rpg/arx-fatalis-demo (free demo)"
-	elog
-	elog "This package only installs the game binary."
-	elog "You need the demo or full game data. Also see:"
-	elog "http://wiki.arx-libertatis.org/Getting_the_game_data"
-	elog
-	elog "If you have already installed the game or use the STEAM version,"
-	elog "run \"${GAMES_BINDIR}/arx-install-data\""
-
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/arx-libertatis/files/arx-libertatis-1.1.2-cmake-3.5.patch b/games-rpg/arx-libertatis/files/arx-libertatis-1.1.2-cmake-3.5.patch
deleted file mode 100644
index d085afafe393..000000000000
--- a/games-rpg/arx-libertatis/files/arx-libertatis-1.1.2-cmake-3.5.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c4262bc600dc01d3ddbacc7811132b29ea46ad3b Mon Sep 17 00:00:00 2001
-From: Daniel Scharrer <daniel@constexpr.org>
-Date: Thu, 24 Mar 2016 22:47:44 +0100
-Subject: [PATCH] CMake: Disable variable expansion for quoted strings in if()
-
-This makes the build system more robust against stray variables
-coming from included CMake scripts provided by the system.
-
-Fixes build with CMake 3.5.
-
-This has been fixed in master with commit 60e43c.
----
- CMakeLists.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 93f1ee3..8347544 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -13,6 +13,11 @@ else()
- 	cmake_minimum_required(VERSION 2.8)
- endif()
- 
-+if(POLICY CMP0054)
-+	# CMake 3.1+: Only interpret if() arguments as variables or keywords when unquoted.
-+	cmake_policy(SET CMP0054 NEW)
-+endif()
-+
- 
- # Define configuration options
- 
--- 
-2.7.4
-
diff --git a/games-rpg/arx-libertatis/metadata.xml b/games-rpg/arx-libertatis/metadata.xml
deleted file mode 100644
index 36eb9d054450..000000000000
--- a/games-rpg/arx-libertatis/metadata.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="c++0x">Build ROOT using the C++11 standard.</flag>
-		<flag name="crash-reporter">Build a <pkg>dev-qt/qtgui</pkg>-based
-			tool that allows to submit crash information to the upstream
-			backtracker.</flag>
-		<flag name="debug">Enable asserts and debug logging.</flag>
-		<flag name="static">Link libraries statically, currently only
-			<pkg>media-libs/glew</pkg></flag>
-		<flag name="tools">Build tools that can extract the game's data and
-			save files.</flag>
-		<flag name="unity-build">Build everything in one big source file,
-			allowing for faster build times and better optimizations at
-			the cost of higher memory usage.</flag>
-	</use>
-	<longdescription lang="en">
-		Arx Libertatis is a cross-platform, open source port of
-		Arx Fatalis, a 2002 first-person role-playing game/dungeon crawler
-		developed by Arkane Studios.
-		Arx Fatalis features crafting, melee and ranged combat, as well
-		as a unique casting system where the player draws runes in real
-		time to effect the desired spell.
-		Arx Libertatis updates and improves Arx Fatalis by supporting
-		modern systems, porting the game to new systems as well as
-		eliminating bugs and limitations.
-	</longdescription>
-	<longdescription lang="de">
-		Arx Libertatis ist eine cross-platform, open source Portierung
-		von Arx Fatalis, ein Rollenspiel/Dungeon Crawler in Ego-Perspektive
-		aus dem Jahr 2002, entwickelt von Arkane Studios.
-		Arx Fatalist umfasst das Herstellen von Gegenständen,
-		Nah- und Fernkampf, sowie ein einzigartiges Magiesystem,
-		in dem der Spieler Runen in Echtzeit zeichnen muss, um einen
-		Zauberspruch auszusprechen.
-		Arx Libertatis aktualisiert und verbessert Arx Fatalis, indem
-		es moderne Systeme unterstützt, das Spiel auch zu neuen Systemen
-		portiert und bugs und Beschränkungen behebt.
-	</longdescription>
-	<upstream>
-		<maintainer status="active">
-			<email>daniel@constexpr.org</email>
-			<name>Daniel Scharrer</name>
-		</maintainer>
-		<bugs-to>https://bugs.arx-libertatis.org/</bugs-to>
-		<changelog>
-			http://wiki.arx-libertatis.org/Changelog
-		</changelog>
-		<doc lang="en">http://wiki.arx-libertatis.org/</doc>
-		<remote-id type="github">arx/ArxLibertatis</remote-id>
-		<remote-id type="sourceforge">arx</remote-id>
-		<remote-id type="freecode">arx-libertatis</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-rpg/avadon-1.0.4_p1331768904 b/games-rpg/avadon-1.0.4_p1331768904
new file mode 100644
index 000000000000..b636197d7302
--- /dev/null
+++ b/games-rpg/avadon-1.0.4_p1331768904
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst unpack
+DEPEND=app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=Epic fantasy role-playing adventure in an enormous and unique world
+EAPI=6
+HOMEPAGE=https://www.spiderwebsoftware.com/avadon
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=media-libs/libsdl[opengl,video] media-libs/openal
+RESTRICT=fetch bindist
+SLOT=0
+SRC_URI=avadon-linux-1331768904-bin.txt
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=44169fc12698c64934c3591e9094a3a3
diff --git a/games-rpg/avadon/Manifest b/games-rpg/avadon/Manifest
deleted file mode 100644
index 439eefa10167..000000000000
--- a/games-rpg/avadon/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST avadon-linux-1331768904-bin.txt 109767395 BLAKE2B ba89e4cc9d7374b4c140f36860bb3e2682bc8639503500d0371a7783c0ce7fc1b40ac2c552285f03d564ecae21d5f887f822e6785a30034fdeaba9d0837ee6eb SHA512 7c1acbb1ce3bbfb33052454c9b93060fa97b13fbf4202ee2bb0d70fb59423efc05dfe0bca07cce1e711af9f2757b79c590f237dea5f92aa11aa5979c35d018a7
-EBUILD avadon-1.0.4_p1331768904.ebuild 1237 BLAKE2B 9b10a153d3e102359b91971cfbb4696ca89f10d867c746154c92ca02e28afb4e550fb3c66cc714e0423cf9ab67fa9e301043408dee520e2e337327221bdaa216 SHA512 a43fd6f3b37e3decf7c510e160b2a6fbe43f9a74bc0abe3bc04f808530a7f962d890ae64263e6196c528f3c99875a53e9168c555ab3b6c2aaa37531ea54ff2c7
-MISC metadata.xml 252 BLAKE2B 1b951d2e730631865ae5f379b19ed9de2c8adf2f2786da3f75d0871d967374198ddd9106433f388bdc7050c37063fb28cda4320ae7bdc9a03854838693d9f952 SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638
diff --git a/games-rpg/avadon/avadon-1.0.4_p1331768904.ebuild b/games-rpg/avadon/avadon-1.0.4_p1331768904.ebuild
deleted file mode 100644
index 4a9ff4f3cecd..000000000000
--- a/games-rpg/avadon/avadon-1.0.4_p1331768904.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils unpacker
-
-DESCRIPTION="Epic fantasy role-playing adventure in an enormous and unique world"
-HOMEPAGE="https://www.spiderwebsoftware.com/avadon"
-SRC_URI="avadon-linux-${PV#*_p}-bin.txt" # .txt is odd but that's what Humble Bundle sends.
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="fetch bindist"
-
-QA_PREBUILT="opt/${PN}/Avadon"
-
-RDEPEND="media-libs/libsdl[opengl,video]
-	media-libs/openal"
-
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/data"
-
-pkg_nofetch() {
-	einfo "Please buy and download ${SRC_URI} from:"
-	einfo "  ${HOMEPAGE}"
-	einfo "and move it to your distfiles directory."
-}
-
-src_unpack() {
-	unpack_zip ${A}
-}
-
-src_install() {
-	local dir=/opt/${PN}
-
-	insinto "${dir}"
-	doins -r "avadon files" icon.bmp
-
-	exeinto "${dir}"
-	newexe Avadon-$(usex amd64 amd64 x86) Avadon
-	dosym "../..${dir}"/Avadon /usr/bin/${PN}
-
-	newicon -s 512 Avadon.png ${PN}.png
-	make_desktop_entry ${PN} "Avadon: The Black Fortress"
-
-	dodoc README-linux.txt
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/games-rpg/avadon/metadata.xml b/games-rpg/avadon/metadata.xml
deleted file mode 100644
index 3c186688e265..000000000000
--- a/games-rpg/avadon/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/baldurs-gate-ee-2.3.67.3-r1 b/games-rpg/baldurs-gate-ee-2.3.67.3-r1
new file mode 100644
index 000000000000..799d561b1279
--- /dev/null
+++ b/games-rpg/baldurs-gate-ee-2.3.67.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Baldur's Gate: Enhanced Edition
+EAPI=6
+HOMEPAGE=https://www.baldursgate.com/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GOG-EULA
+RDEPEND=dev-libs/expat[abi_x86_32(-)] dev-libs/json-c[abi_x86_32(-)] dev-libs/openssl:0[abi_x86_32(-)] media-libs/openal[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)]
+RESTRICT=bindist fetch
+SLOT=0
+SRC_URI=gog_baldur_s_gate_enhanced_edition_2.5.0.9.sh
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=950b4ff1dc9efd8e56a582ed75ff0daf
diff --git a/games-rpg/baldurs-gate-ee/Manifest b/games-rpg/baldurs-gate-ee/Manifest
deleted file mode 100644
index 6cf7823e0ea6..000000000000
--- a/games-rpg/baldurs-gate-ee/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gog_baldur_s_gate_enhanced_edition_2.5.0.9.sh 2877124067 BLAKE2B 244e93ae089703c9fae3dcfcad4fb9c1eb32695e7288f7a05b3f2996887f90d6912e745e9b47a93ba45ee3ddda8363e69d22e62c57258ee54c24c47f07b2f619 SHA512 56d4796a959658f29cabef6e7339db5ba9fa792d9fd899ebc375c9b5cf94305b6d11c21d41a8809fcb1cbe38ecb4bc7152158ef19c87395374ab9060f48756a6
-EBUILD baldurs-gate-ee-2.3.67.3-r1.ebuild 1370 BLAKE2B c250d9d87cf58a4906b8a6933d32ace06730fdf5e8b092baac03bfcfb9e688216723b7633818d8977b94575d1a86f751e5d30b77d055e79ecf8da7f620981aa7 SHA512 853b672a76099fd98ad78d368ab9c484ad39c4e323d1a893c7cd433daa8c6e0562c454e38dcea7fb852c4036509a2af1be03feb716a2b9f36a460f0414b06915
-MISC metadata.xml 784 BLAKE2B e6527c6d760208259a31037ffb51533b2fa07d40be2f62bd3c08c63acf1418841abf657b678cfff42650430f75b1430a5f9bcf849e8688af57b853fa911aebb1 SHA512 d92e2613876c7c8840f640ba778f1cbdb62d2e65caf38a1e931bd7ffe6ab3bcacf6093155b01036f1cb3f18583842761242105019fbf1e72df34e096d7f5bbde
diff --git a/games-rpg/baldurs-gate-ee/baldurs-gate-ee-2.3.67.3-r1.ebuild b/games-rpg/baldurs-gate-ee/baldurs-gate-ee-2.3.67.3-r1.ebuild
deleted file mode 100644
index 4e3bf5f6ec9a..000000000000
--- a/games-rpg/baldurs-gate-ee/baldurs-gate-ee-2.3.67.3-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils unpacker
-
-DESCRIPTION="Baldur's Gate: Enhanced Edition"
-HOMEPAGE="https://www.baldursgate.com/"
-SRC_URI="gog_baldur_s_gate_enhanced_edition_2.5.0.9.sh"
-
-LICENSE="GOG-EULA"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="bindist fetch"
-
-DEPEND="app-arch/unzip"
-RDEPEND="dev-libs/expat[abi_x86_32(-)]
-	dev-libs/json-c[abi_x86_32(-)]
-	dev-libs/openssl:0[abi_x86_32(-)]
-	media-libs/openal[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]"
-
-QA_PREBUILT="/opt/${PN}/BaldursGate"
-
-S="${WORKDIR}/data/noarch"
-
-pkg_nofetch() {
-	einfo "Please buy and download \"${SRC_URI}\" from"
-	einfo "https://www.gog.com/game/baldurs_gate_enhanced_edition"
-	einfo "and copy it to \"${DISTDIR}\""
-}
-
-src_unpack() {
-	unpack_zip "${DISTDIR}/${SRC_URI}"
-}
-
-src_install() {
-	local ABI="x86"
-	local dir="/opt/${PN}"
-
-	dodoc -r "game/Manuals/."
-	rm -r "game/Manuals" || die "rm failed"
-
-	insinto "${dir}"
-	doins -r "game/."
-	fperms +x "${dir}/BaldursGate"
-
-	dodir "${dir}/lib"
-	dosym "../../../usr/$(get_libdir)/libjson-c.so" "${dir}/lib/libjson.so.0"
-
-	newicon "support/icon.png" "${PN}.png"
-	make_wrapper ${PN} "./BaldursGate" "${dir}" "${dir}/lib"
-	make_desktop_entry "${PN}" "Baldur's Gate: Enhanced Edition" "${PN}" "Game;RolePlaying"
-}
diff --git a/games-rpg/baldurs-gate-ee/metadata.xml b/games-rpg/baldurs-gate-ee/metadata.xml
deleted file mode 100644
index 09145c6cdfdd..000000000000
--- a/games-rpg/baldurs-gate-ee/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>sir.suriv@gmail.com</email>
-		<name>Diogo Pereira</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription lang="en">
-		Baldur's Gate: Enhanced Edition is a remake of the role-playing video
-		game Baldur's Gate. It takes place in the Forgotten Realms, a high
-		fantasy campaign setting, using a modified version of the Advanced
-		Dungeons &amp; Dragons (AD&amp;D) 2nd edition rules.
-	</longdescription>
-	<upstream>
-		<bugs-to>https://support.baldursgate.com/projects/bg-ee-bugs/issues</bugs-to>
-	</upstream>
-</pkgmetadata>
diff --git a/games-rpg/bass-1.3 b/games-rpg/bass-1.3
new file mode 100644
index 000000000000..5e5e468be682
--- /dev/null
+++ b/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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a1e0c4752dae783a1f46b73b33ab9125
diff --git a/games-rpg/bass/Manifest b/games-rpg/bass/Manifest
deleted file mode 100644
index 41e1a22e01a4..000000000000
--- a/games-rpg/bass/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX scummvmGetLang.sh 358 BLAKE2B 9d3490611c16757979cc57901d178e616e9739cfc80bad26a9b2150610c3555159854e8b42446f570e33accd26f215b1b5be9b05f7eca1d37b64fb6703a2bfb5 SHA512 9fc219a8096f0aa0182d752fb362796bacd3837b7368e1132c570d28757f316393163088b790b386211cf9a17cf21302cba0812940afd927e0123b10ad2cd23d
-DIST BASS-Floppy-1.3.zip 7675813 BLAKE2B dbe6e110c4901ba6f1b055208b796b71ef1ab879a0266273765c8f9544065715e0535f41ecaa1cde7e02499ac5e90624eb5a42d1b82dbeee52ddba90bd1dcdd9 SHA512 d220f84448b50e1464329e204f876acc4a9eda24b319577ed74aec8e1a0316e2df268f8768ac9267b90a29a857b010bdae71e2f3c77428987f299bec3dc1ce15
-DIST bass.png 27613 BLAKE2B 1bc440055d4cfd3115e3b2768f5b88fa49eaed3f3d957b436e1e0df236fb0bc968ced18962ff9833962a1ab8a8b544e57ea10c679eb6d434c633f27956fdc489 SHA512 c0f62257f025970f51f32a7f3284cf117a091d40bbcd6c7503e8f0e8e98954cf96e35a04a4e633a04a721ff01beb7a6e0f4c883e286e477c3e065d411db4c87e
-EBUILD bass-1.3.ebuild 881 BLAKE2B 3c2d8e1087f23b318561942517baf20c741af2a0967ebf6c8077a80f463f7967a7563dab361a0e7463a14e118f163ff3b06934e8630b077137fb1f5e23071bcf SHA512 ef3ec8e97db581584c41ee1289afbfec81bc1be6931d51b4d2d98ef0d3afafb2ad2afc4f14ce4ac1220ae30274b771f9d8bbf8ad2fd82a8f2f37be17c96c78b2
-MISC metadata.xml 330 BLAKE2B 4f070e6c8bc4c2f6b4efb4f0eb84ea861773fba85acda1f4dec223a6594e2cdf4ac90c895a98819e2fab2ba2cd30081aee591554d2e932025a9da6d3c16a275b SHA512 4541c93daab84bd6d0764adccf44bb4986ba02303e731b5b9a7a8060bb88a32c1cef91e2b2910e15915b67cf3ea2b5f31b4e637909d1d0b7c3b627f1134206dc
diff --git a/games-rpg/bass/bass-1.3.ebuild b/games-rpg/bass/bass-1.3.ebuild
deleted file mode 100644
index 4ca16f0ae141..000000000000
--- a/games-rpg/bass/bass-1.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop eutils
-
-DESCRIPTION="Beneath a Steel Sky: a SciFi thriller set in a bleak vision of the future"
-#HOMEPAGE="http://www.revgames.com/_display.php?id=16"
-HOMEPAGE="https://en.wikipedia.org/wiki/Beneath_a_Steel_Sky"
-SRC_URI="http://downloads.sourceforge.net/scummvm/BASS-Floppy-${PV}.zip
-	mirror://gentoo/${PN}.png"
-
-LICENSE="bass"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=games-engines/scummvm-0.5.0"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
-
-S="${WORKDIR}/"
-
-src_install() {
-	make_wrapper bass "scummvm -f -p \"/usr/share/${PN}\" -q\$(scummvmGetLang.sh) sky" .
-	dobin "${FILESDIR}"/scummvmGetLang.sh
-	insinto /usr/share/${PN}
-	doins sky.*
-	dodoc readme.txt
-	doicon "${DISTDIR}"/${PN}.png
-	make_desktop_entry ${PN} "Beneath a Steel Sky"
-}
diff --git a/games-rpg/bass/files/scummvmGetLang.sh b/games-rpg/bass/files/scummvmGetLang.sh
deleted file mode 100644
index b313cc7d81da..000000000000
--- a/games-rpg/bass/files/scummvmGetLang.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-tmplang="$LANG"
-test "$LC_MESSAGES" != "" && tmplang="$LC_MESSAGES"
-test "$LC_ALL"      != "" && tmplang="$LC_ALL"
-test "$LANGUAGE"    != "" && tmplang="$LANGUAGE"
-
-lang=`echo $tmplang|cut -d "_" -f 1`
-
-case $lang in
-  en)
-    lang=gb
-    echo $tmplang | grep en_US &>/dev/null && lang=en
-  ;;
-  de|fr|it|pt|es|se)
-  ;;
-  *)
-    lang=gb
-  ;;
-esac
-echo $lang
diff --git a/games-rpg/bass/metadata.xml b/games-rpg/bass/metadata.xml
deleted file mode 100644
index 801e2cc48963..000000000000
--- a/games-rpg/bass/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">scummvm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-rpg/bastion-20120620-r1 b/games-rpg/bastion-20120620-r1
new file mode 100644
index 000000000000..bafa8b7306ac
--- /dev/null
+++ b/games-rpg/bastion-20120620-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=An original action role-playing game set in a lush imaginative world
+EAPI=5
+HOMEPAGE=https://supergiantgames.com/games/bastion/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=virtual/opengl media-libs/freealut media-libs/openal media-libs/sdl-gfx media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-net media-libs/sdl-ttf media-libs/smpeg x11-libs/libX11 x11-libs/libXft games-misc/games-envd
+RESTRICT=bindist fetch splitdebug
+SLOT=0
+SRC_URI=Bastion-HIB-2012-06-20.sh
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d4d4d2da63f503b01a3c5b043bedab20
diff --git a/games-rpg/bastion/Manifest b/games-rpg/bastion/Manifest
deleted file mode 100644
index ee0f5e42375c..000000000000
--- a/games-rpg/bastion/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Bastion-HIB-2012-06-20.sh 1055161705 BLAKE2B 615ff88a3fab37aa70e60d1e692cb0b6a1e03dd90bf6294c65a134cbceb4d59675c341c4fca0b4e08ebda24007df727f09c31adfbe2f5f0e97d8e3b9010af4e1 SHA512 e81b5dfa6f61ec2b35b30693c156a612cd3242c2169f4414b6d66839b7d8cc2e6ea8776f55baae67fa8131ee96bc221e1a15004410612eecaa9f7204dcc673ad
-EBUILD bastion-20120620-r1.ebuild 1739 BLAKE2B 9e9c1c21053d41be2d24e03a363431f5ae7763012356f8e0ab872337c1be3ede525c859f27630fc88e5abfa9abb6f52248009e2709f5c1661dffd6f4aa40ae22 SHA512 e756d62c89e54f8f59f4a14662dc6c996fc97276115bd93bf2955b43062eeb0946151b415d44c13a1df34f05230960d039a8864ed1dd45e6edd311fedcc5b93e
-MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/bastion/bastion-20120620-r1.ebuild b/games-rpg/bastion/bastion-20120620-r1.ebuild
deleted file mode 100644
index 4cb7738a2de0..000000000000
--- a/games-rpg/bastion/bastion-20120620-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils gnome2-utils check-reqs unpacker games
-
-TIMESTAMP=${PV:0:4}-${PV:4:2}-${PV:6:2}
-DESCRIPTION="An original action role-playing game set in a lush imaginative world"
-HOMEPAGE="https://supergiantgames.com/games/bastion/"
-SRC_URI="Bastion-HIB-${TIMESTAMP}.sh"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="bindist fetch splitdebug"
-
-MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${MYGAMEDIR#/}/Bastion.bin*
-	${MYGAMEDIR#/}/lib/*
-	${MYGAMEDIR#/}/lib64/*"
-
-# mono shit: vague dependencies
-RDEPEND="
-	virtual/opengl
-	media-libs/freealut
-	media-libs/openal
-	media-libs/sdl-gfx
-	media-libs/sdl-image
-	media-libs/sdl-mixer
-	media-libs/sdl-net
-	media-libs/sdl-ttf
-	media-libs/smpeg
-	x11-libs/libX11
-	x11-libs/libXft"
-
-CHECKREQS_DISK_BUILD="2400M"
-
-pkg_nofetch() {
-	einfo "Please buy & download ${SRC_URI} from:"
-	einfo "  ${HOMEPAGE}"
-	einfo "and move it to ${DISTDIR}"
-}
-
-src_unpack() {
-	myarch=$(usex amd64 "x86_64" "x86")
-
-	unpack_makeself
-
-	mv instarchive_all{,.tar.lzma} || die
-	mv instarchive_linux_${myarch}{,.tar.lzma} || die
-
-	mkdir ${P} || die
-	cd ${P} || die
-
-	unpack ./../instarchive_{all,linux_${myarch}}.tar.lzma
-}
-
-src_install() {
-	insinto "${MYGAMEDIR}"
-	doins -r *
-
-	newicon -s 256 Bastion.png ${PN}.png
-	make_desktop_entry ${PN}
-	games_make_wrapper ${PN} "./Bastion.bin.${myarch}" "${MYGAMEDIR}" "${MYGAMEDIR}/$(get_libdir)"
-
-	fperms +x "${MYGAMEDIR}"/Bastion.bin.${myarch}
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/bastion/metadata.xml b/games-rpg/bastion/metadata.xml
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-rpg/bastion/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/coe2-2007-r1 b/games-rpg/coe2-2007-r1
new file mode 100644
index 000000000000..60d2b12225d0
--- /dev/null
+++ b/games-rpg/coe2-2007-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=media-libs/libsdl[sound,video] app-arch/unzip
+DESCRIPTION=Precursor to the Dominions series
+EAPI=5
+HOMEPAGE=http://www.shrapnelgames.com/Illwinter/CoE2/
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=media-libs/libsdl[sound,video] games-misc/games-envd
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=http://download.shrapnelgames.com/downloads/coe2_2007.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=96d93772d6ea882e3d75cfb87895b8e9
diff --git a/games-rpg/coe2/Manifest b/games-rpg/coe2/Manifest
deleted file mode 100644
index eb07effea12a..000000000000
--- a/games-rpg/coe2/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST coe2_2007.zip 4937222 BLAKE2B 4640e7819d0e000b3e355f20f364f84d0cc899acd27e33bae95cece843a724918b8a3cc6a538d39478cf5070fd71658637dbc127534d5182a914f6d0f56faff0 SHA512 db0d4ee2016ef3cf7159c227c494346fa0a0e9f9b20a6b520b67899570e3135a4286d6ada2f85d7ea7b55a1baeada41654d4fab29f5996357608f0d2d654b2ed
-EBUILD coe2-2007-r1.ebuild 1359 BLAKE2B b2ac31682fcd65a302900ef3d1dd987ad3def14eeeab0c0115ddc3e2d954fd52d555da200e3ca91ccc6574be012bb3910eb24ade456d7338a7c794f894a829ec SHA512 c8cb4c13e277a8ef6d7fefbf1ef2569ef0fc95aba94496787bf9d1042036306e7c67f9b65a9bb103fa83e30fc112a95cf09702dce85397c1abfc1b11a7feb8c7
-MISC metadata.xml 1166 BLAKE2B 344379ff270c13113da4d40e916e8c16505653451d93fdc82ccbb9e0c39585863056030959579f310cb6ab9a01e058d929abc3c28f9886f32d086074dfe874d6 SHA512 60a33d86c244ce321427d325d4f1fb56846940a1ab2b6c965afb317c497b142644574b94bc715fd0d602628d8b07ba9690f5d0addad626163273cc1584ada370
diff --git a/games-rpg/coe2/coe2-2007-r1.ebuild b/games-rpg/coe2/coe2-2007-r1.ebuild
deleted file mode 100644
index d4070f0433ac..000000000000
--- a/games-rpg/coe2/coe2-2007-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Precursor to the Dominions series"
-HOMEPAGE="http://www.shrapnelgames.com/Illwinter/CoE2/"
-SRC_URI="http://download.shrapnelgames.com/downloads/${PN}_${PV}.zip"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror bindist"
-
-RDEPEND="media-libs/libsdl[sound,video]"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/coe
-
-# bug #430026
-QA_PREBUILT="${GAMES_PREFIX_OPT}/coe2/coe_linux"
-
-src_prepare() {
-	rm -r *.{dll,exe} old || die
-	if use amd64 ; then
-		mv -f coe_linux64bit coe_linux || die
-	fi
-}
-
-src_install() {
-	insinto "${GAMES_PREFIX_OPT}/${PN}"
-	doins *.{bgm,smp,trp,trs,wrl}
-	dodoc history.txt manual.txt readme.txt
-	exeinto "${GAMES_PREFIX_OPT}/${PN}"
-	doexe coe_linux
-
-	games_make_wrapper ${PN} "./coe_linux" "${GAMES_PREFIX_OPT}/${PN}"
-	make_desktop_entry ${PN} "Conquest of Elysium 2"
-
-	# Slots for saved games.
-	# The game shows e.g. "EMPTY SLOT 0?", but it works.
-	local f slot state_dir=${GAMES_STATEDIR}/${PN}
-	dodir "${state_dir}"
-	for slot in {0..4} ; do
-		f=save${slot}
-		dosym "${state_dir}/save${slot}" "${GAMES_PREFIX_OPT}/${PN}/${f}"
-		echo "empty slot ${slot}" > "${D}${state_dir}/${f}" || die
-		fperms 660 "${state_dir}/${f}"
-	done
-
-	prepgamesdirs
-}
diff --git a/games-rpg/coe2/metadata.xml b/games-rpg/coe2/metadata.xml
deleted file mode 100644
index 59ce22e6b4f8..000000000000
--- a/games-rpg/coe2/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription lang="en">
-Originally released in 1997, Conquest of Elysium II is a turn-based fantasy
-strategy game, and the precursor to the wildly popular Dominions series. As one
-of up to eight players (human, computer controlled, or a mixture) your goal, as
-suggested in the title, is very simple: total subjugation of all that do not fly
-your banner!
-
-Choose your leader from twenty distinct character classes, including brutal
-barbarians, insane necromancers, mighty maharajas, sinister shamans, and even
-the Agarthan king from Dominions 3! Each character allows new strategies for the
-player to explore. The Priestess of Baal can summon demonic creatures, change
-the weather, and sacrifice the innocent. An Enchanter can create constructs out
-of corpses, lakes, forests, and more. Barons can build siege towers, raise
-levies, and keep his subjects in line, even in times of high taxation.
-</longdescription>
-</pkgmetadata>
diff --git a/games-rpg/comi-1 b/games-rpg/comi-1
new file mode 100644
index 000000000000..06ac132bce24
--- /dev/null
+++ b/games-rpg/comi-1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The Curse of Monkey Island, the third game in the series
+EAPI=6
+HOMEPAGE=https://en.wikipedia.org/wiki/The_Curse_of_Monkey_Island
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=comi
+PROPERTIES=interactive
+RDEPEND=>=games-engines/scummvm-0.4.0
+RESTRICT=bindist
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~chewi/distfiles/comi.jpg
+_eclasses_=cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=880fdf64e1414578c5f0968cc5df5625
diff --git a/games-rpg/comi/Manifest b/games-rpg/comi/Manifest
deleted file mode 100644
index 83dfbda879a2..000000000000
--- a/games-rpg/comi/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST comi.jpg 5320 BLAKE2B 4729546c766536a5bb937c1e7eb3cd231ec44146fabda41326f5dbf0a3cb13b57f119a0d28283b1664bcd11ffb652606f0ee2f658d5a0701e5ad15f70a9e8b01 SHA512 b8042241b0badc6950cac8bf0eae7f5e138d5f3fc96f9d3a2108cd3bc69d972bbb12e8f3a416273f0763a1ecfee9b66daff69e211889cd93468439a3036817af
-EBUILD comi-1.ebuild 1476 BLAKE2B 82ff554800ab8b74301d6bca430ba057c62e10cfba4ea8fc2711c37a3144e121f55188fbfcec795323fce82a743d2f345a0b863ef94ec4c2481cc1b092d30059 SHA512 44851095403c5903cb2294617dcfb7c56f7536c00a53d2cb537392bfea7015a5cb82de67f093ee4cf41fef11c0c49ea605d99584ccc46838d3cb2665aa009b4b
-MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/comi/comi-1.ebuild b/games-rpg/comi/comi-1.ebuild
deleted file mode 100644
index 91a25419df7f..000000000000
--- a/games-rpg/comi/comi-1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cdrom estack eutils xdg
-
-DESCRIPTION="The Curse of Monkey Island, the third game in the series"
-HOMEPAGE="https://en.wikipedia.org/wiki/The_Curse_of_Monkey_Island"
-SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${PN}.jpg"
-LICENSE="${PN}"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-RESTRICT="bindist"
-
-RDEPEND=">=games-engines/scummvm-0.4.0"
-
-S="${WORKDIR}"
-
-dotar() {
-	cd "${CDROM_ABSMATCH%/*}" || die
-	eshopts_push -s nocaseglob nullglob
-
-	# Lowercase
-	# Documentation into doc
-	# Remainder into data
-	# Avoid copying files twice
-
-	tar c \
-		--mode=u+w \
-		--ignore-case \
-		--xform='s:^[^a-z]+$:\L\0:x' \
-		--xform='s:.*:data/\0:x' \
-		--xform='s:.*\.(pdf|txt)$:doc/\0:x' \
-		--xform='s:^doc/data/:doc/:x' \
-		--exclude="$(use doc || echo '*.pdf')" \
-		--exclude-from=<(find "${WORKDIR}"/data -type f -printf "%P\n" 2>/dev/null) \
-		*.{txt,pdf} *.la[0-9] resource*/ \
-		| tar x -C "${WORKDIR}"
-
-	assert "tar failed"
-	eshopts_pop
-
-	# Don't prevent CD ejection.
-	cd "${WORKDIR}" || die
-}
-
-src_unpack() {
-	cdrom_get_cds comi.la1 comi.la2
-	dotar
-
-	cdrom_load_next_cd
-	dotar
-}
-
-src_install() {
-	insinto /usr/share/games/scummvm/games/comi
-	doins -r data/*
-
-	# Documentation may be missing.
-	[[ -d doc ]] && dodoc doc/*
-
-	doicon "${DISTDIR}"/${PN}.jpg
-	make_wrapper ${PN} "scummvm comi"
-	make_desktop_entry ${PN} "The Curse of Monkey Island" ${PN}.jpg
-}
diff --git a/games-rpg/comi/metadata.xml b/games-rpg/comi/metadata.xml
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-rpg/comi/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/daimonin-client-0.10.8 b/games-rpg/daimonin-client-0.10.8
new file mode 100644
index 000000000000..ac4a67b91f57
--- /dev/null
+++ b/games-rpg/daimonin-client-0.10.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=dev-games/physfs media-libs/libsdl[sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] net-misc/curl sys-libs/zlib:= app-arch/unzip >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A graphical 2D tile-based MMORPG
+EAPI=6
+HOMEPAGE=http://daimonin.sourceforge.net/
+IUSE=debug music
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-games/physfs media-libs/libsdl[sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] net-misc/curl sys-libs/zlib:=
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~soap/distfiles/daimonin-client-0.10.8.zip music? ( mirror://sourceforge/daimonin/daimoninMusicLQ20100827.zip )
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=bea47b5cf9149467e07298144f07bb94
diff --git a/games-rpg/daimonin-client/Manifest b/games-rpg/daimonin-client/Manifest
deleted file mode 100644
index 73c0b39cbdf7..000000000000
--- a/games-rpg/daimonin-client/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX daimonin-client-0.10.5-datadir.patch 983 BLAKE2B 810f36eed097c19a0d77ea89d60a4ac9acc83e2fe74d4563d77789fbfbdd5d9823c0e9271bcd113c00e6f6044c910338596c967d3fd68304863d0f9008da3324 SHA512 eb4748894c0722ee112efc3953a14784eb13237919813c057afddc09104f250f346c29a1a224bd3ce8a44b22af4fa2b59f826aa5eb96fb45a51f276f743fa3fa
-AUX daimonin-client-0.10.5-nozlib.patch 1094 BLAKE2B d617dbee2d2a23eff6b6330c59c2fe7501ec06437d5d179611ea9ab50a2e15bacc7e948d3cd114bf1745d6649e80f503b8e364752c9f689c4f95170d3ebf74bb SHA512 31ef58b81c669f7a8c685355dfb37d85383891db4534c3b62b0d9f5beaed6cb6d4be34657acd109287dc85d83a6c81950322667729b36552394c17a9b0bfc989
-AUX daimonin-client-0.10.8-fix-build-system.patch 2538 BLAKE2B 1eb570088a9bd44489ce63eeef445a3d9b27f421abb28cad9f83eb622b7da33ed94ec9265f0c0d59744521367dd82d6bc4ba7001e1fd938629b3ec4bb0f9f8ee SHA512 baf333aad05a662bf38e6579cb6f8bfcb0b1fbf2a48191df28a96fe3d20585f7a2ad211d96107a3f99245bc99b877ca140b450111e7466d866e07d32199c737d
-DIST daimonin-client-0.10.8.zip 51894462 BLAKE2B 9803b0e597134fa605ffc4e38b2f6f58cd76d45141bb0d5c5387e9b507c4b80b4a566d266b622df7ea38b3e9eb00e839981bcb999ac2d14e59a8cff37340f6fa SHA512 f4f5891697f96a60a8ee79973b0172b544cbae25b2d8787e0a4e9113d95be3b41b8c29c80ba5cbaf7548055e4c847456fa364346489f4d6ad165b984cfd64531
-DIST daimoninMusicLQ20100827.zip 24293301 BLAKE2B 35ee421c0db8f0ff29768b58af8fbc1d804d24534b8558631c97cf36b624999d0e5f422cd32e4a13bc09765b183bfd52270b33f2614023202211399e3d5da484 SHA512 f24bba24c0e9a79469511315c608c464568f3ee0dc05b3d83c791512fa51eae07669dc175e7672cc8b31764a7bdff5c975ac2b13e2d7b0e5287717e188f1d439
-EBUILD daimonin-client-0.10.8.ebuild 1483 BLAKE2B c67064029f915a15e5be0ce393275a05163ccd6ca9d16f1fc73fa9ae153b2ce85b55c2d6bb255b0f149bc60d75c2c902f1476859eac6b10bf92d29f2482bca6c SHA512 46898d7d1b725f963ceaf4e12ea8833feb37ae7e294f589789b87a1c51fd0bb5d404a6442a799ac59e061689ff6752482f3d623477cd1a27a6ffd7e4b1683a31
-MISC metadata.xml 408 BLAKE2B d816c7d0cd53dc68147f8a23d89d46da21defb09e0b9717b777b23881189ec61ae82ed3bb42dbccadd94a34421c6b92755bb20cdb60bd2a17826dcc128332930 SHA512 039f6849c28f9c21b7e2854314fcd0ff9b356b3983e68c0a4a2eb8e96893475e4333f7408c233f8f9651c4613a2683a63a4f5da58d11555d34712f9ebe0a2f6b
diff --git a/games-rpg/daimonin-client/daimonin-client-0.10.8.ebuild b/games-rpg/daimonin-client/daimonin-client-0.10.8.ebuild
deleted file mode 100644
index 3ee1bd720d75..000000000000
--- a/games-rpg/daimonin-client/daimonin-client-0.10.8.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils
-
-DESCRIPTION="A graphical 2D tile-based MMORPG"
-HOMEPAGE="http://daimonin.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.zip
-	music? ( mirror://sourceforge/daimonin/daimoninMusicLQ20100827.zip )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug music"
-
-RDEPEND="
-	dev-games/physfs
-	media-libs/libsdl[sound,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[vorbis]
-	net-misc/curl
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/daimonin-code-8183-trunk/client/make/linux
-
-src_unpack() {
-	unpack ${P}.zip
-	if use music; then
-		rm -f daimonin-code-8183-trunk/client/media/* || die
-		cd daimonin-code-8183-trunk/client || die
-		unpack daimoninMusicLQ20100827.zip
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-0.10.5-nozlib.patch
-	eapply "${FILESDIR}"/${PN}-0.10.8-fix-build-system.patch
-
-	pushd ../../src >/dev/null || die
-		eapply "${FILESDIR}"/${PN}-0.10.5-datadir.patch
-	popd >/dev/null || die
-
-	eapply_user
-
-	# remove bundled zlib
-	rm ../../src/include/z{lib,conf}.h || die
-
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-simplelayout \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-
-	cd ../.. || die
-	dodoc README*
-	newicon bitmaps/pentagram.png "daimonin.png"
-	make_desktop_entry "daimonin" "Daimonin" "daimonin" "Game;Amusement"
-}
diff --git a/games-rpg/daimonin-client/files/daimonin-client-0.10.5-datadir.patch b/games-rpg/daimonin-client/files/daimonin-client-0.10.5-datadir.patch
deleted file mode 100644
index f2fc757abd27..000000000000
--- a/games-rpg/daimonin-client/files/daimonin-client-0.10.5-datadir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/main.c	2010-08-24 19:32:55.000000000 +0200
-+++ b/main.c	2010-09-19 18:49:54.000000000 +0200
-@@ -2386,7 +2386,7 @@
- 
-     /* Add the base dir to the search path. The base dir is where all the
-      * defaults are (or should be). */
--    if (!PHYSFS_addToSearchPath(PHYSFS_getBaseDir(), 1))
-+    if (!PHYSFS_addToSearchPath(SYSPATH, 1))
-     {
-         LOG(LOG_MSG, "%s\n", PHYSFS_getLastError());
-     }
-@@ -2545,13 +2545,13 @@
- 
-     /* Prepend the user dir to the search path. This means files are read from
-      * this location in preference to the defaults. */
--    if (strcmp(PHYSFS_getBaseDir(), home))
--    {
-+    /*if (strcmp(PHYSFS_getBaseDir(), home))
-+    {*/
-         if (!PHYSFS_addToSearchPath(home, 0))
-         {
-             LOG(LOG_ERROR, "%s\n", PHYSFS_getLastError());
-         }
--    }
-+    //}
- 
-     /* Prepend any add-on packs to the search path. This means files are read
-      * from these locations in preference to the defaults and the user dir. */
diff --git a/games-rpg/daimonin-client/files/daimonin-client-0.10.5-nozlib.patch b/games-rpg/daimonin-client/files/daimonin-client-0.10.5-nozlib.patch
deleted file mode 100644
index 62a6e5fb1302..000000000000
--- a/games-rpg/daimonin-client/files/daimonin-client-0.10.5-nozlib.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/Makefile.am	2010-12-01 14:39:11.605648458 -0500
-+++ b/Makefile.am	2010-12-01 14:41:59.875915880 -0500
-@@ -2,23 +2,18 @@
- daimonin_PROGRAMS = daimonin daimonin-updater
- 
- daimonin_SOURCES =  \
--	../../src/adler32.c \
- 	../../src/anim.c \
- 	../../src/book.c \
- 	../../src/buddy.c \
- 	../../src/chatfilter.c \
- 	../../src/client.c \
- 	../../src/commands.c \
--	../../src/crc32.c \
- 	../../src/dialog.c \
- 	../../src/event.c \
- 	../../src/filewrap.c \
- 	../../src/font.c \
- 	../../src/group.c \
- 	../../src/ignore.c \
--	../../src/inffast.c \
--	../../src/inflate.c \
--	../../src/inftrees.c \
- 	../../src/interface.c \
- 	../../src/inventory.c \
- 	../../src/item.c \
-@@ -35,11 +30,9 @@
- 	../../src/sprite.c \
- 	../../src/textwin.c \
- 	../../src/tile_stretcher.c \
--	../../src/uncompr.c \
- 	../../src/wrapper.c \
--	../../src/widget.c \
--	../../src/zutil.c
--daimonin_LDADD = -lSDL_mixer -lSDL_image @SDL_LIBS@ @EXTRA_LIBS@ @PHYSFS_LIBS@
-+	../../src/widget.c
-+daimonin_LDADD = -lSDL_mixer -lSDL_image @SDL_LIBS@ @EXTRA_LIBS@ @PHYSFS_LIBS@ -lz
- daimonin_OBJDIR = objs
- 
- daimonin_updater_SOURCES = \
diff --git a/games-rpg/daimonin-client/files/daimonin-client-0.10.8-fix-build-system.patch b/games-rpg/daimonin-client/files/daimonin-client-0.10.8-fix-build-system.patch
deleted file mode 100644
index a6171896bfac..000000000000
--- a/games-rpg/daimonin-client/files/daimonin-client-0.10.8-fix-build-system.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,5 +1,5 @@
- daimonindir=$(d_bindir)
--daimonin_PROGRAMS = daimonin daimonin-updater
-+daimonin_PROGRAMS = daimonin
- 
- daimonin_SOURCES =  \
- 	../../src/adler32.c \
-@@ -72,30 +72,30 @@
- #		echo '***'; \
- #		exit 42; \
- #	fi;
--	$(MKDIR) -p $(d_datadir)/sfx
--	$(MKDIR) -p $(d_datadir)/man
--	$(MKDIR) -p $(d_datadir)/media
--	$(MKDIR) -p $(d_datadir)/cache
--	$(MKDIR) -p $(d_datadir)/logs
--	$(MKDIR) -p $(d_datadir)/gfx_user
--	$(MKDIR) -p $(d_datadir)/srv_files
--	$(MKDIR) -p $(d_datadir)/bitmaps
--	$(MKDIR) -p $(d_datadir)/icons
--	$(MKDIR) -p $(d_datadir)/settings
--	$(MKDIR) -p $(d_datadir)/update
--	$(CP) ../../sfx/*.* $(d_datadir)/sfx
--	$(CP) -R ../../man/* $(d_datadir)/man
--	$(CP) ../../media/*.* $(d_datadir)/media
--	$(CP) ../../cache/*.* $(d_datadir)/cache
--	$(CP) ../../bitmaps/* $(d_datadir)/bitmaps
--	$(CP) ../../icons/* $(d_datadir)/icons
--	$(CP) -R ../../settings/*.* $(d_datadir)/settings
--	$(CP) ../../srv_files/*.* $(d_datadir)/srv_files
--	$(CP) ../../update/version $(d_datadir)/update
--	$(CP) ../../gfx_user/*.* $(d_datadir)/gfx_user
--	$(CP) ../../daimonin.p0 $(d_datadir)
--	$(CP) ../../License $(d_datadir)
--	$(CP) ../../archdef.dat $(d_datadir)
-+	$(MKDIR) -p $(DESTDIR)$(d_datadir)/sfx
-+	$(MKDIR) -p $(DESTDIR)$(d_datadir)/man
-+	$(MKDIR) -p $(DESTDIR)$(d_datadir)/media
-+	$(MKDIR) -p $(DESTDIR)$(d_datadir)/cache
-+	$(MKDIR) -p $(DESTDIR)$(d_datadir)/logs
-+	$(MKDIR) -p $(DESTDIR)$(d_datadir)/gfx_user
-+	$(MKDIR) -p $(DESTDIR)$(d_datadir)/srv_files
-+	$(MKDIR) -p $(DESTDIR)$(d_datadir)/bitmaps
-+	$(MKDIR) -p $(DESTDIR)$(d_datadir)/icons
-+	$(MKDIR) -p $(DESTDIR)$(d_datadir)/settings
-+	$(MKDIR) -p $(DESTDIR)$(d_datadir)/update
-+	$(CP) ../../sfx/*.* $(DESTDIR)$(d_datadir)/sfx
-+	$(CP) -R ../../man/* $(DESTDIR)$(d_datadir)/man
-+	$(CP) ../../media/*.* $(DESTDIR)$(d_datadir)/media
-+	$(CP) ../../cache/*.* $(DESTDIR)$(d_datadir)/cache
-+	$(CP) ../../bitmaps/* $(DESTDIR)$(d_datadir)/bitmaps
-+	$(CP) ../../icons/* $(DESTDIR)$(d_datadir)/icons
-+	$(CP) -R ../../settings/*.* $(DESTDIR)$(d_datadir)/settings
-+	$(CP) ../../srv_files/*.* $(DESTDIR)$(d_datadir)/srv_files
-+	$(CP) ../../update/version $(DESTDIR)$(d_datadir)/update
-+	$(CP) ../../gfx_user/*.* $(DESTDIR)$(d_datadir)/gfx_user
-+	$(CP) ../../daimonin.p0 $(DESTDIR)$(d_datadir)
-+	$(CP) ../../License $(DESTDIR)$(d_datadir)
-+	$(CP) ../../archdef.dat $(DESTDIR)$(d_datadir)
- 	@echo "*** Daimonin client successful installed in $(daimonindir)!"
- 	@echo "*** Enter your install folder and type ./daimonin"
- 	@echo "*** to start the game!"
diff --git a/games-rpg/daimonin-client/metadata.xml b/games-rpg/daimonin-client/metadata.xml
deleted file mode 100644
index 6794421a86c3..000000000000
--- a/games-rpg/daimonin-client/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="music">Install extra music</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">daimonin</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-rpg/dear-esther-20130608 b/games-rpg/dear-esther-20130608
new file mode 100644
index 000000000000..c28efda85236
--- /dev/null
+++ b/games-rpg/dear-esther-20130608
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup unpack
+DEPEND=app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=Ghost story, told using first-person gaming technologies
+EAPI=5
+HOMEPAGE=http://dear-esther.com/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=>=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] games-misc/games-envd
+RESTRICT=bindist fetch splitdebug
+SLOT=0
+SRC_URI=dearesther-linux-06082013-bin
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=61d9a15b2b61811a7a8750230eefb714
diff --git a/games-rpg/dear-esther/Manifest b/games-rpg/dear-esther/Manifest
deleted file mode 100644
index 817b23221cb3..000000000000
--- a/games-rpg/dear-esther/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dearesther-linux-06082013-bin 1007461686 BLAKE2B 0ffb2387490beef790ad00f110a8393bb69f0fe762799795a655eab748aed08eb8665c199ea0f588c764bafaa68eae3ba6884296614abbd66ecd1b72810b2c88 SHA512 c66a2b068b4caaebfb63e4617102af4a5df153dfe76854d1fa94305fb95b15e4362c9ca5e715ea4b29966916a9a585fa71bfc2b2b33b878f26e3785b7d93722e
-EBUILD dear-esther-20130608.ebuild 1545 BLAKE2B aaef94c15b08c7ffa99809a5f450132b07bfcceb88e379bbebcbe681fbbcc10813f17bc13981508d871e1aa0bf18ac8a1ddecf155b7d9e1046929e58fef45e15 SHA512 63685a6da8d06d0baa6fa377be3532181a677892c612550e9c22658f78cb05b82371ff796175e74c88791d1001e01d4cb9e03aa9310a6533571421fd4af0f46c
-MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/dear-esther/dear-esther-20130608.ebuild b/games-rpg/dear-esther/dear-esther-20130608.ebuild
deleted file mode 100644
index a7d2c696ccff..000000000000
--- a/games-rpg/dear-esther/dear-esther-20130608.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: unbundle libSDL2
-
-EAPI=5
-inherit eutils gnome2-utils unpacker games
-
-TIMESTAMP="${PV:4:2}${PV:6:2}${PV:0:4}"
-DESCRIPTION="Ghost story, told using first-person gaming technologies"
-HOMEPAGE="http://dear-esther.com/"
-SRC_URI="dearesther-linux-${TIMESTAMP}-bin"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="bindist fetch splitdebug"
-
-MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${MYGAMEDIR#/}/dearesther_linux
-	${MYGAMEDIR#/}/bin/*.so*"
-
-DEPEND="app-arch/unzip"
-RDEPEND="
-	>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-	>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)]
-	>=media-libs/openal-1.15.1[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]"
-
-S=${WORKDIR}/data
-
-pkg_nofetch() {
-	einfo "Please buy & download ${SRC_URI} from:"
-	einfo "  ${HOMEPAGE}"
-	einfo "and move it to ${DISTDIR}"
-	einfo
-}
-
-src_unpack() {
-	unpack_zip ${A}
-}
-
-src_install() {
-	insinto "${MYGAMEDIR}"
-	doins -r bin dearesther platform dearesther_linux
-
-	doicon -s 256 dearesther.png
-	make_desktop_entry "${PN}" "Dear Esther" dearesther
-	games_make_wrapper ${PN} "./dearesther_linux -game dearesther" "${MYGAMEDIR}" "${MYGAMEDIR}/bin"
-
-	dodoc README-linux.txt
-
-	fperms +x "${MYGAMEDIR}"/dearesther_linux
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/dear-esther/metadata.xml b/games-rpg/dear-esther/metadata.xml
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-rpg/dear-esther/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/draci-historie-2012-r1 b/games-rpg/draci-historie-2012-r1
new file mode 100644
index 000000000000..7855b1a4ed0e
--- /dev/null
+++ b/games-rpg/draci-historie-2012-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=app-arch/unzip
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c76305c25b86f236b461de018bf13f56
diff --git a/games-rpg/draci-historie/Manifest b/games-rpg/draci-historie/Manifest
deleted file mode 100644
index 09c53099bf86..000000000000
--- a/games-rpg/draci-historie/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST dh-cz-2012.zip 29293879 BLAKE2B 5f8d4199de6f418d041c409bbc25b383021721b062b1697a29b7be612e05aaa7fd76bade7add8cf662ad58c51028712ce7d5009b4a54df3c4f24b38d0fdb2a55 SHA512 1c7691fe275f662a3a22bdb824965c1e0079a44ddfed5a75596f71dcd32cf3e34d2107480a5df392a2a28aae01cccca6eedf615f362af11bbac30c30dfd89cd2
-DIST dh-de-2012.zip 3316443 BLAKE2B 99a495be5d2add5e6f375904d249bda06f556e5e8ede4b33348d6ee46778de15b704016f9b498ca5b68ad678b3f2bd572034c37bc7dde2dfcd9d46ef2f4b242a SHA512 088f372e8de59cb52555a70cb7918ec14bb4abbb712a3867b40ce9eef80dc3f03b6c28402b9e0c9ee7e02f1938ee5f140abc02aef801716e38af84d66dafd5aa
-DIST dh-en-2012.zip 3310860 BLAKE2B 22c8dc8102f5f1d984a760d51fd8f7f028cca6a28b1a4e0f459c44eec68255e3ecd526ef80426b57f2137c33f6a5ba0d16b2c760b42a67413c2ffa3cec9ec648 SHA512 a9b5ff15305c961f288fdf915f56ca204a2ebe5370dcf56c20a0057cf721c45445a20479a39fe1f5443e79e7c95bd5771abef2115396c418442d2e5e400ce10a
-DIST dh-pl-2012.zip 36041498 BLAKE2B 29f6daeac610aa83f4df4a7698d19540f7c97d3a019a66078e784492010891860fa6af9b3151457c0aefeeb5eb3f90b8336693a1367b64e97592e017a7e9f247 SHA512 627f85a14362e032e00ed36275df696b6a468965734db7c8bb459d689b548c05033fe387ffee9855a83fe634f14b98a5c5ea51aefdf169c7243e9282fa1c19a5
-EBUILD draci-historie-2012-r1.ebuild 2365 BLAKE2B c908bcbfc5b1cb9aefc3eb73d55ff3b50045af923d57ef45857e173ca64ff4a7142897e4e645342aee5b163b8ff5dc6cec759d55dfdb1591cd3a755a9d9359b9 SHA512 a54f1a29806cd8a2f270a0dc232a6ac1b34fad9f76d0843919a0aac2e40fc043dfe0def47887be40d97c68224bb8bbf789a3bb2f74f0bb2d62cd7b2684d533db
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-rpg/draci-historie/draci-historie-2012-r1.ebuild b/games-rpg/draci-historie/draci-historie-2012-r1.ebuild
deleted file mode 100644
index 3982a8538d15..000000000000
--- a/games-rpg/draci-historie/draci-historie-2012-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Bert the little dragon searches for his father"
-HOMEPAGE="http://www.ucw.cz/draci-historie/index-en.html"
-BASE_URL="http://www.ucw.cz/draci-historie/binary/dh"
-SRC_URI="
-	l10n_cs? ( ${BASE_URL}-cz-${PV}.zip )
-	l10n_de? ( ${BASE_URL}-de-${PV}.zip )
-	l10n_en? ( ${BASE_URL}-en-${PV}.zip )
-	l10n_pl? ( ${BASE_URL}-pl-${PV}.zip )
-	!l10n_cs? ( !l10n_de? ( !l10n_en? ( !l10n_pl? ( ${BASE_URL}-en-${PV}.zip ) ) ) )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="l10n_cs l10n_de l10n_en l10n_pl"
-
-RDEPEND=">=games-engines/scummvm-1.1"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	if use l10n_en || ( ! use l10n_cs && ! use l10n_de && ! use l10n_en && ! use l10n_pl ) ; then
-		mkdir en || die
-		unpack dh-en-${PV}.zip
-		mv *.{dfw,fon,mid,sam} en/ || die
-	fi
-	if use l10n_cs ; then
-		mkdir cs || die
-		unpack dh-cz-${PV}.zip
-		mv *.{dfw,fon,mid,sam,zzz} cs/ || die
-	fi
-	if use l10n_de ; then
-		mkdir de || die
-		unpack dh-de-${PV}.zip
-		mv *.{dfw,fon,mid,sam} de/ || die
-	fi
-	if use l10n_pl ; then
-		mkdir pl || die
-		unpack dh-pl-${PV}.zip
-		mv *.{dfw,fon,mid,sam,zzz} pl/ || die
-	fi
-}
-
-src_prepare() {
-	default
-	rm -f *.{bat,exe,ins} readme.* || die
-}
-
-src_install() {
-	newicon bert.ico draci-historie.ico
-	insinto /usr/share/${PN}
-	for lingua in $(find * -type d); do
-		doins -r ${lingua}
-	done
-	if use l10n_en || ( ! use l10n_cs && ! use l10n_de && ! use l10n_en && ! use l10n_pl ) ; then
-		make_wrapper draci-historie-en "scummvm -f -p \"/usr/share/${PN}/en\" draci" .
-		make_desktop_entry ${PN}-en "Dračí Historie (English)" /usr/share/pixmaps/draci-historie.ico
-	fi
-	if use l10n_cs ; then
-		make_wrapper draci-historie-cs "scummvm -f -p \"/usr/share/${PN}/cs\" draci" .
-		make_desktop_entry ${PN}-cs "Dračí Historie (Čeština)" /usr/share/pixmaps/draci-historie.ico
-	fi
-	if use l10n_de ; then
-		make_wrapper draci-historie-de "scummvm -f -p \"/usr/share/${PN}/de\" draci" .
-		make_desktop_entry ${PN}-de "Dračí Historie (Deutsch)"  /usr/share/pixmaps/draci-historie.ico
-	fi
-	if use l10n_pl ; then
-		make_wrapper draci-historie-pl "scummvm -f -p \"/usr/share/${PN}/pl\" draci" .
-		make_desktop_entry ${PN}-pl "Dračí Historie (Polski)"  /usr/share/pixmaps/draci-historie.ico
-	fi
-	einstalldocs
-}
diff --git a/games-rpg/draci-historie/metadata.xml b/games-rpg/draci-historie/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-rpg/draci-historie/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/dragonhunt-3.56-r2 b/games-rpg/dragonhunt-3.56-r2
new file mode 100644
index 000000000000..b6d5d04229be
--- /dev/null
+++ b/games-rpg/dragonhunt-3.56-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst 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_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=A simple graphical RPG
+EAPI=6
+HOMEPAGE=http://emhsoft.com/dh.html
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 CC-SA-1.0
+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_python3_7(-),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_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://emhsoft.com/dh/Dragon_Hunt-3.56.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5b7d10bf7501daa244fa0140442f261b
diff --git a/games-rpg/dragonhunt/Manifest b/games-rpg/dragonhunt/Manifest
deleted file mode 100644
index d52401dc489c..000000000000
--- a/games-rpg/dragonhunt/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Dragon_Hunt-3.56.tar.gz 2170718 BLAKE2B 4d5b16921867bb7e0b14991184fc4f7a90ca7dbc6c87f4565a4626fb26d413cd4805099bb4973b45fde3758de4845489898c89b5981d34af7e8d03b2874286a5 SHA512 86ca32436088e8cda8993e21ebe6180f8361eb8bf5e052b3744a1db50073826118d1db657d713c7d75cd78c50c78c940caaf7adc5d31ad895d02a44f82b1e72a
-EBUILD dragonhunt-3.56-r2.ebuild 2110 BLAKE2B dcfe8c5410797eaf81b0e53f6264b916928ec06aaf6701e3cbee8fb27e2a9db8992ed27969f3dee96e98c8ed7ef3fa4fad650abeda8430227788c6a19df20dda SHA512 12562488edba40cbc108d8ebdd956b842be85c17b7e5baeaf3594a5c0fbdc79dfd7b592c862d8a7cebce5a1e32b5e6bfe2b7c429dee69426042c70ce624ba199
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-rpg/dragonhunt/dragonhunt-3.56-r2.ebuild b/games-rpg/dragonhunt/dragonhunt-3.56-r2.ebuild
deleted file mode 100644
index e908b7b28145..000000000000
--- a/games-rpg/dragonhunt/dragonhunt-3.56-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1
-
-MY_P="Dragon_Hunt-${PV}"
-DESCRIPTION="A simple graphical RPG"
-HOMEPAGE="http://emhsoft.com/dh.html"
-SRC_URI="http://emhsoft.com/dh/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 CC-SA-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-python/pygame[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Where to look for modules to load.
-	sed -i "s:\.\./modules/:/usr/share/${PN}/:" \
-		code/g.py \
-		code/map_editor.py \
-		code/rpg.py || die
-
-	# Where to look for keybinding
-	sed -i "s:\.\./settings:/etc/${PN}/settings:" \
-		code/g.py || die
-
-	# Save games in ~/.${PN}/.
-	sed -i \
-		-e "s:^\(from os import.*\):\1\, environ:" \
-		-e "s:g.mod_dir.*\"/saves/\?\":environ[\"HOME\"] + \"/.${PN}/\":" \
-		code/g.py code/loadgame.py || die
-
-	# Save maps in ~/.
-	sed -i \
-		-e "s:^\(from os import.*\):\1\, environ:" \
-		-e "s:g.mod_dir.*\"map\.txt\":environ[\"HOME\"]\ +\ \"/dh_map.txt\":" \
-		code/map_editor.py || die
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r modules/*
-
-	insinto /etc/${PN}
-	doins settings.txt
-
-	insinto /usr/$(get_libdir)/${PN}
-	doins code/*.py
-
-	make_wrapper ${PN} "${EPYTHON} ./rpg.py" /usr/$(get_libdir)/${PN}
-	make_wrapper ${PN}-mapeditor "${EPYTHON} ./map_editor.py" \
-		/usr/$(get_libdir)/${PN}
-
-	newicon modules/default/images/buttons/icon.png ${PN}.png
-	make_desktop_entry ${PN} "Dragon Hunt"
-	make_desktop_entry ${PN}-mapeditor "Dragon Hunt - Editor"
-
-	dodoc README.txt docs/{Changelog,Items.txt,example_map.txt,tiles.txt}
-	dodoc -r docs/*.html
-
-	python_optimize "${ED}/usr/$(get_libdir)"/${PN} \
-		"${ED}/usr/share/${PN}/Dark Ages/data/make_map.py"
-}
-
-pkg_postinst() {
-	echo
-	elog "If you use the map editor then note that maps will be saved as"
-	elog "~/dh_map.txt and must be move to the correct module directory"
-	elog "(within /usr/share/${PN}) by hand."
-	echo
-}
diff --git a/games-rpg/dragonhunt/metadata.xml b/games-rpg/dragonhunt/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-rpg/dragonhunt/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/drascula-1.0-r3 b/games-rpg/drascula-1.0-r3
new file mode 100644
index 000000000000..505a592d5300
--- /dev/null
+++ b/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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8a358e5c03ec6b98a9759e6724bfffb4
diff --git a/games-rpg/drascula/Manifest b/games-rpg/drascula/Manifest
deleted file mode 100644
index d66ed6751284..000000000000
--- a/games-rpg/drascula/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST drascula-1.0.zip 32842993 BLAKE2B 5033e8e5f66f74c2b049a1246c62dd33b7b32c3d088575a8d031bc505cd3356c0b364efa9308c99e26e524dc58913cad7cc09424ac6ad30fff38175f952a0151 SHA512 74ca773264e1ed611456b230d6265dade8d745a3adb736f3d6583d43ed6820a25f481ec65612b31d4b3076418f6bc696c82fa0f5085ec43edc91761e95361d11
-DIST drascula-2.0.0.dat 219527 BLAKE2B 362cb71aa5c7ec7a391a9e371f7adbfeef7c3d015db562e613ebc5513d0d8661af6880549424c9fff0dde25e8fe3a82bc4658e0bd47eb6b65c071fff0dce9983 SHA512 b57cdde7f686d54b3dd669dc5737e0046c3f38a31c4f78cde1b51dc7dc3a28193a95d5364629716998f958b7c43ed45bdcd0bc32f94ca718e7882d16fea2c015
-DIST drascula-audio-2.0.zip 36531704 BLAKE2B c3426f9c10e1ab5931b6474c1ba5b13a38267db5c8a8b8663e6a9bbea95751d50f4829dc427d962110ec4b0b093f2c5b59a73ca15aedd73c9ceaf1b3b158ec82 SHA512 09018bcfa062e720db6af7b38fa582f1b3674a25e7bb323d894ad767f8bcd449739fc592a10d848f6cac90a8bb51b5148c5c39558f70d29e2a5116b0b196274e
-DIST drascula-int-1.1.zip 34855203 BLAKE2B b37f6ed68d3ef6cc70915d68178a0359ae39e9d2a020f84573e8e905ec4fa946ad9328479590d5510f0b03ec5a422a4204ffd3fb6294711ea7b68f0f19899151 SHA512 f8127d09e19dec9abf75b9129792c67f3d36ea80fa69c70eeaa536f7a76f8f29072c21f041a0f9467d595f214392541c09c7a75caca0318e8d1b587db9d099cf
-DIST drascula.png 34525 BLAKE2B 1d529b02f08079921ab1021a3012fbef89fd4e9e4933727cdf96c5ce52bc3837d3f636e7b32f33cb92d027cbc330d4fc9280202a6b970821741eb8a44a905346 SHA512 e49fc17cad986b8fa42bd5ede30a1b1ef264182a476168d5c197a31d484555552e824f103b9456898940c68c2f0d751f4c2782a7a95ea92c62e3daec1dd1f52a
-EBUILD drascula-1.0-r3.ebuild 1811 BLAKE2B 44b0bf84c4b5dfc0f525ed56e74b3f07ad8348a3317d4b3dcc3c4d880b94f31e907146042c40a1c3ab02447b0cc130b2e9ee613cd1a914327259f1737ebea165 SHA512 1a75811d70d6df3635eb40f138dd5d3ad9acd66fbc183e82b2193262953df84403669b8e4f1f5275234e956a68df1571a6ed4361d605291948cf487634311a47
-MISC metadata.xml 473 BLAKE2B 5c14edc9041dd442f8cdde7cb168b024495d7b5e1ac12438bfb47d4dd533ca7280fe51c6d6dba950e14aa96bca40973faa7a4580f067985afef04202ed4c9374 SHA512 4e247fb0a866b080da09b521cdfa1d8eaf3463e4cc62199dc58f22eec49f41c3843f71981b0f41a0ebbda98f9fd6e02f3a15e63a8b445266630324dbfecbda91
diff --git a/games-rpg/drascula/drascula-1.0-r3.ebuild b/games-rpg/drascula/drascula-1.0-r3.ebuild
deleted file mode 100644
index f058ca3b8da3..000000000000
--- a/games-rpg/drascula/drascula-1.0-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-INT_PV="1.1"
-INT_URI="mirror://sourceforge/scummvm/drascula-int-${INT_PV}.zip"
-DAT_PV="2.0.0"
-AUD_PV="2.0"
-
-DESCRIPTION="Drascula: The Vampire Strikes Back"
-HOMEPAGE="http://www.alcachofasoft.com/"
-SRC_URI="mirror://sourceforge/scummvm/drascula-${PV}.zip
-	https://github.com/scummvm/scummvm/raw/v${DAT_PV}/dists/engine-data/drascula.dat -> drascula-${DAT_PV}.dat
-	sound? ( mirror://sourceforge/scummvm/drascula-audio-${AUD_PV}.zip )
-	https://salsa.debian.org/games-team/drascula/raw/master/debian/icons/drascula.png
-	l10n_es? ( ${INT_URI} )
-	l10n_de? ( ${INT_URI} )
-	l10n_fr? ( ${INT_URI} )
-	l10n_it? ( ${INT_URI} )"
-
-LICENSE="drascula"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="l10n_es l10n_de l10n_fr l10n_it +sound"
-RESTRICT="mirror"
-
-RDEPEND=">=games-engines/scummvm-0.13.1"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	if use l10n_es || use l10n_de || use l10n_fr || use l10n_it; then
-		unpack drascula-int-${INT_PV}.zip
-	fi
-	if use sound; then
-		unpack drascula-audio-${AUD_PV}.zip
-	fi
-	unpack drascula-${PV}.zip
-}
-
-src_install() {
-	local lang
-
-	make_wrapper ${PN} "scummvm -f -p \"/usr/share/${PN}\" drascula" .
-	for lang in es de fr it; do
-		if use l10n_${lang} ; then
-			make_wrapper ${PN}-${lang} "scummvm -q ${lang} -f -p \"/usr/share/${PN}\" drascula" .
-			make_desktop_entry ${PN}-${lang} "Drascula: The Vampire Strikes Back (${lang})" ${PN}
-		fi
-	done
-	insinto /usr/share/${PN}
-	find . -name "P*.*" -execdir doins '{}' +
-	newins "${DISTDIR}"/drascula-${DAT_PV}.dat drascula.dat
-	if use sound; then
-		doins audio/*
-	fi
-	dodoc readme.txt drascula.doc
-	doicon "${DISTDIR}"/${PN}.png
-	make_desktop_entry ${PN} "Drascula: The Vampire Strikes Back"
-}
diff --git a/games-rpg/drascula/metadata.xml b/games-rpg/drascula/metadata.xml
deleted file mode 100644
index 4bb899986a01..000000000000
--- a/games-rpg/drascula/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="sound">Install optional audio files</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">scummvm</remote-id>
-    <remote-id type="github">scummvm/scummvm</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-rpg/dreamweb-1.1-r1 b/games-rpg/dreamweb-1.1-r1
new file mode 100644
index 000000000000..521b2913f44e
--- /dev/null
+++ b/games-rpg/dreamweb-1.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=app-arch/unzip
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=43106d26fdb6db352e51bd3b81f17d6e
diff --git a/games-rpg/dreamweb/Manifest b/games-rpg/dreamweb/Manifest
deleted file mode 100644
index 1824827a5c64..000000000000
--- a/games-rpg/dreamweb/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST cat-dreamweb.png 1088 BLAKE2B 9b952c2ab9795d0a29a168436d031de1806926a90e9948d5f75bea7fe11bd4e1ba0b05ed92438764a8cfebc2e7c511091315b5b3c9438e27f9deb12adb8bf181 SHA512 fb2b70e36fc975ca18b77e368bd35b54d5db80a39accc0f4529c6ddd9d556d17bda84f72ad2b5d4621270fffef3218e7f6f4e8f38130d6b45ed3e68f90bdd140
-DIST dreamweb-cd-de-1.1.zip 243874867 BLAKE2B 582a3cf8fcbe58f839425b59faafaa60cfc8fd16609640674fcff25f9b95afa00ca1d7a63ee4ffa028e0678257e7ba818ba6e6dceaa79258a57c1df558938b57 SHA512 30b64b68b22574f29b1b7685ce0df822871e1e641d76d0527d50cc53c4a928a5266033239e44162c30474dd30e5179be88b504c0d820eac5de936145e04c0e9c
-DIST dreamweb-cd-es-1.1.zip 171154186 BLAKE2B 849d7918ef0a9553913540f72931301b640a06cf8666c376151bfed0c232a88211d91ffcf4424cf491dcb440839566fd05a2c82b460133e0eee2c0d5ad2d61cb SHA512 67f6d3c2755c39d1f4c268a5f3a011395de6abdb14d798bdd45116200b1d9ee6597c75004268dd142f3341148b81250f464d271589c52fae3ad3b7a0e8e50af2
-DIST dreamweb-cd-fr-1.1.zip 166468360 BLAKE2B a9055e506e1a116cc5a2fa987124d264e53ddbc613673edf511f9938f86e45d6eba72ccce8f0a43cda71de3f6276d6b0745ac3e761bbb0e2b530d01f017e2a99 SHA512 77183bcb2477c5dd8bcabb0a16d18b23d48b884d452721e49032c9e7e8ac48df3af18a63aa9765d7b0a138bcf6a116d7dabbce147bcff79c37fab39721fc6456
-DIST dreamweb-cd-it-1.1.zip 225726238 BLAKE2B 9f796895b3cf34db4086726044b1688bacce0e2b690b5905f30dee274dd00c60388fd98c2a73f49d8a7cba531ffba7422485b0b9f61cf74696e1e93bf9481aec SHA512 0a9d0227f0ef1e204e447fc3b43ce81bd50fe2999f3b0a79141e8f1b9dfe08161cdee0ce917728d183c99aaea884cf8fa4808ee007bc9bb3062436a7b65fe052
-DIST dreamweb-cd-uk-1.1.zip 226067188 BLAKE2B b0309fb48158256d676198e46d2b7c689ec816baccf4140c0da4bb103c043e0864a1df7f58b2b3a7b754127fe6b1297e971d7e5a0a51ff0c2a88355ec6664208 SHA512 5e3c11f06ab0518a18cf1feffbc7b016363bc258e6e4d282bbdb5aa88f9540d5fdc10e4d59571d626aeab61a4ab6c4266620c73b2944b9c6963c1e5b66eecd9d
-DIST dreamweb-cd-us-1.1.zip 226360597 BLAKE2B 68825cf5683a321aec70e498e2b611d93384e38952468d1c006136ceb4bebd74156baa006c291da29513da5e71b4f4a25e9fc28a29b1057830357e2ecd0a0359 SHA512 cca33b2f4fd373eb0bc6d12df9ad3ba8417e0fd27cc09e1e0a3201ab4567ddeea127529aa1d1742060225888870c892f8dc983078017c5ae9253b6e028171cb8
-DIST dreamweb-manuals-en-highres.zip 186406397 BLAKE2B c394c32e0caaa1251461cd688348d8be9b57c792190cd84991a9a47915ea313456659d72a9db7fdb9f09b4f71e0d9ea932f702eb5cd4f67390992a64328d0c2e SHA512 a67d3eadeb2ea7579d23315cd9c9fbb31d9e7aa88fdd3c4bc8656801e4b064ad94356167cfbf0ee6e18ad02316297dad0d07616b34080aae68467868de421305
-EBUILD dreamweb-1.1-r1.ebuild 3447 BLAKE2B 4fccc989292181ea0c066c1b7faff22b26aa47526cb6a5f378b3f19bc91b1e755d66c785ade84e41753b9827860ffb16469afb2d4390d7472b0c4e53a45c963d SHA512 089c98fd23b8b29468532571eef9126f3635d7e8cd3c3ed3a9f829d9cab22dd33bdcf601b6d36253266bea4f30949d46b9f1447b1c3836c8a34e459d5e8a05e0
-MISC metadata.xml 459 BLAKE2B f764c68b92e4614c49c37cee671b5b69ed25eb3938f4d6efdc1061ff34f2a12d1dd896f2dd9ac9ba91e7cbfa5c77aab9c6437b0ec1d685a930dbe7ca6b96823c SHA512 06373bf69e200ed3a6b86bb7f914147c26ea4d4b00f3592b3235917d878e45ed2b86f33136057a64471bdc711cdc5740a35f80b39a92e7fbe55304d8c98c1474
diff --git a/games-rpg/dreamweb/dreamweb-1.1-r1.ebuild b/games-rpg/dreamweb/dreamweb-1.1-r1.ebuild
deleted file mode 100644
index 6fd1f4a55baf..000000000000
--- a/games-rpg/dreamweb/dreamweb-1.1-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Top-down adventure game set in a gritty futuristic/dystopian city"
-HOMEPAGE="http://wiki.scummvm.org/index.php/Dreamweb"
-SRC_URI="doc? ( mirror://sourceforge/scummvm/${PN}-manuals-en-highres.zip )
-	l10n_de? ( mirror://sourceforge/scummvm/${PN}-cd-de-${PV}.zip )
-	l10n_en? ( mirror://sourceforge/scummvm/${PN}-cd-us-${PV}.zip )
-	l10n_en-GB? ( mirror://sourceforge/scummvm/${PN}-cd-uk-${PV}.zip )
-	l10n_es? ( mirror://sourceforge/scummvm/${PN}-cd-es-${PV}.zip )
-	l10n_fr? ( mirror://sourceforge/scummvm/${PN}-cd-fr-${PV}.zip )
-	l10n_it? ( mirror://sourceforge/scummvm/${PN}-cd-it-${PV}.zip )
-	!l10n_de? ( !l10n_en? ( !l10n_en-GB? ( !l10n_es? ( !l10n_fr? ( !l10n_it? \
-		( mirror://sourceforge/scummvm/${PN}-cd-us-${PV}.zip ) ) ) ) ) )
-	http://www.scummvm.org/images/cat-dreamweb.png"
-
-LICENSE="Dreamweb"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc l10n_de l10n_en l10n_en-GB l10n_es l10n_fr l10n_it"
-
-RDEPEND=">=games-engines/scummvm-1.7[flac]"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	if use l10n_de ; then
-		mkdir -p "${S}"/de || die
-		cd "${S}"/de || die
-		unpack ${PN}-cd-de-${PV}.zip
-	fi
-	if use l10n_en || ( ! use l10n_de && ! use l10n_en && ! use l10n_en-GB && \
-			! use l10n_es && ! use l10n_fr && ! use l10n_it ) ; then
-		mkdir -p "${S}"/en_US || die
-		cd "${S}"/en_US || die
-		unpack ${PN}-cd-us-${PV}.zip
-	fi
-	if use l10n_en-GB ; then
-		mkdir -p "${S}"/en_GB || die
-		cd "${S}"/en_GB || die
-		unpack ${PN}-cd-uk-${PV}.zip
-	fi
-	if use l10n_es ; then
-		mkdir -p "${S}"/es || die
-		cd "${S}"/es || die
-		unpack ${PN}-cd-es-${PV}.zip
-	fi
-	if use l10n_fr ; then
-		mkdir -p "${S}"/fr || die
-		cd "${S}"/fr || die
-		unpack ${PN}-cd-fr-${PV}.zip
-	fi
-	if use l10n_it ; then
-		mkdir -p "${S}"/it || die
-		cd "${S}"/it || die
-		unpack ${PN}-cd-it-${PV}.zip
-	fi
-	if use doc ; then
-		mkdir -p "${S}"/doc || die
-		cd "${S}"/doc || die
-		unpack ${PN}-manuals-en-highres.zip
-	fi
-}
-
-src_prepare() {
-	default
-	rm -rf */license.txt */*.EXE || die
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	newicon "${DISTDIR}"/cat-dreamweb.png dreamweb.png
-	if use l10n_de ; then
-		doins -r de
-		make_wrapper dreamweb-de "scummvm -f -p \"/usr/share/${PN}/de\" dreamweb" .
-		make_desktop_entry ${PN}-de "Dreamweb (Deutsch)" dreamweb
-	fi
-	if use l10n_en || ( ! use l10n_de && ! use l10n_en && ! use l10n_en-GB && \
-			! use l10n_es && ! use l10n_fr && ! use l10n_it ) ; then
-		doins -r en_US
-		make_wrapper dreamweb-en_US "scummvm -f -p \"/usr/share/${PN}/en_US\" dreamweb" .
-		make_desktop_entry ${PN}-en_US "Dreamweb (US English)" dreamweb
-	fi
-	if use l10n_en-GB ; then
-		doins -r en_GB
-		make_wrapper dreamweb-en_GB "scummvm -f -p \"/usr/share/${PN}/en_GB\" dreamweb" .
-		make_desktop_entry ${PN}-en_GB "Dreamweb (UK English)" dreamweb
-	fi
-	if use l10n_es ; then
-		doins -r es
-		make_wrapper dreamweb-es "scummvm -f -p \"/usr/share/${PN}/es\" dreamweb" .
-		make_desktop_entry ${PN}-es "Dreamweb (Español)" dreamweb
-	fi
-	if use l10n_fr ; then
-		doins -r fr
-		make_wrapper dreamweb-fr "scummvm -f -p \"/usr/share/${PN}/fr\" dreamweb" .
-		make_desktop_entry ${PN}-fr "Dreamweb (Français)" dreamweb
-	fi
-	if use l10n_it ; then
-		doins -r it
-		make_wrapper dreamweb-it "scummvm -f -p \"/usr/share/${PN}/it\" dreamweb" .
-		make_desktop_entry ${PN}-it "Dreamweb (Italiano)" dreamweb
-	fi
-	use doc && dodoc -r doc/*
-}
diff --git a/games-rpg/dreamweb/metadata.xml b/games-rpg/dreamweb/metadata.xml
deleted file mode 100644
index 1cbcf304b004..000000000000
--- a/games-rpg/dreamweb/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="doc">High-resolution scans of the written material in the original UK game box</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">scummvm</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-rpg/dungeon-defenders-20130305 b/games-rpg/dungeon-defenders-20130305
new file mode 100644
index 000000000000..9146403a47f2
--- /dev/null
+++ b/games-rpg/dungeon-defenders-20130305
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup unpack
+DEPEND=app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=A hybrid of two hot genres: Tower Defense and cooperative online Action-RPG
+EAPI=5
+HOMEPAGE=http://dungeondefenders.com/
+IUSE=bundled-libs
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=x11-misc/xdg-utils >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXScrnSaver[abi_x86_32(-)] x11-libs/libXcursor[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXinerama[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] !bundled-libs? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) games-misc/games-envd
+RESTRICT=bindist fetch splitdebug
+SLOT=0
+SRC_URI=dundef-linux-03052013.mojo.run
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b08a2396b9c6542b9eb8eab44b3a80db
diff --git a/games-rpg/dungeon-defenders/Manifest b/games-rpg/dungeon-defenders/Manifest
deleted file mode 100644
index e45bc19fa0ff..000000000000
--- a/games-rpg/dungeon-defenders/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dundef-linux-03052013.mojo.run 5384683543 BLAKE2B 76b4f8b64ffc89f2e53b36a6002b312c6523840d9ac96acacf7ec094271af70302ff26b8a73e2b16828cd90311a3f6b45b930b3e3d8083ea4ee7b8bda2ca27c9 SHA512 911d1691411d870cee62d08b0c559ac80588edc9ba0c9d622c7528f7f8635d86eae962f7a2b1bfed27be1d780c033216374f69072ed7828e8624855e9b0b9aca
-EBUILD dungeon-defenders-20130305.ebuild 2634 BLAKE2B 6e1f4306894c9fd63b0b2b3f71fb446c9360d40e1319ece854057f6ae3a08f0b6c884a013ba6142d584bbd12cc5df2dd2aed85818dc1cd75a2ed53698a347f52 SHA512 eaebd5f69e0a5ec3dbbe1196daa1c3aff8e6cb212995f564a556dd123223008a37a25e07509ff54f0cebbf43abe812a9fb211ffdb36df3e917bb4d109a5707d5
-MISC metadata.xml 355 BLAKE2B 2ebe0923f754bb09445457bb7f266a9fb673682281d31d70b39a05f1cd0beb682fa26e89861c46e9dab0f77428b916f9f99d8324b3780c795f317b6e06efde84 SHA512 78f8cc8f1f1be915da206e4b8be196a21b58a6f209023594755e481136a1b86ee31c8d0dfedd516d756a47db624e89728875b073b71c3b08ac94a5cde8ff3b83
diff --git a/games-rpg/dungeon-defenders/dungeon-defenders-20130305.ebuild b/games-rpg/dungeon-defenders/dungeon-defenders-20130305.ebuild
deleted file mode 100644
index 45442dfbaf87..000000000000
--- a/games-rpg/dungeon-defenders/dungeon-defenders-20130305.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: unbundle SDL-2 when it gets released
-
-EAPI=5
-inherit check-reqs eutils gnome2-utils unpacker games
-
-TIMESTAMP="${PV:4:2}${PV:6:2}${PV:0:4}"
-MY_PN="DungeonDefenders"
-DESCRIPTION="A hybrid of two hot genres: Tower Defense and cooperative online Action-RPG"
-HOMEPAGE="http://dungeondefenders.com/"
-SRC_URI="dundef-linux-${TIMESTAMP}.mojo.run"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="bundled-libs"
-RESTRICT="bindist fetch splitdebug"
-
-MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${MYGAMEDIR#/}/UDKGame/Binaries/${MY_PN}-x86
-	${MYGAMEDIR#/}/UDKGame/Binaries/libSDL2-2.0.so.0"
-CHECKREQS_DISK_BUILD="5916M"
-
-# linked against pulseaudio
-# without SDL-2 only linkage: opengl, openal
-DEPEND="app-arch/unzip"
-RDEPEND="
-	x11-misc/xdg-utils
-	>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-	>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXScrnSaver[abi_x86_32(-)]
-	x11-libs/libXcursor[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-	x11-libs/libXi[abi_x86_32(-)]
-	x11-libs/libXinerama[abi_x86_32(-)]
-	x11-libs/libXrandr[abi_x86_32(-)]
-	x11-libs/libXxf86vm[abi_x86_32(-)]
-	!bundled-libs? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )"
-
-S=${WORKDIR}/data
-
-pkg_nofetch() {
-	einfo "Please buy & download ${SRC_URI} from:"
-	einfo "  ${HOMEPAGE}"
-	einfo "and move it to ${DISTDIR}"
-	einfo
-}
-
-src_unpack() {
-	unpack_zip ${A}
-}
-
-src_prepare() {
-	# https://bugzilla.icculus.org/show_bug.cgi?id=5894
-	sed -i \
-		-e 's/LobbyLevel_Valentines2013.udk/LobbyLevel.udk/' \
-		UDKGame/Config/DefaultDunDef.ini || die
-
-	# Remove the binaries that we're unbundling and unnecessary stuff
-	rm -v UDKGame/Binaries/xdg-open || die
-	if ! use bundled-libs ; then
-		einfo "Removing bundled libs..."
-		rm -v UDKGame/Binaries/libopenal.so.1 || die
-	fi
-}
-
-src_install() {
-	# Move the data rather than copying. The game consumes over 5GB so
-	# a needless copy should really be avoided!
-	dodir "${MYGAMEDIR}"
-	mv -v Engine UDKGame "${D}${MYGAMEDIR}" || die
-
-	# use system xdg-open script, location is hardcoded
-	dosym /usr/bin/xdg-open "${MYGAMEDIR}"/UDKGame/Binaries/xdg-open
-
-	newicon -s 48 DunDefIcon.png ${PN}.png
-	make_desktop_entry "${PN}" "Dungeon Defenders"
-	games_make_wrapper ${PN} "./${MY_PN}-x86" "${MYGAMEDIR}/UDKGame/Binaries"
-
-	dodoc README-linux.txt
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/dungeon-defenders/metadata.xml b/games-rpg/dungeon-defenders/metadata.xml
deleted file mode 100644
index b878aaa1812d..000000000000
--- a/games-rpg/dungeon-defenders/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="bundled-libs">
-			Use the upstream provided bundled libraries.
-		</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-rpg/egoboo-2.8.1-r1 b/games-rpg/egoboo-2.8.1-r1
new file mode 100644
index 000000000000..fd93bdc86c21
--- /dev/null
+++ b/games-rpg/egoboo-2.8.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-games/physfs media-libs/libsdl[joystick,video] media-libs/sdl-image media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf net-libs/enet:0 virtual/glu virtual/opengl
+DESCRIPTION=A 3d dungeon crawling adventure in the spirit of NetHack
+EAPI=6
+HOMEPAGE=http://egoboo.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-games/physfs media-libs/libsdl[joystick,video] media-libs/sdl-image media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf net-libs/enet:0 virtual/glu virtual/opengl
+SLOT=0
+SRC_URI=mirror://sourceforge/egoboo/egoboo-2.8.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=bb5b3956e7cc3bc3f3ebcd8870c05127
diff --git a/games-rpg/egoboo/Manifest b/games-rpg/egoboo/Manifest
deleted file mode 100644
index 5b2fe184b5cd..000000000000
--- a/games-rpg/egoboo/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX egoboo-2.8.1-gentoo.patch 2233 BLAKE2B c2cf8754e956d1032461d9ee1ea6dae42e1969042647ec37bfc65f2fe702863386de406bfa35df76392bd38e65e10a9ec5956c84a83191fda767f53afee22121 SHA512 277e453c95ee908b064987eae732b37a6ee9c2d903532017eb8a8951458a16b5195694f8165ba7146b1ca609be6155e4df20212b8c3cb3b056c4249bc4f3e1f3
-DIST egoboo-2.8.1.tar.gz 150029960 BLAKE2B 582db0f3c033523f7b55e205aec5f7012301e3edb7a4667f49d6c4a26f99572b4652e3cf4b8ed0f9e4c4cf2f6129615a315955d0193f851fc7c16ab7eaf7e482 SHA512 5793a63ba90f461ae99bcb81bf4ddf287b203bc2d401e1f697f1f4f93e1d681954e09b23938eb1a36e7dd535e2d12b8882efd77572cc63392cad5f9462ac3054
-EBUILD egoboo-2.8.1-r1.ebuild 1254 BLAKE2B 93110e7e81f3df2960de016efb1da9b4aafdbf705727d287637b3ae880559561c0e7be806a75f7a395c89cecefce5b07333c95c30ab583c2777cd8d60d1d1990 SHA512 3ba98b1a1ed0a4af22dff6726ebc58e12c5cfca79575bc3f553ee9d196122803f5d870d0c7a93433ed46b6bf9733e4a553d82e9a44b98bf94e2e8d9e41ad5c01
-MISC metadata.xml 329 BLAKE2B e5d902b3bdacb0c6028e113c2617030dc6730c03b278cafc1ca077053ac9c9dc472d39a842fb18a506c979ae4f52dd21c1f4166f9e8f07289b8c66d6344c62a8 SHA512 c3152f5db54eb4ae254c36981adb9556ff0eb37b267cd1dd25efc1428249d826e4c37b6166034acf98229f6f3ac681d7edb9681c69fd2f88e9394dff04fbd5fb
diff --git a/games-rpg/egoboo/egoboo-2.8.1-r1.ebuild b/games-rpg/egoboo/egoboo-2.8.1-r1.ebuild
deleted file mode 100644
index 108aefdfcecc..000000000000
--- a/games-rpg/egoboo/egoboo-2.8.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="A 3d dungeon crawling adventure in the spirit of NetHack"
-HOMEPAGE="http://egoboo.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-games/physfs
-	media-libs/libsdl[joystick,video]
-	media-libs/sdl-image
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-ttf
-	net-libs/enet:0
-	virtual/glu
-	virtual/opengl"
-RDEPEND=${DEPEND}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_prepare() {
-	edos2unix src/game/platform/file_linux.c \
-		src/game/network.c \
-		src/game/Makefile
-	default
-	sed -i \
-		-e "s:@GENTOO_CONFDIR@:/etc/${PN}:" \
-		-e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
-		src/game/platform/file_linux.c || die "sed failed"
-	rm -rf src/enet || die
-}
-
-src_compile() {
-	emake -C src/game PROJ_NAME=egoboo-2.x
-}
-
-src_install() {
-	dodoc BUGS.txt Changelog.txt doc/*.txt doc/*.pdf
-
-	insinto /usr/share/${PN}
-	doins -r basicdat modules
-	insinto /etc/${PN}
-	doins -r controls.txt setup.txt
-
-	newbin src/game/egoboo-2.x ${PN}
-
-	newicon basicdat/icon.bmp ${PN}.bmp
-	make_desktop_entry ${PN} Egoboo /usr/share/pixmaps/${PN}.bmp
-}
diff --git a/games-rpg/egoboo/files/egoboo-2.8.1-gentoo.patch b/games-rpg/egoboo/files/egoboo-2.8.1-gentoo.patch
deleted file mode 100644
index 2f1205a45118..000000000000
--- a/games-rpg/egoboo/files/egoboo-2.8.1-gentoo.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/src/game/platform/file_linux.c	2012-04-29 21:45:29.627419281 +0200
-+++ b/src/game/platform/file_linux.c	2012-04-29 21:45:29.628419211 +0200
-@@ -79,9 +79,9 @@
-     strncpy( linux_dataPath,   PREFIX "/share/games/egoboo-2.x", SDL_arraysize( linux_dataPath ) );
- #else
-     // these are read-only directories
--    strncpy( linux_configPath, "/etc/egoboo-2.x/",         SDL_arraysize( linux_configPath ) );
-+    strncpy( linux_configPath, "@GENTOO_CONFDIR@",         SDL_arraysize( linux_configPath ) );
-     strncpy( linux_binaryPath, "/games/",                  SDL_arraysize( linux_binaryPath ) );
--    strncpy( linux_dataPath,   "/share/games/egoboo-2.x/", SDL_arraysize( linux_dataPath ) );
-+    strncpy( linux_dataPath,   "@GENTOO_DATADIR@", SDL_arraysize( linux_dataPath ) );
- #endif
- 
-     // the log file cannot be started until there is a user data path to dump the file into
---- a/src/game/network.c	2012-04-29 20:14:31.482179973 +0200
-+++ b/src/game/network.c	2012-04-29 20:14:52.077730184 +0200
-@@ -37,7 +37,7 @@
- #include "egoboo_setup.h"
- #include "egoboo.h"
- 
--#include "enet/enet.h"
-+#include <enet/enet.h>
- #include "file_common.h"
- 
- #include <stdarg.h>
---- a/src/game/Makefile	2012-04-29 20:17:09.303070070 +0200
-+++ b/src/game/Makefile	2012-04-29 20:18:21.047023847 +0200
-@@ -33,8 +33,7 @@
- # the compiler options
- 
--CC      := gcc
--INC     := -I. -I.. -I../enet/include ${SDLCONF_I} -I./extensions -I./file_formats -I./platform
--LDFLAGS := ${SDLCONF_L} -L../enet/lib -lSDL_ttf -lSDL_mixer -lGL -lGLU -lSDL_image -lphysfs -lenet
-+INC     := -I. -I.. ${SDLCONF_I} -I./extensions -I./file_formats -I./platform
-+LDLIBS := ${SDLCONF_L} -lSDL_ttf -lSDL_mixer -lGL -lGLU -lSDL_image -lphysfs -lenet -lm
- 
- # use different options if the environmental variable PREFIX is defined
- ifdef ($(PREFIX),"")
-@@ -43,7 +43,7 @@
- 	OPT := -Os -Wall -DPREFIX=\"${PREFIX}\" -D_NIX_PREFIX
- endif
- 
--CFLAGS  := ${OPT} ${INC}
-+CFLAGS  += ${INC} -DENET11
- 
- #------------------------------------
- # definitions of the target projects
-@@ -52,7 +52,7 @@
- all: ${EGO_BIN}
- 
- ${EGO_BIN}: ${EGO_OBJ} 
--	${CC} -o $@ $^ ${LDFLAGS} ${CFLAGS}
-+	${CC} -o $@ $^ ${LDFLAGS} ${CFLAGS} ${LDLIBS}
- 
- clean:
- 	rm -f ${ENET_OBJ} ${EGO_OBJ} ${EGO_BIN}
diff --git a/games-rpg/egoboo/metadata.xml b/games-rpg/egoboo/metadata.xml
deleted file mode 100644
index d8a2d5fe278b..000000000000
--- a/games-rpg/egoboo/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">egoboo</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-rpg/eschalon-book-1-demo-106-r1 b/games-rpg/eschalon-book-1-demo-106-r1
new file mode 100644
index 000000000000..ba1f47962654
--- /dev/null
+++ b/games-rpg/eschalon-book-1-demo-106-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=A classic role-playing game
+EAPI=6
+HOMEPAGE=http://basiliskgames.com/eschalon-book-i
+KEYWORDS=~amd64 ~x86
+LICENSE=eschalon-book-1-demo
+RDEPEND=>=media-libs/freetype-2.5.0.1[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)]
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~calchan/distfiles/eschalon-book-1-demo-106.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=acb2fdc373a18946662b7d8adda2294f
diff --git a/games-rpg/eschalon-book-1-demo/Manifest b/games-rpg/eschalon-book-1-demo/Manifest
deleted file mode 100644
index dbbf6a8ef807..000000000000
--- a/games-rpg/eschalon-book-1-demo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST eschalon-book-1-demo-106.tar.gz 83157919 BLAKE2B 71d6cf6d814e871d69b7a3df6549bad7aa3497f6dc6ac546cea8cb009141ee6c4538be5ebd94207b15e5259aa65e50f1c01c31e82a3950773e57dea012aef43d SHA512 7229cb48ad02b1842ac71fec03f5ea3e0df8f895409222a764c8505586a1ceb350dc4b57b4c9eed528ef0984bb60d406f41df26d5b7e8157d0f22b8ded590d66
-EBUILD eschalon-book-1-demo-106-r1.ebuild 870 BLAKE2B 1f2cce9ecee9dbeb9aa4f2e15be8eef437246dc7a49defd5387d556617ad409cfe5e6638a24383a873400054b074e4aad9ef20b6740e8b0b4ac47354c1a93586 SHA512 24c8c3649aa29e9385e911eafdecb599e791dffe7d57f74607022e90faea388c40edd6978f7637f4b24c52ac8025083635c5a5a1c7682b4eb16793a01f514119
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-rpg/eschalon-book-1-demo/eschalon-book-1-demo-106-r1.ebuild b/games-rpg/eschalon-book-1-demo/eschalon-book-1-demo-106-r1.ebuild
deleted file mode 100644
index 62333050eaec..000000000000
--- a/games-rpg/eschalon-book-1-demo/eschalon-book-1-demo-106-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="A classic role-playing game"
-HOMEPAGE="http://basiliskgames.com/eschalon-book-i"
-SRC_URI="https://dev.gentoo.org/~calchan/distfiles/${P}.tar.gz"
-
-LICENSE="eschalon-book-1-demo"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-QA_PREBUILT="opt/*"
-
-RDEPEND="
-	>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXxf86vm[abi_x86_32(-)]
-	virtual/glu[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]"
-
-S="${WORKDIR}/Eschalon Book I Demo"
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r data music sound *pdf *pak help.txt
-
-	exeinto /opt/${PN}
-	doexe "Eschalon Book I Demo"
-
-	make_desktop_entry ${PN} "Eschalon: Book I (Demo)"
-	make_wrapper ${PN} "\"./Eschalon Book I Demo\"" /opt/${PN}
-}
diff --git a/games-rpg/eschalon-book-1-demo/metadata.xml b/games-rpg/eschalon-book-1-demo/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-rpg/eschalon-book-1-demo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/eternal-lands-1.9.3-r2 b/games-rpg/eternal-lands-1.9.3-r2
new file mode 100644
index 000000000000..bc7a5eb4ebcb
--- /dev/null
+++ b/games-rpg/eternal-lands-1.9.3-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=dev-libs/libxml2:= media-libs/cal3d:=[-16bit-indices] media-libs/freealut media-libs/libpng:0= media-libs/libsdl:=[X,opengl,video] media-libs/libvorbis:= media-libs/openal:= media-libs/sdl-image:= media-libs/sdl-net:= >=games-rpg/eternal-lands-data-1.9.3 sys-libs/zlib:=[minizip] virtual/glu virtual/opengl x11-libs/libX11:= x11-libs/libXau:= x11-libs/libXdmcp:= x11-libs/libXext:= >=app-eselect/eselect-opengl-1.0.6-r1 app-arch/unzip virtual/pkgconfig doc? ( app-doc/doxygen media-gfx/graphviz ) media-libs/glew >=sys-apps/sed-4
+DESCRIPTION=An online MMORPG written in C and SDL
+EAPI=5
+HOMEPAGE=http://www.eternal-lands.com
+IUSE=debug doc kernel_linux
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=eternal_lands
+RDEPEND=dev-libs/libxml2:= media-libs/cal3d:=[-16bit-indices] media-libs/freealut media-libs/libpng:0= media-libs/libsdl:=[X,opengl,video] media-libs/libvorbis:= media-libs/openal:= media-libs/sdl-image:= media-libs/sdl-net:= >=games-rpg/eternal-lands-data-1.9.3 sys-libs/zlib:=[minizip] virtual/glu virtual/opengl x11-libs/libX11:= x11-libs/libXau:= x11-libs/libXdmcp:= x11-libs/libXext:= games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://gentoo/elc_1.9.3-20120213.tar.bz2 https://dev.gentoo.org/~rich0/distfiles/eternal-lands.png
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=35d7d63aa53fcbf45a7c100576a89daa
diff --git a/games-rpg/eternal-lands-bloodsucker-3.0_p20110618 b/games-rpg/eternal-lands-bloodsucker-3.0_p20110618
new file mode 100644
index 000000000000..4648e1931638
--- /dev/null
+++ b/games-rpg/eternal-lands-bloodsucker-3.0_p20110618
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=games-rpg/eternal-lands-data[bloodsuckermaps]
+DESCRIPTION=Non-official map pack for Eternal Lands
+EAPI=5
+HOMEPAGE=http://maps.el-pl.org/
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=CC-BY-NC-SA-3.0
+RDEPEND=games-rpg/eternal-lands-data[bloodsuckermaps] games-misc/games-envd
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~rich0/distfiles/eternal-lands-bloodsucker-3.0_p20110618.tar.bz2
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8fba4ec2410050763db06a66ad647015
diff --git a/games-rpg/eternal-lands-bloodsucker/Manifest b/games-rpg/eternal-lands-bloodsucker/Manifest
deleted file mode 100644
index 8ef5acdbdf58..000000000000
--- a/games-rpg/eternal-lands-bloodsucker/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST eternal-lands-bloodsucker-3.0_p20110618.tar.bz2 48324713 BLAKE2B 9977781e197b4ecdcf0dbf8991efc8a301234009257bd13ccde828937f3f9bc2dca97d566027ba5088e3d9d4620df9f852cef70dbebb05232e25fe3a9236e463 SHA512 951083ae5170929d64efa79962a19ab2481df956c316aecc32179478c4d56dd4d23282fa428974865216877b493a8729bdbedb0396b6c11670f6ee094c334fe4
-EBUILD eternal-lands-bloodsucker-3.0_p20110618.ebuild 801 BLAKE2B 36886285e9f15808bce7faede96151a5066c1939aa1d4b853185026ec3c2c508f3cb80cb0944e33a7e7f4647fca324fb4c6928e8bfd67a1450cd523d98f918d0 SHA512 4e36f00309f5e814508aae3337f14cf006503bc3e9cdfffb249bccfe7be6de81187b6f5de8aaa49a5d94824177a49f69e98f626e895bb769f6380e6469ab6ea1
-MISC metadata.xml 495 BLAKE2B bce2303bc9276aa8fa835a445f327e92393af54229d3f8da74d3e85812c0b4ac3a7bd387f1d9e4e306c069033501e6006e7bc9cd882ffb503e1a506f4726dd62 SHA512 5f54f31c6ba0b928da9389da93fe13f64e3ce5df24028f2a876e01c0ff2365e4764279739edbd1bf0f866c8b58ae3ba5d10c44898fbb64401cd6097c4a629fc0
diff --git a/games-rpg/eternal-lands-bloodsucker/eternal-lands-bloodsucker-3.0_p20110618.ebuild b/games-rpg/eternal-lands-bloodsucker/eternal-lands-bloodsucker-3.0_p20110618.ebuild
deleted file mode 100644
index a25ad27fdb7d..000000000000
--- a/games-rpg/eternal-lands-bloodsucker/eternal-lands-bloodsucker-3.0_p20110618.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils games
-
-DESCRIPTION="Non-official map pack for Eternal Lands"
-HOMEPAGE="http://maps.el-pl.org/"
-SRC_URI="https://dev.gentoo.org/~rich0/distfiles/${P}.tar.bz2"
-LICENSE="CC-BY-NC-SA-3.0"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-
-IUSE=""
-
-DEPEND="games-rpg/eternal-lands-data[bloodsuckermaps]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-src_install() {
-	insopts -m 0660
-	insinto "${GAMES_DATADIR}/eternal-lands"
-	doins -r maps
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "Note that the Bloodsucker Maps are not official maps and are not"
-	elog "supported by the Eternal Lands team."
-	elog "Please do not bother Eternal Lands staff about bugs with the maps."
-}
diff --git a/games-rpg/eternal-lands-bloodsucker/metadata.xml b/games-rpg/eternal-lands-bloodsucker/metadata.xml
deleted file mode 100644
index 87c0e5ac4cf8..000000000000
--- a/games-rpg/eternal-lands-bloodsucker/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>rich0@gentoo.org</email>
-  <name>Rich Freeman</name>
-</maintainer>
-<maintainer type="project">
-  <email>games@gentoo.org</email>
-  <name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>The Bloodsucker Maps are an add-on for Eternal Lands and provide enhanced non-official maps for the game.</longdescription>
-</pkgmetadata>
diff --git a/games-rpg/eternal-lands-data-1.9.3-r1 b/games-rpg/eternal-lands-data-1.9.3-r1
new file mode 100644
index 000000000000..646dbf6df396
--- /dev/null
+++ b/games-rpg/eternal-lands-data-1.9.3-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare
+DEPEND=app-arch/unzip !bloodsuckermaps? ( !games-rpg/eternal-lands-bloodsucker )
+DESCRIPTION=An online MMORPG written in C and SDL
+EAPI=6
+HOMEPAGE=http://www.eternal-lands.com
+IUSE=bloodsuckermaps music sound
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=eternal_lands
+PDEPEND=bloodsuckermaps? ( >=games-rpg/eternal-lands-bloodsucker-3.0_p20110618 )
+SLOT=0
+SRC_URI=http://www.eternal-lands.com/el_linux_193.zip music? ( mirror://gentoo/el_music_full-20060803.zip ) sound? ( http://www.eternallands.co.uk/EL_sound_191.zip )
+_md5_=050f11c1291f2a92e80f143292a748eb
diff --git a/games-rpg/eternal-lands-data/Manifest b/games-rpg/eternal-lands-data/Manifest
deleted file mode 100644
index 0576dca4f609..000000000000
--- a/games-rpg/eternal-lands-data/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST EL_sound_191.zip 43002046 BLAKE2B 450fd0fbff0fefbbffb1154ecb3e1e97ec8eb447d961e1442900af629c612c5a6f14f673a0c2820f7403b79ae0b4920a17f1e2a1b3457a5cc47daca0deb54bca SHA512 cc4103d6cdafffcf3926f0e90ca2555b09b22d9e00947f9e1790cfa5b7c945cff16f935ede886b498ac86028b77e8f1ead6eecab2d59848100233eed373c1310
-DIST el_linux_193.zip 67104165 BLAKE2B 8e83cc00ef766f829793880952cf852adc7081a095ee3cee4f483c6fff7f9c0a293556483506fe4d09b5681ea7b7c5796e876a92e06f739d92b5fba1e7129f51 SHA512 95de984998bfc27525b7986895d1154a74c6e4dbffb9bf115c1284213acf56a470967b55e0507ed6aacd67f972bce4689aa7cffb9acd16d92bf448f195dc4f0c
-DIST el_music_full-20060803.zip 65511882 BLAKE2B 618fe476473f00371f50f9249a11aaa7b9da28caae41e072f6cf6a5d74d640b58182586f92a770bef45c80f19c1b46408b6ac2625972ba804d4c1967f01546c6 SHA512 dbd24cb20331d3640b3a5891faaf88aa0e71ba0564dfde347f2ea0fcb7e0f2700f1324ee8e988c551efb943183bbc823d4ee0373ed2b1f6d0300df76e25a524c
-EBUILD eternal-lands-data-1.9.3-r1.ebuild 3170 BLAKE2B 0868cf1594d2acf6f0cb853674c9de2de381a09f777cffd798a14f1f7d9d0ee13697fa927a4c5e978bf61c0270a9eaa5bdf73af9e1f76b70819500a270352d6e SHA512 98ed0c7cfa0ef77b571195fce7ac9ddc1d1e749fe12c935101405222800efe5f3b0226f16d4e100b8d21e80acb6ab4290ad7d52bd8919b0debe52b08575d877c
-MISC metadata.xml 707 BLAKE2B 27ac7d1be17ce87ec9f76b8b6613a995a315f775b22b04adc7bfce8af873196145fa32f76557e8b03da3215f1aa8e847072ed7f355aee288820810cbbd515dae SHA512 1128694f4485b282c424ab67e933779dc10265f051078d62fdab077a13c7d95888b55d048402474501a4483dd1d52189295d3c08ef8e298640153d3fbd3261cd
diff --git a/games-rpg/eternal-lands-data/eternal-lands-data-1.9.3-r1.ebuild b/games-rpg/eternal-lands-data/eternal-lands-data-1.9.3-r1.ebuild
deleted file mode 100644
index cdcd0ac6284b..000000000000
--- a/games-rpg/eternal-lands-data/eternal-lands-data-1.9.3-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MUSIC_DATE="20060803"
-
-MY_PV="${PV//_/}"
-MY_PV="${MY_PV//./}"
-MY_PN="${PN%*-data}"
-DESCRIPTION="An online MMORPG written in C and SDL"
-HOMEPAGE="http://www.eternal-lands.com"
-SRC_URI="http://www.eternal-lands.com/el_linux_193.zip
-		music? ( mirror://gentoo/el_music_full-${MUSIC_DATE}.zip )
-		sound? ( http://www.eternallands.co.uk/EL_sound_191.zip )"
-# WARNING: The music file is held at
-# http://www.eternal-lands.com/page/music.php
-# We only mirror it so that it is versioned by the date we mirrored it
-# AND prefixed with el_ so as not cause any conflicts. Maybe oneday they will
-# version their music, maybe not.
-
-LICENSE="eternal_lands"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="bloodsuckermaps music sound"
-
-DEPEND="app-arch/unzip
-	!bloodsuckermaps? ( !games-rpg/eternal-lands-bloodsucker )"
-
-PDEPEND="bloodsuckermaps? ( >=games-rpg/eternal-lands-bloodsucker-3.0_p20110618 )"
-
-# Maybe one day upstream will do things in a consistent way.
-S="${WORKDIR}/el_linux"
-
-src_prepare() {
-	# Move our music files to the correct directory
-	if use music ; then
-		mkdir music || die
-		mv ../*.ogg ../*.pll music || die
-	fi
-
-	# Fix assertion error with >=libxml2-2.9 (see bug #449352)
-	xmllint --noent actor_defs/actor_defs.xml > actor_defs.xml || die "Failed parsing actor_defs.xml"
-	mv actor_defs.xml actor_defs || die
-	eapply_user
-}
-
-src_install() {
-	# These are provided by eternal-lands ebuild
-
-	rm license.txt
-	rm commands.lst
-
-	# don't install maps if using alternate maps
-	if use bloodsuckermaps ; then
-		rm maps/anitora.dds maps/cave1.dds maps/cont2map10.dds
-		rm maps/cont2map11.dds maps/cont2map12.dds maps/cont2map13.dds
-		rm maps/cont2map14.dds maps/cont2map15.dds maps/cont2map16.dds
-		rm maps/cont2map17.dds maps/cont2map18.dds maps/cont2map19.dds
-		rm maps/cont2map1.dds maps/cont2map20.dds maps/cont2map21.dds
-		rm maps/cont2map22.dds maps/cont2map23.dds maps/cont2map24.dds
-		rm maps/cont2map2.dds maps/cont2map3.dds maps/cont2map4.dds
-		rm maps/cont2map5.dds maps/cont2map6.dds maps/cont2map7.dds
-		rm maps/cont2map8.dds maps/cont2map9.dds maps/irilion.dds
-		rm maps/legend.dds maps/map11.dds maps/map12.dds
-		rm maps/map13.dds maps/map14f.dds maps/map15f.dds
-		rm maps/map2.dds maps/map3.dds maps/map4f.dds
-		rm maps/map5nf.dds maps/map6nf.dds maps/map7.dds
-		rm maps/map8.dds maps/map9f.dds maps/seridia.dds
-		rm maps/startmap.dds
-	fi
-
-	insopts -m 0660
-	insinto /usr/share/games/eternal-lands
-	doins -r 2dobjects 3dobjects actor_defs animations maps meshes \
-		particles skeletons shaders textures languages shaders skybox \
-		*.lst 3dobjects.txt *.xml \
-		|| die "doins failed"
-
-	if use music ; then
-		doins -r music
-	fi
-
-	# Removed sound from above - need to handle sound support
-
-	cd "${WORKDIR}"
-	if use sound ; then
-	   doins -r sound
-	fi
-}
-
-pkg_postinst() {
-	# Ensure that the files are writable by the game group for auto
-	# updating.
-	chmod -R g+rw "${EROOT}"usr/share/games/eternal-lands || die
-
-	# Make sure new files stay in games group
-	find "${EROOT}"usr/share/games/eternal-lands -type d -exec chmod g+sx {} \; || die
-}
diff --git a/games-rpg/eternal-lands-data/metadata.xml b/games-rpg/eternal-lands-data/metadata.xml
deleted file mode 100644
index 35a82f4ea804..000000000000
--- a/games-rpg/eternal-lands-data/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>rich0@gentoo.org</email>
-		<name>Rich Freeman</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription>
-		Eternal Lands is a FREE MMORPG (massively multiplayer online role playing game)
-	</longdescription>
-	<use>
-		<flag name="bloodsuckermaps">Will install Bloodsucker's Maps in place of the official map files</flag>
-		<flag name="music">Enables in-game music</flag>
-		<flag name="sound">Enables in-game sound effects</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-rpg/eternal-lands/Manifest b/games-rpg/eternal-lands/Manifest
deleted file mode 100644
index 2773c00f1671..000000000000
--- a/games-rpg/eternal-lands/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX eternal-lands-1.9.3-build.patch 16222 BLAKE2B c7da08215575f6a39fd586842f6a872706356f8c203abdb8865de325651d5e9e9e2976da5720cbe05144cc49bf9908667ce910b09bbc32e8a32e6ec82bd2b287 SHA512 b268c0f1dab0f86bfcea3d13122983c4efdbf9941d1851618a01986b2fc36139350e830c6838c229f7ffbb69fd51a46d06277eb43167a47e192b86db710dcfc7
-AUX eternal-lands-1.9.3-glbuild.patch 581 BLAKE2B 448e86a18de71390225c4bacb5d824da63db9c0213629c618856de0634d7b9fca97c22558031d79c2a7f69c273b7e68d02fde04c82d2d42b339227ebd7e5b35c SHA512 583b306f98975e8d86314519cfd0034870d07a2d908de9ac2fae9eba50ce90acc7f8949fbe40379a13308ebfdf33379f5801ccfe83d67c318b8edc3ddc0a9ed5
-AUX eternal-lands-1.9.3-minizip.patch 2142 BLAKE2B 6b3e12d4cfe47f5e808c7218b72f1f3ce571cacc5e916951068f1e589d8f00056add853d0d45ad72d060cd787f25c0d5f839359c39dbffc29ebfe7ef1a92c759 SHA512 2a560c99504a649de7d01d08bb4d92cdd803e6c91b2ef2d1e82449268e8248b468fb8bb855e8e73396e8d4e5e2def44bda9df07f654b730bb25b509550d0f826
-DIST elc_1.9.3-20120213.tar.bz2 2401172 BLAKE2B 496315a0d09d0b7cb99a77c77965d3d85a675659ae1970dc2c7c7560146b165a48a35f6dfd7eb461d4347ee2023df91ba47c05120957f52f777ea530e868b8d9 SHA512 3580d3ceb94094443ef25f6e4880c9ffe3fff256c8d8e6657b4e0683a05184da9e6a76264557d2065a8187e3d36febd9d30ff5adff83a17607b1e478be90fabc
-DIST eternal-lands.png 9955 BLAKE2B 376f6826bab88e798c39d79f00bd8c8758798b70beb980d44bfcdf0c4afb696ea15f58177267ddf189ce53ef6c2c33efdcf507f5135ccc000b56ca28de078f80 SHA512 c77571c949bb43fa7f95ae58f863ed972cfc76e184de5d0fa0a3599e4f7539f6334b843233b61fc807c90ef270d87cd57494510ce559427b592d255c198729bf
-EBUILD eternal-lands-1.9.3-r2.ebuild 2853 BLAKE2B 4431c51b3390d8b9bbe525d3c5a246ba3ca87a35e1a1d0fd0c54a83e81dd535062d693bd34b526e86502499d14a91a44ec9f302ed4d2e1e278a5ac4c5c30eb49 SHA512 d67cbfb1b521709f783ddb4429de88500efe327c89cf1a9c37043efa8a86fa28877621c158cd867a600b9b7e93818fc5b78aefa3cb967cb631d76321ec37bfcf
-MISC metadata.xml 482 BLAKE2B c0d2df678bcef1eb71b0a5f8824c90cd8d0f0b2fe5edf05db77e37d916b9a313dad3cdcbb64b08f793aef403dd6b79023a83584ce79073f7428a553da787e1dd SHA512 cb16ba8f0737fc26263d31d90e70d7468df8cb3fb09f7777f8c59b198f0f47d2139d5fc81597f7c63bff1afa242b60ab009f645c9269092ddc40dad2f2c62e1f
diff --git a/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild b/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild
deleted file mode 100644
index 02a7b89440be..000000000000
--- a/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic gnome2-utils games
-
-DESCRIPTION="An online MMORPG written in C and SDL"
-HOMEPAGE="http://www.eternal-lands.com"
-SRC_URI="mirror://gentoo/elc_1.9.3-20120213.tar.bz2
-	https://dev.gentoo.org/~rich0/distfiles/${PN}.png"
-
-LICENSE="eternal_lands"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="debug doc kernel_linux"
-
-RDEPEND="dev-libs/libxml2:=
-	media-libs/cal3d:=[-16bit-indices]
-	media-libs/freealut
-	media-libs/libpng:0=
-	media-libs/libsdl:=[X,opengl,video]
-	media-libs/libvorbis:=
-	media-libs/openal:=
-	media-libs/sdl-image:=
-	media-libs/sdl-net:=
-	>=games-rpg/eternal-lands-data-1.9.3
-	sys-libs/zlib:=[minizip]
-	virtual/glu
-	virtual/opengl
-	x11-libs/libX11:=
-	x11-libs/libXau:=
-	x11-libs/libXdmcp:=
-	x11-libs/libXext:="
-DEPEND="${RDEPEND}
-	>=app-eselect/eselect-opengl-1.0.6-r1
-	app-arch/unzip
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen
-		media-gfx/graphviz )
-	media-libs/glew"
-
-S="${WORKDIR}/elc"
-
-src_prepare() {
-	local BROWSER="firefox"
-
-	sed -i \
-		-e 's/#browser/browser/g' \
-		-e "s/browser = mozilla/#browser = ${BROWSER}/g" \
-		-e "s@#data_dir = /usr/local/games/el/@#data_dir = ${GAMES_DATADIR}/${PN}/@g" \
-		el.ini || die "sed failed"
-
-	# Finally, update the server
-	sed -i -e '/#server_address =/ s/.*/#server_address = game.eternal-lands.com/' \
-		el.ini || die "sed failed"
-
-	epatch "${FILESDIR}/${PN}-1.9.3-glbuild.patch"
-	epatch "${FILESDIR}/${PN}-1.9.3-build.patch"
-	epatch "${FILESDIR}/${PN}-1.9.3-minizip.patch"
-
-	# remove bundled minizip
-	rm io/{crypt,ioapi,unzip,zip}.h || die
-	rm io/{ioapi,unzip,zip}.c || die
-
-	cp Makefile.linux Makefile
-}
-
-src_compile() {
-	emake \
-		DEBUG="$(usex debug)" \
-		BSD_KERNEL="$(usex !kernel_linux)" \
-		DATADIR="${GAMES_DATADIR}/${PN}/"
-
-	if use doc; then
-		emake docs
-		mv ./docs/html/ ../client || die "Failed to move documentation directory"
-	fi
-}
-
-src_install() {
-	dogamesbin el
-	make_desktop_entry el "Eternal Lands"
-
-	insopts -m 0660
-	insinto "${GAMES_DATADIR}/${PN}"
-
-	doins -r *.ini *.txt commands.lst
-
-	if use doc ; then
-		dohtml -r "${WORKDIR}"/client/*
-	fi
-
-	doicon -s 64 "${DISTDIR}/${PN}.png"
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-	elog "Auto Update is now enabled in Eternal Lands"
-	elog "If an update occurs then the client will suddenly exit"
-	elog "Updates only happen when the game first loads"
-	elog "Please don't report this behaviour as a bug"
-
-	# Ensure that the files are writable by the game group for auto
-	# updating.
-	chmod -R g+rw "${ROOT}/${GAMES_DATADIR}/${PN}"
-
-	# Make sure new files stay in games group
-	find "${ROOT}/${GAMES_DATADIR}/${PN}" -type d -exec chmod g+sx {} \;
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.3-build.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.3-build.patch
deleted file mode 100644
index 989bf2700d88..000000000000
--- a/games-rpg/eternal-lands/files/eternal-lands-1.9.3-build.patch
+++ /dev/null
@@ -1,314 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Jun 24 13:32:38 UTC 2012
-Subject: build system
-
-respect all flags
-respect compiler
-add options for DATADIR, BSD_KERNEL and DEBUG
-use proper pkgconfig calls
-remove needless build types
-rename EXE to "el"
-
---- elc/Makefile.linux
-+++ elc/Makefile.linux
-@@ -3,16 +3,54 @@
- -include make.conf
- 
- # basic compiling and linking - rarely changed
--OPTIONS = -DLINUX -DELC $(foreach FEATURE, $(FEATURES), -D$(FEATURE)) -D_7ZIP_ST
--CFLAGS=$(PLATFORM) $(CWARN) -O0 -ggdb -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
--_CFLAGS=$(PLATFORM) -O2 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
--CXXFLAGS=$(PLATFORM) $(CXXWARN) -O0 -ggdb -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
--_CXXFLAGS=$(PLATFORM) -O3 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
--
--PNG_SCREENSHOT_LIBS = -lpng
--LDFLAGS=$(shell sdl-config --libs) $(shell xml2-config --libs) -lSDL_net -lSDL_image -lopenal $(XDIR) -lGL -lGLU -lcal3d -lm $(EXTRA_LIBS) -lz -lpng -lvorbis -lvorbisfile \
--	$(foreach FEATURE, $(FEATURES), $($(FEATURE)_LIBS))
--_LDFLAGS=$(XDIR) -lGL -lpthread -lstdc++
-+CC ?= gcc
-+CXX ?= g++
-+
-+# some options
-+DATADIR ?= /usr/share/games/eternal-lands
-+
-+CPPFLAGS += -DDATA_DIR=\"$(DATADIR)\" \
-+	    -DLINUX \
-+	    -DELC \
-+	    $(foreach FEATURE, $(EL_FEATURES), -D$(FEATURE)) \
-+	    -D_7ZIP_ST
-+
-+ifeq ($(BSD_KERNEL),yes)
-+CPPFLAGS += -DBSD
-+endif
-+
-+ifeq ($(DEBUG),yes)
-+CPPFLAGS += -DMEMORY_DEBUG
-+endif
-+
-+CFLAGS += $(shell sdl-config --cflags) \
-+	  $(shell xml2-config --cflags) \
-+	  -fno-strict-aliasing \
-+	  $(EXTRA_INCLUDES)
-+
-+CXXFLAGS += $(shell sdl-config --cflags) \
-+	    $(shell xml2-config --cflags) \
-+	    -fno-strict-aliasing \
-+	    $(EXTRA_INCLUDES)
-+
-+LIBS += $(shell pkg-config --libs x11) \
-+	$(shell sdl-config --libs) \
-+	$(shell xml2-config --libs) \
-+	$(shell pkg-config --libs SDL_net) \
-+	$(shell pkg-config --libs SDL_image) \
-+	$(shell pkg-config --libs openal) \
-+	$(shell pkg-config --libs freealut) \
-+	$(shell pkg-config --libs gl) \
-+	$(shell pkg-config --libs glu) \
-+	$(shell pkg-config --libs cal3d) \
-+	$(shell pkg-config --libs libpng) \
-+	$(shell pkg-config --libs vorbis) \
-+	$(shell pkg-config --libs vorbisfile) \
-+	$(shell pkg-config --libs zlib) \
-+	-lm \
-+	$(EXTRA_LIBS) \
-+	$(foreach FEATURE, $(EL_FEATURES), $($(FEATURE)_LIBS)) \
-+	-lstdc++
- 
- # This works on Ubuntu 8.04 (LTS) at least
- # Install these packages in addition to those required for a standard build
-@@ -59,7 +97,7 @@
- 	xz/CpuArch.o xz/Delta.o xz/LzFind.o xz/Lzma2Dec.o xz/Lzma2Enc.o	\
- 	xz/LzmaDec.o xz/LzmaEnc.o xz/Sha256.o xz/Xz.o xz/XzCrc64.o xz/XzDec.o	\
- 	xz/XzEnc.o	\
--	$(foreach FEATURE, $(FEATURES), $($(FEATURE)_COBJ))
-+	$(foreach FEATURE, $(EL_FEATURES), $($(FEATURE)_COBJ))
- 	
- CXXOBJS=actor_init.o cal3d_wrapper.o context_menu.o optimizer.o sendvideoinfo.o	\
- 	exceptions/extendedexception.o xml/xmlhelper.o quest_log.o	\
-@@ -80,7 +118,7 @@
- 	eye_candy/effect_mines.o eye_candy/effect_missile.o \
- 	eye_candy/orbital_mover.o eye_candy/kepler_orbit.o	\
- 	eye_candy/effect_staff.o \
--	$(foreach FEATURE, $(FEATURES), $($(FEATURE)_CXXOBJ))
-+	$(foreach FEATURE, $(EL_FEATURES), $($(FEATURE)_CXXOBJ))
- 
- OBJS=$(COBJS) $(CXXOBJS)
- HEADER_DIRS = . books eye_candy io pawn fsaa engine xz
-@@ -89,24 +127,13 @@
- DEP_FILES=$(foreach OBJ, $(COBJS), .deps/$(OBJ).P) $(foreach OBJ, $(CXXOBJS), .deps/$(OBJ).P)
- #(shell echo $OBJ |sed s/\.o/\.P/))
- 
--EXE=el.x86.linux.bin
--
--ifndef CC
--CC=gcc
--endif
--ifndef CXX
--CXX=g++
--endif
--ifndef LINK
--LINK=gcc
--endif
-+EXE=el
- 
- all: $(EXE)
- 
- # the compile targets
- $(EXE): $(OBJS)
--	@echo "  LINK $(EXE)"
--	@$(LINK) $(CFLAGS) -o $(EXE) $(OBJS) $(LDFLAGS)
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(EXE) $(OBJS) $(LIBS)
- 
- #recompile on Makefile or conf change
- #.depend $(OBJS): Makefile.linux make.conf
-@@ -114,25 +141,19 @@
- DEPS_MAGIC := $(shell mkdir .deps .deps/io .deps/shader .deps/eye_candy .deps/exceptions .deps/xz .deps/xml .deps/fsaa .deps/engine > /dev/null 2>&1 || :)
- 
- $(COBJS): %.o: %.c Makefile.linux make.conf
--	@echo "  CC   $@"
--	@if $(CC) $(CFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \
-+	@echo "$(CC) $(CFLAGS) $(CPPFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@"
-+	@if $(CC) $(CFLAGS) $(CPPFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \
- 		mv ".deps/$@.pp" ".deps/$@.P"; \
- 	else rm -f ".deps/$@.pp"; exit 1; \
- 	fi
- 
- $(CXXOBJS): %.o: %.cpp Makefile.linux make.conf
--	@echo "  CXX  $@"
--	@if $(CXX) $(CXXFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \
-+	@echo "$(CXX) $(CXXFLAGS) $(CPPFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@"
-+	@if $(CXX) $(CXXFLAGS) $(CPPFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \
- 		mv ".deps/$@.pp" ".deps/$@.P"; \
- 	else rm -f ".deps/$@.pp"; exit 1; \
- 	fi
- 
--release:
--	@$(MAKE) -f Makefile.linux 'CFLAGS=$(_CFLAGS)' 'CXXFLAGS=$(_CXXFLAGS)'
--
--static:
--	@$(MAKE) -f Makefile.linux 'CFLAGS=$(_CFLAGS)' 'CXXFLAGS=$(_CXXFLAGS)' 'LDFLAGS=$(_LDFLAGS)' 'OBJS=$(OBJS) $(STATICLIBS)'
--
- clean:
- 	rm -f $(OBJS) $(EXE) 
- 
-@@ -140,8 +161,8 @@
- 	cd docs && doxygen Doxyfile
- 
- .depend: $(foreach HEADER_DIR, $(HEADER_DIRS), $(wildcard $(HEADER_DIR)/*.h))
--	$(CC) $(CFLAGS) -MM $(patsubst %.o, %.c, $(COBJS)) >.depend
--	$(CXX) $(CXXFLAGS) -MM $(patsubst %.o, %.cpp, $(CXXOBJS)) >>.depend
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(patsubst %.o, %.c, $(COBJS)) >.depend
-+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -MM $(patsubst %.o, %.cpp, $(CXXOBJS)) >>.depend
- 
- make.conf: make.defaults
- 	@if (test -f $@ -a '$(UPDATE_CONF)' != 'yes'); \
-@@ -161,7 +182,7 @@
- 	echo "\t#endinput" >> $@; \
- 	echo "#endif" >> $@; \
- 	echo "#define _features_included" >> $@; \
--	for feature in $(FEATURES); do \
-+	for feature in $(EL_FEATURES); do \
- 		echo "#define $$feature" >> $@; \
- 	done
- 
---- elc/make.defaults
-+++ elc/make.defaults
-@@ -1,71 +1,82 @@
- # set this to "no" if you don't want this file to be overwritten
- UPDATE_CONF=yes
- 
-+# set to 'yes' for BSD support
-+BSD_KERNEL=no
-+
-+# set to 'yes' to enable debug support
-+DEBUG=no
-+
- # tune these for your setup & compile options
- # IMPORTANT: if you are using a linker that needs libraries in correct order, make sure you list EYE_CANDY before PNG_SCREENSHOT if you use both
- 
- ### Current release default options ###
--FEATURES += CLUSTER_INSIDES		# Group objects into separate clusters for clipping on inside maps
--FEATURES += CUSTOM_LOOK			# allows you to customize your look.
--FEATURES += CUSTOM_UPDATE		# allows autoupdating of custom look information
--FEATURES += FUZZY_PATHS			# Makes Tab Map walking not always follow exaclty the same path
--FEATURES += NEW_SOUND			# Enables extended sound effects system
--FEATURES += PNG_SCREENSHOT		# make screenshots in W3C's PNG format in game, requires libpng
--FEATURES += TEXT_ALIASES		# Text aliases
--FEATURES += USE_INLINE			# enable some optimizations to use inline functions instead of pure function calls
-+EL_FEATURES += CLUSTER_INSIDES		# Group objects into separate clusters for clipping on inside maps
-+EL_FEATURES += CUSTOM_LOOK			# allows you to customize your look.
-+EL_FEATURES += CUSTOM_UPDATE		# allows autoupdating of custom look information
-+EL_FEATURES += FUZZY_PATHS			# Makes Tab Map walking not always follow exaclty the same path
-+EL_FEATURES += NEW_SOUND			# Enables extended sound effects system
-+EL_FEATURES += PNG_SCREENSHOT		# make screenshots in W3C's PNG format in game, requires libpng
-+EL_FEATURES += TEXT_ALIASES		# Text aliases
-+EL_FEATURES += USE_INLINE			# enable some optimizations to use inline functions instead of pure function calls
- # new for 1.9.0 release
--FEATURES += BANDWIDTH_SAVINGS		# enable bandwidth saving changes for message protocol
-+EL_FEATURES += BANDWIDTH_SAVINGS		# enable bandwidth saving changes for message protocol
- # new for 1.9.2 release
--FEATURES += ANIMATION_SCALING		# Adds support for animation scaling, depending on the number of animation commands in the actor queue.
--FEATURES += ENCYCL_NAVIGATION		# Adds context menus to encyclopedia windows with search and bookmark functions
--FEATURES += FSAA			# Adds support for full screen anti-aliasing using OpenGL multisampling.
--FEATURES += NEW_NEW_CHAR_WINDOW		# Use the new character creation window; controls always on-screen
--FEATURES += NEW_TEXTURES		# Enables the new texture loading and caching system (http://www.eternal-lands.com/forum/index.php?showtopic=54756)
-+EL_FEATURES += ANIMATION_SCALING		# Adds support for animation scaling, depending on the number of animation commands in the actor queue.
-+EL_FEATURES += ENCYCL_NAVIGATION		# Adds context menus to encyclopedia windows with search and bookmark functions
-+EL_FEATURES += FSAA			# Adds support for full screen anti-aliasing using OpenGL multisampling.
-+EL_FEATURES += NEW_NEW_CHAR_WINDOW		# Use the new character creation window; controls always on-screen
-+EL_FEATURES += NEW_TEXTURES		# Enables the new texture loading and caching system (http://www.eternal-lands.com/forum/index.php?showtopic=54756)
- # new for 1.9.3 release
--FEATURES += FASTER_MAP_LOAD		# Enables optimizations to speed up the process of switching between maps
--FEATURES += FASTER_STARTUP		# An attempt to reduce the startup time of EL somewhat
--FEATURES += MIDDLE_MOUSE_PASTE	# Paste using the middle mouse button from the primary buffer on X systems
-+EL_FEATURES += FASTER_MAP_LOAD		# Enables optimizations to speed up the process of switching between maps
-+EL_FEATURES += FASTER_STARTUP		# An attempt to reduce the startup time of EL somewhat
-+EL_FEATURES += MIDDLE_MOUSE_PASTE	# Paste using the middle mouse button from the primary buffer on X systems
- 
- ### Testing options (these options are possible for the next release and should be tested) ###
--#FEATURES += ANTI_ALIAS			# allows to enable/disable anti-aliasing in el.ini
--#FEATURES += DYNAMIC_ANIMATIONS		# (appears broken) Synchronizes animation to FPS instead of a fixed timer
--#FEATURES += EXT_ACTOR_DICT		# Removes remaining hard-coded actor def dictionaries - requires updated actor defs files (http://el.grug.redirectme.net/actor_defs.zip)
--#FEATURES += NEW_ALPHA			# (undocumented)
--#FEATURES += USE_SIMD			# Enables usage of simd instructions
-+#EL_FEATURES += ANTI_ALIAS			# allows to enable/disable anti-aliasing in el.ini
-+#EL_FEATURES += DYNAMIC_ANIMATIONS		# (appears broken) Synchronizes animation to FPS instead of a fixed timer
-+#EL_FEATURES += EXT_ACTOR_DICT		# Removes remaining hard-coded actor def dictionaries - requires updated actor defs files (http://el.grug.redirectme.net/actor_defs.zip)
-+#EL_FEATURES += NEW_ALPHA			# (undocumented)
-+#EL_FEATURES += USE_SIMD			# Enables usage of simd instructions
- 
- ### Machine specific options (fixes or performance enhancements) ###
--#FEATURES += EL_BIG_ENDIAN		# Enable big-endian code (automatically detected for OSX)
--#FEATURES += NO_PF_MACRO		# Use a function instead of a macro for pf_get_tile()
--#FEATURES += SIMPLE_LOD			# enable a simplistic distance culling to improve performance
-+#EL_FEATURES += EL_BIG_ENDIAN		# Enable big-endian code (automatically detected for OSX)
-+#EL_FEATURES += NO_PF_MACRO		# Use a function instead of a macro for pf_get_tile()
-+#EL_FEATURES += SIMPLE_LOD			# enable a simplistic distance culling to improve performance
- 
- 
- ### Debug options ###
--#FEATURES += CONTEXT_MENUS_TEST		# Enable "#cmtest" command to help test/demo the context menu code
--#FEATURES += DEBUG			# (undocumented)
--#FEATURES += DEBUG_XML			# Enables missing (optional) XML string property messages
--#FEATURES += DEBUG_POINT_PARTICLES	# (undocumented)
--#FEATURES += DEBUG_TIME			# Fakes the acceleration of time for use in debugging shadows and the like.
--#FEATURES += DEBUG_MAP_SOUND		# Adds (some??) map boundary areas to tab maps and additional logging to stdout
--#FEATURES += ECDEBUGWIN			# press ctrl-alt-c to open the Eye Candy debug window: trigger most effects without casting spells or server side events
--#FEATURES += EXTRA_DEBUG		# (undocumented)
--#FEATURES += MEMORY_DEBUG		# gather information about memory allocation and freeing
--#FEATURES += MISSILES_DEBUG		# Enables debug for missiles feature. It will create a file missiles_log.txt file in your settings directory.
--#FEATURES += MUTEX_DEBUG		# (undocumented)
--#FEATURES += OPENGL_TRACE		# make far more frequent checks for OpenGL errors (requires -DDEBUG to be of any use). Will make error_log.txt a lot larger.
--#FEATURES += TIMER_CHECK		# (undocumented)
--#FEATURES += _EXTRA_SOUND_DEBUG		# Enable debug for sound effects
-+#EL_FEATURES += CONTEXT_MENUS_TEST		# Enable "#cmtest" command to help test/demo the context menu code
-+#EL_FEATURES += DEBUG			# (undocumented)
-+#EL_FEATURES += DEBUG_XML			# Enables missing (optional) XML string property messages
-+#EL_FEATURES += DEBUG_POINT_PARTICLES	# (undocumented)
-+#EL_FEATURES += DEBUG_TIME			# Fakes the acceleration of time for use in debugging shadows and the like.
-+#EL_FEATURES += DEBUG_MAP_SOUND		# Adds (some??) map boundary areas to tab maps and additional logging to stdout
-+#EL_FEATURES += ECDEBUGWIN			# press ctrl-alt-c to open the Eye Candy debug window: trigger most effects without casting spells or server side events
-+#EL_FEATURES += EXTRA_DEBUG		# (undocumented)
-+
-+# gather information about memory allocation and freeing
-+ifeq ($(DEBUG),yes)
-+EL_FEATURES += MEMORY_DEBUG
-+endif
-+
-+#EL_FEATURES += MISSILES_DEBUG		# Enables debug for missiles feature. It will create a file missiles_log.txt file in your settings directory.
-+#EL_FEATURES += MUTEX_DEBUG		# (undocumented)
-+#EL_FEATURES += OPENGL_TRACE		# make far more frequent checks for OpenGL errors (requires -DDEBUG to be of any use). Will make error_log.txt a lot larger.
-+#EL_FEATURES += TIMER_CHECK		# (undocumented)
-+#EL_FEATURES += _EXTRA_SOUND_DEBUG		# Enable debug for sound effects
- 
- 
- ### Other options (Experimental, unfinished, defunct or otherwise unknown) ###
--#FEATURES += NEW_CURSOR			# New coloured cursors made by Emajekral (Experimental) Extract http://users.on.net/~gingerman/sky_cursor-textures.zip into datadir/textures/
--#FEATURES += PAWN			# Experimental, not for release, will need server support to function properly. This *will* eat your cat. You've been warned. Enables the Pawn abstract machine.
--#FEATURES += UID			# use unique ID sent from server for custom looks. (INCOMPLETE)
--#FEATURES += USE_ACTORS_OPTIMIZER	# Enables actor optimizations
--#FEATURES += USE_BOOST
--#FEATURES += USE_TR1			# Needs tr1 version of c++ stl, used for NEW_FILE_IO
--#FEATURES += WRITE_XML			# dangerous to use, will wipe out some XML files that are part of the main game download
--#FEATURES += ZLIBW			# Enables being able to write gzip compressed files, requires -lzlib/-lz needed for map_editor
--#FEATURES += OLD_MISC_OBJ_DIR		# if not defined, ./3dobjects/misc_objects/ paths becomes ./3dobjects/
-+#EL_FEATURES += NEW_CURSOR			# New coloured cursors made by Emajekral (Experimental) Extract http://users.on.net/~gingerman/sky_cursor-textures.zip into datadir/textures/
-+#EL_FEATURES += PAWN			# Experimental, not for release, will need server support to function properly. This *will* eat your cat. You've been warned. Enables the Pawn abstract machine.
-+#EL_FEATURES += UID			# use unique ID sent from server for custom looks. (INCOMPLETE)
-+#EL_FEATURES += USE_ACTORS_OPTIMIZER	# Enables actor optimizations
-+#EL_FEATURES += USE_BOOST
-+#EL_FEATURES += USE_TR1			# Needs tr1 version of c++ stl, used for NEW_FILE_IO
-+#EL_FEATURES += WRITE_XML			# dangerous to use, will wipe out some XML files that are part of the main game download
-+#EL_FEATURES += ZLIBW			# Enables being able to write gzip compressed files, requires -lzlib/-lz needed for map_editor
-+#EL_FEATURES += OLD_MISC_OBJ_DIR		# if not defined, ./3dobjects/misc_objects/ paths becomes ./3dobjects/
- 
- 
- 
-@@ -86,7 +97,3 @@
- #EXTRA_INCLUDES=-IC:\\Programme\\Dev-Cpp\\Include
- #EXTRA_LIBS=-lz
- #EXTRA_STATICLIBS=libs/zlib.a
--
--CC=gcc
--CXX=g++
--LINK=gcc
diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.3-glbuild.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.3-glbuild.patch
deleted file mode 100644
index 972abd9b0d2b..000000000000
--- a/games-rpg/eternal-lands/files/eternal-lands-1.9.3-glbuild.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- gl_init.c	2012-02-13 22:01:54.000000000 -0500
-+++ gl_init.c	2012-12-02 18:09:41.274014922 -0500
-@@ -27,6 +27,8 @@
- #include "fsaa/fsaa.h"
- #endif	/* FSAA */
- 
-+#define APIENTRY
-+
- Uint32 flags;
- 
- int window_width=640;
---- platform.h	2012-02-13 22:01:54.000000000 -0500
-+++ platform.h	2012-12-02 17:32:46.017627957 -0500
-@@ -87,9 +87,10 @@
-  #define APIENTRYP *
- #elif !defined(BSD)
-  #define GL_GLEXT_LEGACY
-+ #include <GL/glew.h>
-  #include <GL/gl.h>
-  #include <GL/glu.h>
-- #include "glext.h"
-+ #include <GL/glext.h>
- #else // BSD
-  #include <GL/gl.h>
-  #include <GL/glu.h>
diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.3-minizip.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.3-minizip.patch
deleted file mode 100644
index 9edb22254502..000000000000
--- a/games-rpg/eternal-lands/files/eternal-lands-1.9.3-minizip.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Jun 24 16:33:08 UTC 2012
-Subject: unbundle minizip
-
-https://bugs.gentoo.org/show_bug.cgi?id=423327
-applied on top of eternal-lands-1.9.3-build.patch
-
---- elc/new_update.c
-+++ elc/new_update.c
-@@ -5,8 +5,8 @@
- #include <string.h>
- #include "md5.h"
- #include "elc_private.h"
--#include "io/zip.h"
--#include "io/unzip.h"
-+#include <zip.h>
-+#include <unzip.h>
- #include "io/ziputil.h"
- #include "io/fileutil.h"
- #include "io/elfilewrapper.h"
---- elc/io/ziputil.h
-+++ elc/io/ziputil.h
-@@ -8,8 +8,8 @@
- 
- #include <SDL.h>
- #include "../md5.h"
--#include "zip.h"
--#include "unzip.h"
-+#include <zip.h>
-+#include <unzip.h>
- 
- #ifdef __cplusplus
- extern "C"
---- elc/io/elfilewrapper.c
-+++ elc/io/elfilewrapper.c
-@@ -1,5 +1,5 @@
- #include "elfilewrapper.h"
--#include "unzip.h"
-+#include <unzip.h>
- #include "elpathwrapper.h"
- #include "fileutil.h"
- #include <sys/stat.h>
---- elc/Makefile.linux
-+++ elc/Makefile.linux
-@@ -25,11 +25,13 @@
- 
- CFLAGS += $(shell sdl-config --cflags) \
- 	  $(shell xml2-config --cflags) \
-+	  $(shell pkg-config --cflags minizip) \
- 	  -fno-strict-aliasing \
- 	  $(EXTRA_INCLUDES)
- 
- CXXFLAGS += $(shell sdl-config --cflags) \
- 	    $(shell xml2-config --cflags) \
-+	    $(shell pkg-config --cflags minizip) \
- 	    -fno-strict-aliasing \
- 	    $(EXTRA_INCLUDES)
- 
-@@ -47,6 +49,7 @@
- 	$(shell pkg-config --libs vorbis) \
- 	$(shell pkg-config --libs vorbisfile) \
- 	$(shell pkg-config --libs zlib) \
-+	$(shell pkg-config --libs minizip) \
- 	-lm \
- 	$(EXTRA_LIBS) \
- 	$(foreach FEATURE, $(EL_FEATURES), $($(FEATURE)_LIBS)) \
-@@ -80,7 +83,7 @@
- 	gamewin.o gl_init.o hud.o help.o highlight.o	\
- 	ignore.o init.o interface.o items.o io/fileutil.o	\
- 	io/e3d_io.o io/elc_io.o	io/map_io.o io/elpathwrapper.o io/xmlcallbacks.o \
--	io/half.o io/normal.o io/elfilewrapper.o io/unzip.o io/ioapi.o io/zip.o io/ziputil.o	\
-+	io/half.o io/normal.o io/elfilewrapper.o io/ziputil.o	\
- 	keys.o knowledge.o langselwin.o lights.o list.o load_gl_extensions.o loginwin.o loading_win.o	\
- 	main.o manufacture.o map.o mapwin.o memory.o	\
- 	md5.o mines.o minimap.o misc.o missiles.o multiplayer.o	\
diff --git a/games-rpg/eternal-lands/metadata.xml b/games-rpg/eternal-lands/metadata.xml
deleted file mode 100644
index 3a16e77fe8ea..000000000000
--- a/games-rpg/eternal-lands/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>rich0@gentoo.org</email>
-		<name>Richard Freeman</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription>
-		Eternal Lands is a FREE MMORPG (massively multiplayer online role playing game)
-	</longdescription>
-</pkgmetadata>
diff --git a/games-rpg/freedink-108.4-r1 b/games-rpg/freedink-108.4-r1
new file mode 100644
index 000000000000..5079df856b3b
--- /dev/null
+++ b/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
+SLOT=0
+SRC_URI=mirror://gnu/freedink/freedink-108.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4dfcdcf0eb321f7c65f39bf7313fadce
diff --git a/games-rpg/freedink-data-1.08.20140901-r1 b/games-rpg/freedink-data-1.08.20140901-r1
new file mode 100644
index 000000000000..83ddde8a9778
--- /dev/null
+++ b/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/games-rpg/freedink-data-1.08.20170409 b/games-rpg/freedink-data-1.08.20170409
new file mode 100644
index 000000000000..a2ed4e332357
--- /dev/null
+++ b/games-rpg/freedink-data-1.08.20170409
@@ -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.20170409.tar.gz
+_md5_=3c19a69e2a994a4244cc9f9945eca270
diff --git a/games-rpg/freedink-data/Manifest b/games-rpg/freedink-data/Manifest
deleted file mode 100644
index 5b2e93b46124..000000000000
--- a/games-rpg/freedink-data/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST freedink-data-1.08.20140901.tar.gz 51303165 BLAKE2B 28c225cf12b2bdcf0cf4cccb773e39055c756f0d031d851e697b2a47b8d82781b43ac31ae88245e67582be74fed8a67b20498d8e61231bb4106cc1a679b9ac18 SHA512 cdaa50610ed7e365967f6a84f6d540295ccc85bf4d11b882b49c6b97abe2b375be9880afc1e8ea31cdf22a24365d09861b9f4d1d522cc1ae685f7a8b6b4cad82
-DIST freedink-data-1.08.20170409.tar.gz 53030350 BLAKE2B cf7eb210ed908aed185b2c3d450492ef4265600ee8a058a4d13396de21ec543b619bca4d1a684edec69c913459489db2f1fe868b51306e52ffdf081d7245cd7d SHA512 8ce6bd0de33da0edd42722c2a7d02aae54a3e8e81fc8e0a4c97d9b2b696e58eb41e05e12b3fc1cd4be72be7bcf799988d50affb3689f3fec8e2e78c878cd4afc
-EBUILD freedink-data-1.08.20140901-r1.ebuild 480 BLAKE2B af2dd511e91fc3befa1e7ca9d5af8906e751610c7f7418dbc1f5e579a928c16e53b20728289e76ed0dd9c352e279e3018310bb20d1576ff9585c8eaec361089e SHA512 0d1b688d5c8cab12bd4c3123583f8d20686a65f275b510b97664935b452ba5b76604639e51d9307edf2f5101e4dbdba4c049793936ff1a154a3dbcdbe0f869c9
-EBUILD freedink-data-1.08.20170409.ebuild 472 BLAKE2B 3cf16f3b121aefee27b7d147d7596aa3c4aa545a42d67f6d5fc3a5293798a5576d8c42c6a145da14f376c3a7569a21ebb74e63700ea33773decde06f967a6f0f SHA512 13c954cb0697375126de07de9851f6175705e18d85ed649ac841889af2df779de148cf54aaa20dbc7af2adc4a58f51dc5428f8702f4d527a73b93b8fcbf2fcab
-MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/freedink-data/freedink-data-1.08.20140901-r1.ebuild b/games-rpg/freedink-data/freedink-data-1.08.20140901-r1.ebuild
deleted file mode 100644
index 3a8d887e4ddb..000000000000
--- a/games-rpg/freedink-data/freedink-data-1.08.20140901-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Freedink game data"
-HOMEPAGE="http://www.freedink.org/"
-SRC_URI="mirror://gnu/freedink/${P}.tar.gz"
-
-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"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_install() {
-	emake DESTDIR="${D}" DATADIR="/usr/share" install
-	dodoc README.txt README-REPLACEMENTS.txt
-}
diff --git a/games-rpg/freedink-data/freedink-data-1.08.20170409.ebuild b/games-rpg/freedink-data/freedink-data-1.08.20170409.ebuild
deleted file mode 100644
index 61874259e09a..000000000000
--- a/games-rpg/freedink-data/freedink-data-1.08.20170409.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Freedink game data"
-HOMEPAGE="http://www.freedink.org/"
-SRC_URI="mirror://gnu/freedink/${P}.tar.gz"
-
-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"
-KEYWORDS="~amd64 ~x86"
-
-src_install() {
-	emake DESTDIR="${D}" DATADIR="/usr/share" install
-	dodoc README.txt README-REPLACEMENTS.txt
-}
diff --git a/games-rpg/freedink-data/metadata.xml b/games-rpg/freedink-data/metadata.xml
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-rpg/freedink-data/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/freedink/Manifest b/games-rpg/freedink/Manifest
deleted file mode 100644
index 8e9f5064bd39..000000000000
--- a/games-rpg/freedink/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX freedink-108.4-no-windres.patch 733 BLAKE2B 165eb162877e49b4d2785ca394da2eb092171ae02f46da822d39405a037f40d28553fb46f5900b4b50f84a3e1abe499ae65198e4b21e7d2bb8771e6ce97cfd67 SHA512 f771f54e93d0ce4233d8f895dba91cfe637abae47d1fccefeb5fea615845c107710b1f7c7ccf30dc2a1ef6bc4ec7ee73ff7bc7914387ca5e97de229457c18802
-DIST freedink-108.4.tar.gz 1897701 BLAKE2B b26129f3e5d17895a08cac9564973e31d6e8e2458ac9a2ed4b00f53cd1b8004073022a8e3f4cf8ded2e44cc4bb73909f021a7c960d219e78aec47b4c4ce7c18e SHA512 1496b6a7826bf694a2919add22a8b4b08a4967d8a7fdebf2d599bd99c7a7ce67de6c2b11124423c7aa1f0feb2e7c03ce1cf00252070182936e7481791dafee61
-EBUILD freedink-108.4-r1.ebuild 1064 BLAKE2B 51675813c9d58c44da48884bd47b6f51373a7f9d05f8118e7ff35ccd582c87cc3326baf3329668b30ab98dfa80f3b746ef66913f45a1e47b88d406ae08123891 SHA512 29b4f5d78125577e2790e6a46b922b2fcf13099c275898f8ee685be2adda84e6d125daafc650f5dd04473e09d3fe744cc332a058664fe21a705a3dd1efbe4a11
-MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/freedink/files/freedink-108.4-no-windres.patch b/games-rpg/freedink/files/freedink-108.4-no-windres.patch
deleted file mode 100644
index 81c72e00dae0..000000000000
--- a/games-rpg/freedink/files/freedink-108.4-no-windres.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -226,7 +226,7 @@
- 	update_frame.h
- am_freedink_OBJECTS = $(am__objects_3) freedink.$(OBJEXT) \
- 	update_frame.$(OBJEXT)
--@HAVE_WINDRES_TRUE@am__objects_4 = woeres.$(OBJEXT)
-+#@HAVE_WINDRES_TRUE@am__objects_4 = woeres.$(OBJEXT)
- nodist_freedink_OBJECTS = $(am__objects_4)
- freedink_OBJECTS = $(am_freedink_OBJECTS) $(nodist_freedink_OBJECTS)
- freedink_LDADD = $(LDADD)
-@@ -1143,7 +1143,7 @@
- @HAVE_WINDRES_FALSE@WOERES = 
- 
- # How do we handle resources embedded in the executable binary?
--@HAVE_WINDRES_TRUE@WOERES = woeres.rc
-+#@HAVE_WINDRES_TRUE@WOERES = woeres.rc
- 
- # Other projects that use Autotools and support MinGW
- # http://sourceforge.net/projects/chocolate-doom (Doom port)
diff --git a/games-rpg/freedink/freedink-108.4-r1.ebuild b/games-rpg/freedink/freedink-108.4-r1.ebuild
deleted file mode 100644
index 743ce07e7546..000000000000
--- a/games-rpg/freedink/freedink-108.4-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic
-
-DESCRIPTION="Dink Smallwood is an adventure/role-playing game, similar to Zelda (2D top view)"
-HOMEPAGE="http://www.freedink.org/"
-SRC_URI="mirror://gnu/freedink/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-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
-"
-RDEPEND="${DEPEND}
-	games-rpg/freedink-data
-"
-DEPEND="${DEPEND}
-	dev-libs/check
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-108.4-no-windres.patch
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's#^datarootdir =.*$#datarootdir = /usr/share#' \
-		share/Makefile.in || die
-	# seems like the code is fragile (bug #559548)
-	filter-flags
-	replace-flags -O? -O0
-}
-
-src_configure() {
-	econf \
-		--disable-embedded-resources \
-		--localedir="/usr/share/locale"
-}
diff --git a/games-rpg/freedink/metadata.xml b/games-rpg/freedink/metadata.xml
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-rpg/freedink/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/freedroid-1.0.2-r1 b/games-rpg/freedroid-1.0.2-r1
new file mode 100644
index 000000000000..b9f3c1b9ad50
--- /dev/null
+++ b/games-rpg/freedroid-1.0.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=virtual/jpeg:0 media-libs/libpng:0 media-libs/libsdl[joystick,sound,video] media-libs/libvorbis media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod,vorbis] sys-libs/zlib
+DESCRIPTION=Freedroid - a Paradroid clone
+EAPI=6
+HOMEPAGE=http://freedroid.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/jpeg:0 media-libs/libpng:0 media-libs/libsdl[joystick,sound,video] media-libs/libvorbis media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod,vorbis] sys-libs/zlib
+SLOT=0
+SRC_URI=mirror://sourceforge/freedroid/freedroid-1.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f174b0ac79e60dbb79ac38369045afa2
diff --git a/games-rpg/freedroid/Manifest b/games-rpg/freedroid/Manifest
deleted file mode 100644
index 505b0ebe770c..000000000000
--- a/games-rpg/freedroid/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX freedroid-1.0.2-format.patch 762 BLAKE2B ec8021ac592995cfa5bfde3e134e432b67d74980c9bbdf733ad9938ce9d11e665e2e21695400cc7ff333d65561420917e6e8c15bd807fdb887524c67c3d9d242 SHA512 cc2a49a22bfd8e574ee466ef837e1c4a32e7529a6275c0abab507e46291c63abbf641975fc08297f63b4a6204c4436a18b053231aeaed0ee40ed86b01217cf47
-DIST freedroid-1.0.2.tar.gz 4819173 BLAKE2B 9548cc350010eff47ca13b8b4fd6b1082f16e1fe41bad5c2359aecd7834ef22b27adc90d1d33564edc63a592ffa6934224a0ee16784cf736b98fcb56d287229a SHA512 cfafa4af86a2007fcf761b51e6c7dcc6dc40f4513057413901fede41b7a436b9c8cf7c3e5c29130e5410fab640ffbdc8100043a442555e862acffe9f33086be1
-EBUILD freedroid-1.0.2-r1.ebuild 841 BLAKE2B f7e5c35d2aed93408c84fe25345ee88e02ff155163ed378f25de4334f546efc437749004f20cfb732bddfaf8077d4785e6c335d15ebf4afbf14da5bbc06bc848 SHA512 43ca7bdbdde0e3284d3e76bc7af73002675b1d5d73be26c562c3322ce7a1464f0a04ff3b3bbb577a530e82c613e276bed99a0d1df79dc66d9a8e7ee90c54eb6b
-MISC metadata.xml 332 BLAKE2B ef2f4517b0f8c02b4e6703dc065c71280ad5b06e03293977118662f2a754ec15d4a1c18980ae945018e7315bf387a49f100e7b5a48d3391f9bd8f617d8f8f3a7 SHA512 4fe0371b423de98a48fb21ec25d0fc34e393ce7c2f497e815c2f991f65507b2762b1cb68c87742bd2f3714a063828d8764ea2a815e33cba086b102d5ad672932
diff --git a/games-rpg/freedroid/files/freedroid-1.0.2-format.patch b/games-rpg/freedroid/files/freedroid-1.0.2-format.patch
deleted file mode 100644
index 4dbf96bda3f0..000000000000
--- a/games-rpg/freedroid/files/freedroid-1.0.2-format.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/init.c	2015-10-24 17:37:24.431514375 +0200
-+++ b/src/init.c	2015-10-24 17:37:43.057157826 +0200
-@@ -554,13 +554,13 @@
- 	   * following gnu-coding standards for command line interfaces */
- 	case 'v':
- 	  printf ("\n%s %s  \n", PACKAGE, VERSION); 
--	  printf (copyright);
-+	  printf ("%s", copyright);
- 	  exit (0);
- 	  break;
- 
- 	case 'h':
- 	case '?':
--	  printf (usage_string);
-+	  printf ("%s", usage_string);
- 	  exit (0);
- 	  break;
- 
---- a/src/misc.c	2015-10-24 17:37:54.368941282 +0200
-+++ b/src/misc.c	2015-10-24 17:38:10.202638172 +0200
-@@ -889,7 +889,7 @@
-   if (db_level <= debug_level)
-     {
-       vsnprintf (buffer, 5000, fmt, args);
--      fprintf (stderr, buffer);
-+      fprintf (stderr, "%s", buffer);
-       fflush (stderr);
-     }
- 
diff --git a/games-rpg/freedroid/freedroid-1.0.2-r1.ebuild b/games-rpg/freedroid/freedroid-1.0.2-r1.ebuild
deleted file mode 100644
index e6eb377ac6db..000000000000
--- a/games-rpg/freedroid/freedroid-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Freedroid - a Paradroid clone"
-HOMEPAGE="http://freedroid.sourceforge.net/"
-SRC_URI="mirror://sourceforge/freedroid/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	virtual/jpeg:0
-	media-libs/libpng:0
-	media-libs/libsdl[joystick,sound,video]
-	media-libs/libvorbis
-	media-libs/sdl-image[jpeg,png]
-	media-libs/sdl-mixer[mod,vorbis]
-	sys-libs/zlib"
-RDEPEND=${DEPEND}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-format.patch
-)
-
-src_install() {
-	default
-	find "${D}" -name "Makefile*" -exec rm -f '{}' + || die
-	rm -rf "${D}/usr/share/${PN}/"{freedroid.6,mac-osx} || die
-	newicon graphics/paraicon.bmp ${PN}.bmp
-	make_desktop_entry freedroid Freedroid /usr/share/pixmaps/${PN}.bmp
-}
diff --git a/games-rpg/freedroid/metadata.xml b/games-rpg/freedroid/metadata.xml
deleted file mode 100644
index ca95edad2177..000000000000
--- a/games-rpg/freedroid/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">freedroid</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-rpg/freedroidrpg-0.16-r1 b/games-rpg/freedroidrpg-0.16-r1
new file mode 100644
index 000000000000..0879751c084a
--- /dev/null
+++ b/games-rpg/freedroidrpg-0.16-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=virtual/jpeg:0 media-libs/libpng:0 media-libs/libsdl[opengl?,sound?,video] >=media-libs/sdl-gfx-2.0.21 media-libs/sdl-image[jpeg,png] nls? ( virtual/libintl ) opengl? ( virtual/opengl ) sound? ( media-libs/libogg media-libs/libvorbis media-libs/sdl-mixer[vorbis] ) x11-libs/libX11 || ( >=dev-lang/python-2.7.5-r2:2.7 ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DESCRIPTION=A modification of the classical Freedroid engine into an RPG
+EAPI=6
+HOMEPAGE=http://freedroid.sourceforge.net/
+IUSE=nls opengl sound
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=virtual/jpeg:0 media-libs/libpng:0 media-libs/libsdl[opengl?,sound?,video] >=media-libs/sdl-gfx-2.0.21 media-libs/sdl-image[jpeg,png] nls? ( virtual/libintl ) opengl? ( virtual/opengl ) sound? ( media-libs/libogg media-libs/libvorbis media-libs/sdl-mixer[vorbis] ) x11-libs/libX11
+SLOT=0
+SRC_URI=ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-0.16//freedroidRPG-0.16.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a75a0f47bdfceed9541bc55c787704a9
diff --git a/games-rpg/freedroidrpg/Manifest b/games-rpg/freedroidrpg/Manifest
deleted file mode 100644
index 2e13858b90e8..000000000000
--- a/games-rpg/freedroidrpg/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST freedroidRPG-0.16.tar.gz 225570013 BLAKE2B ad87ad3d368c94eb1f3dae2d4c3df97b9bc88acccbec4cbcd31e42b411bb96506faac23f8de9b0317a1ab926b34bd01196adce617ab7b731354049d3fb010643 SHA512 039ee4bfcd58e29a3cfa26ae7f2bc8aed7c289119476bb8f8486006910cf6a2127ba49f7526fac887392ca9e5320fb1a59ba068834e162348905423908b0755a
-EBUILD freedroidrpg-0.16-r1.ebuild 1781 BLAKE2B 4ab53881ba87e23fd60353a9f303eb321ca9cfddec398c5e43dd1c51d4939803c0ce60491389c62304efa7159ce2c7452d25de27241a9131275425741c8a255b SHA512 2f4df51a1208eb76f03d830d671f8433bdb2a0c03ed99c06fb1af4e1be8e6e4c09dd566f7bf6faddf6dbf81c1c6c20e80087fbd7cd2e3fe51fbacb0d02fa90ec
-MISC metadata.xml 2288 BLAKE2B e60e49e0140a270511938adc92ee1d0498590c0daff8fc26ab1451a29bb1ede358991da211f821b04d9432c6792335e18c328aeb8c6613b9b3a87954ba8b2c8d SHA512 196a3711abe685277462235c912a41b46dc8fa5122d611f4f864300262ae888611951451162db87e75eafa7720d662a1fc51e4441b0d9fb730109f6c2c4aadca
diff --git a/games-rpg/freedroidrpg/freedroidrpg-0.16-r1.ebuild b/games-rpg/freedroidrpg/freedroidrpg-0.16-r1.ebuild
deleted file mode 100644
index cdde16dcc8f2..000000000000
--- a/games-rpg/freedroidrpg/freedroidrpg-0.16-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit autotools eutils gnome2-utils python-any-r1
-
-DESCRIPTION="A modification of the classical Freedroid engine into an RPG"
-HOMEPAGE="http://freedroid.sourceforge.net/"
-SRC_URI="ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-${PV}//freedroidRPG-${PV}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls opengl sound"
-
-RDEPEND="
-	virtual/jpeg:0
-	media-libs/libpng:0
-	media-libs/libsdl[opengl?,sound?,video]
-	>=media-libs/sdl-gfx-2.0.21
-	media-libs/sdl-image[jpeg,png]
-	nls? ( virtual/libintl )
-	opengl? ( virtual/opengl )
-	sound? (
-		media-libs/libogg
-		media-libs/libvorbis
-		media-libs/sdl-mixer[vorbis] )
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^dist_doc_DATA/d' \
-		-e '/-pipe/d' \
-		-e '/^SUBDIRS/s/pkgs//' \
-		Makefile.am || die
-	python_fix_shebang src sound
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-fastmath \
-		--with-embedded-lua \
-		--localedir=/usr/share/locale \
-		$(use_enable nls) \
-		$(use_enable opengl) \
-		$(use_enable sound)
-}
-
-src_install() {
-	local i
-
-	default
-	for i in 48 64 96 128
-	do
-		doicon -s ${i} pkgs/freedesktop/icons/hicolor/${i}x${i}/apps/freedroidRPG.png
-	done
-	doicon -s scalable pkgs/freedesktop/icons/hicolor/scalable/apps/freedroidRPG.svg
-	make_desktop_entry freedroidRPG "Freedroid RPG" freedroidRPG
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	echo
-	ewarn "${P} is not compatible with old save games."
-	ewarn "Please start a new character."
-	echo
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/freedroidrpg/metadata.xml b/games-rpg/freedroidrpg/metadata.xml
deleted file mode 100644
index d9e96aa7715a..000000000000
--- a/games-rpg/freedroidrpg/metadata.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <longdescription>
-Hello, and welcome to the Freedroid page.
-
-THE CLASSICAL FREEDROID: Freedroid is a clone of the classic game
-"Paradroid" on Commodore 64 with some improvements and extensions to
-the classic version. 
-
-In this game, you control a robot, depicted by a small white ball with
-a few numbers within an interstellar spaceship consisting of several
-decks connected by elevators. 
-
-The aim of the game is to destroy all enemy robots, depicted by small
-black balls with a few numbers, by either shooting them or seizing
-control over them by creating connections in a short subgame of
-electric circuits. 
-
-Development of this game is now complete.  The final version came out
-in august 2003 and runs on Linux, Mac OSX, Sharp Zaurus and even that
-strange Windows wannabe of an operating system.  Thanks to all who 
-helped.
-Minor fixes and maintainance will of course still continue though...
-
-FREEDROID RPG:  The Freedroid RPG is an extension/modification of the
-classical freedroid engine into an RPG.  The main differences to the
-classical version are as follows: 
-* The Tux is the main character of the rpg.  He is not displayed as a
-   ball like in Freedroid but rather as an animated character, while
-   other droids and humans in the game are still represented as the balls
-   with some number or code in them. 
-* Dialogs and chatting with friendly droids and humans:
-   Multiple-choice menus and voice samples (with subtitles for those
-   without sound). 
-* Melee weapons, armour and other items to be equipped have been
-   added. 
-* An automap feature was added.
-* Saving and loading of games.
-* A shop to trade things.
-* Controls are different:  Mouse can be used to do everything.
-   Joystick is not supported for moving around any more. 
-* The archive size (including sound samples) is about 10 times as big
-   as for the classical version.  I'd like to appologize to all 56K modem
-   owners at this point. 
-</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">freedroid</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-rpg/grimrock-20150707 b/games-rpg/grimrock-20150707
new file mode 100644
index 000000000000..238ee257d7fa
--- /dev/null
+++ b/games-rpg/grimrock-20150707
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst unpack
+DEPEND=app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Legend of Grimrock: The ultimate dungeon crawling RPG + modding engine
+EAPI=6
+HOMEPAGE=http://www.grimrock.net/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=media-libs/freeimage media-libs/freetype:2 media-libs/openal media-libs/libsdl2[opengl,sound,video] media-libs/libvorbis sys-libs/zlib[minizip] virtual/opengl x11-libs/libX11
+RESTRICT=fetch bindist splitdebug
+SLOT=0
+SRC_URI=Grimrock-Linux-2015-07-07.sh
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=12024eb42c3c4c92346ceaba63e6ee04
diff --git a/games-rpg/grimrock/Manifest b/games-rpg/grimrock/Manifest
deleted file mode 100644
index f98afb3eae90..000000000000
--- a/games-rpg/grimrock/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Grimrock-Linux-2015-07-07.sh 316846242 BLAKE2B 5d8123b3e2dedf4d6b2ae6f43c9ebe5427e63205b7ff53dc0fba26b0b3a8a1f164b79a3a10776c751aa0fbe29c7ef715412bff826476894eec6aa545da4adec3 SHA512 c90203a747564223281fb61ffcc7ac90f772990f33bb8345aff68c65fbc371f0f1a611645e952a75bd9dbca9e760398c0411eb9adade9c58e525a5b1c4e186db
-EBUILD grimrock-20150707.ebuild 1555 BLAKE2B 11b0bc03dd1b01614dd3899b1d6b615fc34d32b02162b7e750a37da21b12e3b49cd9fce9a155f2c85e9edaba9d19841755bd4afa2acdf29118a69d5837b83a2f SHA512 d46f2401d3daac6767a535175fde51167c8bbf946c4e8ba4608cbad2b6d4da0b3f076c3ff1e9594cb1b802bcd30ea18072ddf252f29f36b35e9946ca2d5992e4
-MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/grimrock/grimrock-20150707.ebuild b/games-rpg/grimrock/grimrock-20150707.ebuild
deleted file mode 100644
index 03275c50c9a5..000000000000
--- a/games-rpg/grimrock/grimrock-20150707.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils unpacker
-
-TIMESTAMP="${PV:0:4}-${PV:4:2}-${PV:6:2}"
-MY_PN="Grimrock"
-DESCRIPTION="Legend of Grimrock: The ultimate dungeon crawling RPG + modding engine"
-HOMEPAGE="http://www.grimrock.net/"
-SRC_URI="Grimrock-Linux-${TIMESTAMP}.sh"
-
-SLOT="0"
-LICENSE="all-rights-reserved"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="fetch bindist splitdebug"
-
-QA_PREBUILT="/opt/${PN}/${MY_PN}.bin"
-
-RDEPEND="media-libs/freeimage
-	media-libs/freetype:2
-	media-libs/openal
-	media-libs/libsdl2[opengl,sound,video]
-	media-libs/libvorbis
-	sys-libs/zlib[minizip]
-	virtual/opengl
-	x11-libs/libX11"
-
-DEPEND="app-arch/xz-utils"
-
-S="${WORKDIR}"
-
-pkg_nofetch() {
-	einfo "Please buy and download ${SRC_URI} from:"
-	einfo "  ${HOMEPAGE}"
-	einfo "and move it to your distfiles directory."
-}
-
-src_unpack() {
-	myarch=$(usex amd64 x86_64 x86)
-	unpack_makeself
-
-	local i
-	for i in subarch instarchive_all instarchive_linux_${myarch}; do
-		ln -snf "${i}" "${i}.tar.xz" || die
-		unpack ./"${i}.tar.xz"
-	done
-}
-
-src_install() {
-	local dir=/opt/${PN}
-
-	insinto "${dir}"
-	doins ${PN}.{dat,png}
-
-	exeinto "${dir}"
-	newexe ${MY_PN}.bin{.${myarch},}
-	dosym "../..${dir}"/${MY_PN}.bin /usr/bin/${PN}
-
-	doicon -s 256 ${PN}.png
-	newicon -s 64 ${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} "Legend of ${MY_PN}"
-
-	dodoc README.linux
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/games-rpg/grimrock/metadata.xml b/games-rpg/grimrock/metadata.xml
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-rpg/grimrock/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/gwiz-0.8-r1 b/games-rpg/gwiz-0.8-r1
new file mode 100644
index 000000000000..2e9bffcbba7e
--- /dev/null
+++ b/games-rpg/gwiz-0.8-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=media-libs/libsdl-1.2.3[joystick,video] >=media-libs/sdl-image-1.2.1-r1[png] >=media-libs/sdl-ttf-2.0.4
+DESCRIPTION=clone of old-school Wizardry(tm) games by SirTech
+EAPI=6
+HOMEPAGE=http://icculus.org/gwiz/
+KEYWORDS=~alpha ~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libsdl-1.2.3[joystick,video] >=media-libs/sdl-image-1.2.1-r1[png] >=media-libs/sdl-ttf-2.0.4
+SLOT=0
+SRC_URI=http://icculus.org/gwiz/gwiz-0.8.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=847a400a1b7f0db12e2f2b7f9dc9636d
diff --git a/games-rpg/gwiz/Manifest b/games-rpg/gwiz/Manifest
deleted file mode 100644
index 81457d7774d8..000000000000
--- a/games-rpg/gwiz/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gwiz-0.8-buffer.patch 653 BLAKE2B 1041deef28648a2cee73bd1b0ac458bbb290bed152588fb6400e6b305c3c702472612bea5015adb52da8533af1fd80325fd17ca6e855f6b98e88ee6d4714ebb7 SHA512 127bf8b442f437fa1ad373f203aaa388f28e59f570257a6ea44906997ed069c379f7b96879c95a198e420a86653331e73a0d2f54fbb55731383f22f274d5b4ba
-DIST gwiz-0.8.tar.bz2 1141667 BLAKE2B 60c28da8caa2b54c1b193b6bc0e8173fea525394c9467beae74ccef69ab21d5c8d259d0e5a1c6d2b557114c8405643bf5c2d74ab6ba01ee92252a350ee5a80e2 SHA512 3c18cc7e905dd87eab7dbf332b985600bbcc8c2992fbc79d992fb0f00c3095c502f416166f0e3320f18b9e011c26675c42e79375f44225b61aba415509837f20
-EBUILD gwiz-0.8-r1.ebuild 774 BLAKE2B 6a5ccaf7f6be75580df34d3c2cefe5940aff9295c79c0f0a03e1f72dd2e7d02af1d96e38fdaa0106d2443e52909bab88e191dd1235acf2d1f2585a7d77c4e7e3 SHA512 9e305c35a0d2efa22c409ffc4898859624644cd4a34a897ba8dcadd640653e5160fd0c4ae95f6efe6c42fe2e890bd9b56e9f4514d39e0fc4f96c98de21b67626
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-rpg/gwiz/files/gwiz-0.8-buffer.patch b/games-rpg/gwiz/files/gwiz-0.8-buffer.patch
deleted file mode 100644
index 44ee9aec15fb..000000000000
--- a/games-rpg/gwiz/files/gwiz-0.8-buffer.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/src/equip.c
-+++ b/src/equip.c
-@@ -120,7 +120,7 @@
- 	    return (i);
- 
-     /* if we get this far, there are no equippable items before the current */
--    for (i = 8; i > offset; i--)
-+    for (i = 7; i > offset; i--)
- 	if (pawn->item[i].usage & USAGE_EQUIPPABLE)
- 	    return (i);
-     return (-1);
---- a/src/shop.c
-+++ b/src/shop.c
-@@ -290,8 +290,7 @@
- 
- 		SDL_BlitSurface (name, NULL, area, &dest);
- 
--		snprintf (price, sizeof(char)*8, "%d", pawn->item[i].sellfor);
--		price[9] = '\0';
-+		snprintf (price, sizeof(price), "%d", pawn->item[i].sellfor);
- 		profit = GwizRenderText (price);
- 		dest.x = area->w - profit->w;
- 		dest.w = profit->w;
diff --git a/games-rpg/gwiz/gwiz-0.8-r1.ebuild b/games-rpg/gwiz/gwiz-0.8-r1.ebuild
deleted file mode 100644
index f7a462a9a302..000000000000
--- a/games-rpg/gwiz/gwiz-0.8-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic
-
-DESCRIPTION="clone of old-school Wizardry(tm) games by SirTech"
-HOMEPAGE="http://icculus.org/gwiz/"
-SRC_URI="http://icculus.org/gwiz/${P}.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=">=media-libs/libsdl-1.2.3[joystick,video]
-	>=media-libs/sdl-image-1.2.1-r1[png]
-	>=media-libs/sdl-ttf-2.0.4"
-RDEPEND=${DEPEND}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-buffer.patch
-)
-
-src_prepare() {
-	default
-
-	append-cflags -std=gnu89 # build with gcc5 (bug #572532)
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog README doc/HOWTO-PLAY" \
-		default
-	newicon pixmaps/gwiz_icon.xpm ${PN}.xpm
-	make_desktop_entry gwiz Gwiz
-}
diff --git a/games-rpg/gwiz/metadata.xml b/games-rpg/gwiz/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-rpg/gwiz/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/kqlives-0.99-r1 b/games-rpg/kqlives-0.99-r1
new file mode 100644
index 000000000000..e72d7d9f1d3a
--- /dev/null
+++ b/games-rpg/kqlives-0.99-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-lang/lua:0 >=gnome-base/libglade-2.4 media-libs/aldumb media-libs/allegro:0 >=x11-libs/gtk+-2.8:2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=A console-style role playing game
+EAPI=6
+HOMEPAGE=http://kqlives.sourceforge.net/
+IUSE=cheats nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/lua:0 >=gnome-base/libglade-2.4 media-libs/aldumb media-libs/allegro:0 >=x11-libs/gtk+-2.8:2 nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://sourceforge/kqlives/kq-0.99.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f08a082cde4cde5c69d62f9c67f6a132
diff --git a/games-rpg/kqlives/Manifest b/games-rpg/kqlives/Manifest
deleted file mode 100644
index 822922ec5520..000000000000
--- a/games-rpg/kqlives/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX kqlives.xpm 1404 BLAKE2B f2aae7268857f5c5e4e9a724a2b3a97a930741bf051bbd59cb6e36e4dabe09c29cc17d5b010c1c1ffb0cfaf9f2440e2350cca88adbea76d7429be176b74b6caf SHA512 32aeaa6e80c906f894773a12fa3bfdd2c52f15b11fe00bd99020d1577441a13573abb02a1fb0f11bb875fc1c61bfdc56285b805a5fd423d9ecc42ceb32eb8e66
-DIST kq-0.99.tar.gz 3642143 BLAKE2B 7279d3ab2808caab77c08283cc6aaab84fcef3814c3c259528320d6516fa8937a62d033b899aaaca4b562affed113faab5fac443ed3487565796377092df0f90 SHA512 fa343561679baf2201fb7107153ca07b715c1e56c9a4cb17db0f04759dd859436e8daa6a364d62ad57d138dbb5d8c680e35cafecea1a8f7f217ec190bfdd7918
-EBUILD kqlives-0.99-r1.ebuild 866 BLAKE2B 2f57b51fd1bf7a548e7f967a9f1e46092fa9a180387973c70f6743de4bb78258561a63496975602f43318874e08982371f9e1cf4c57039eac0397f68e3291774 SHA512 91d23559953cbc02bb30f50f62a5467b8cf3e90347501fbaf9abc8c73292eb8730fa6dde2d59fd4d627db7b4c300d1287b2d34e41d1008ab0326eecc0af616a0
-MISC metadata.xml 409 BLAKE2B 9429ac5342781ed6109743d9b39da1e2094276c6464b7ad982cdbd5d30d8634400890edbb70abbd8c709b3a8c3def37e09a17d60df37e1ce8caeda41ff3869e7 SHA512 d341ddc4a801b649ae83022f3ea04480f59569b2cf91c106ace77735d1d7902fd10a739f41014c1928aae05f66643826390bdfc7917fbfa7106b3656a286edbc
diff --git a/games-rpg/kqlives/files/kqlives.xpm b/games-rpg/kqlives/files/kqlives.xpm
deleted file mode 100644
index 58baadb615ed..000000000000
--- a/games-rpg/kqlives/files/kqlives.xpm
+++ /dev/null
@@ -1,48 +0,0 @@
-/* XPM */
-static char *kq__[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 10 1",
-"  c #000000",
-". c #800000",
-"X c #808000",
-"o c #000080",
-"O c #0000FF",
-"+ c #008080",
-"@ c #00FFFF",
-"# c #808080",
-"$ c #C0C0C0",
-"% c None",
-/* pixels */
-"%%$$%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
-"%%$$$%%%%%%%%%%%%%%%%%%%%%%%%$#%",
-"%%%#$$$%%%%%%%%%%%%%%%%%%%%$$#$%",
-"%%%%$$$#$%%%%%%%%%%%%%%%%$$$$%%%",
-"%%%%%#$$$#$%%%%%%%%%%%%$$$$#$%%%",
-"%%%%%%$$$$#$$%%%%%%%%%$$$$$%%%%%",
-"%%%%%%%##$$##$$$$$$%$##$$#$%%%%%",
-"%%%%%%%%$####$$$$$$######%%%%%%%",
-"%%%%%%%%%##$%$$####$$###$%%%%%%%",
-"%%%%%%%%%%$%$oOOOOO##$#%%%%%%%%%",
-"%%%%%%%%%#$##OO+++OOo$#%%%%%%%%%",
-"%%%%%%%%%%%oo++++++OO$$%%%%%%%%%",
-"%%%%%%%%%$$OO++@@++OO$$%%%%%%%%%",
-"%%%%%%%%%$$OO++@@++OO%$%%%%%%%%%",
-"%%%%%%%%%#$ooO+++++Oo%%%%%%%%%%%",
-"%%%%%%%%%##$#OOOOOOo#%$%%%%%%%%%",
-"%%%%%%%%%##$$##ooo#%%#$%%%%%%%%%",
-"%%%%%%%$$####$$$$$%%$$$$$%%%%%%%",
-"%%%%%%%##$%%%###$$$#$$###%%%%%%%",
-"%%%%%$#$$%%%%##$#$$#$%%$##$%%%%%",
-"%%%%%$$%%%%%%###$###$%%%%##%%%%%",
-"%%%%%%%%%%%%%##$$$##$%%%%%%%%%%%",
-"%%%%%%%%%%%%%##$$$$ #%%%%%%%%%%%",
-"%%%%%%%%%%%%%##$$$$ #%%%%%%%%%%%",
-"%%%%%%%%%%%%%##$$$# #%%%%%%%%%%%",
-"%%%%%%%%%%%%%$#XXXX$%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%$XXXX%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%$XXXX%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%$.XXX%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%$.XXX%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%$XXXX%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%$XXXX%%%%%%%%%%%%%"
-};
diff --git a/games-rpg/kqlives/kqlives-0.99-r1.ebuild b/games-rpg/kqlives/kqlives-0.99-r1.ebuild
deleted file mode 100644
index f743549a0f44..000000000000
--- a/games-rpg/kqlives/kqlives-0.99-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-MY_P=${P/lives}
-
-DESCRIPTION="A console-style role playing game"
-HOMEPAGE="http://kqlives.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cheats nls"
-
-RDEPEND="
-	dev-lang/lua:0
-	>=gnome-base/libglade-2.4
-	media-libs/aldumb
-	media-libs/allegro:0
-	>=x11-libs/gtk+-2.8:2
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	econf \
-		$(use_enable cheats) \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-
-	local x
-	for x in diff draw draw2 dump; do
-		mv -vf "${D}/etc"/map${x} "${D}/etc"/kq-map${x}
-	done
-
-	doicon "${FILESDIR}"/${PN}.xpm
-	make_desktop_entry kq KqLives ${PN}
-}
diff --git a/games-rpg/kqlives/metadata.xml b/games-rpg/kqlives/metadata.xml
deleted file mode 100644
index 6cc3c22df52e..000000000000
--- a/games-rpg/kqlives/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="cheats">Enable cheating mode</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">kqlives</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-rpg/lure-1.1-r1 b/games-rpg/lure-1.1-r1
new file mode 100644
index 000000000000..7ed5a72cb852
--- /dev/null
+++ b/games-rpg/lure-1.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=>=games-engines/scummvm-0.13.1 app-arch/unzip
+DESCRIPTION=Lure of the Temptress
+EAPI=6
+HOMEPAGE=http://www.revolution.co.uk/_display.php?id=10
+IUSE=l10n_en l10n_es l10n_de l10n_fr l10n_it
+KEYWORDS=~amd64 ~x86
+LICENSE=lure
+RDEPEND=>=games-engines/scummvm-0.13.1
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/scummvm/scummvm/266aef932a8a052df897e4d79b4572e5d169916f/dists/engine-data/lure.dat -> lure-0.13.1.dat !l10n_en? ( !l10n_es? ( !l10n_fr? ( !l10n_de? ( !l10n_it? ( mirror://sourceforge/scummvm/lure-1.1.zip -> lure-en-1.1.zip ) ) ) ) ) l10n_en? ( mirror://sourceforge/scummvm/lure-1.1.zip -> lure-en-1.1.zip ) l10n_es? ( mirror://sourceforge/scummvm/lure-es-1.1.zip ) l10n_fr? ( mirror://sourceforge/scummvm/lure-fr-1.1.zip ) l10n_de? ( mirror://sourceforge/scummvm/lure-de-1.1.zip ) l10n_it? ( mirror://sourceforge/scummvm/lure-it-1.1.zip )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c8e854ee42c09253eb368d099839a458
diff --git a/games-rpg/lure/Manifest b/games-rpg/lure/Manifest
deleted file mode 100644
index 67ff13b53fc2..000000000000
--- a/games-rpg/lure/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST lure-0.13.1.dat 637824 BLAKE2B 92fd78cd968fe10a9a379ee243f03be35c5c4a50404b7399eba58e5fc93cd6484b5fc5a21feb7f856ece48e076e12dc9bd83ed8fbbff7ed220a9c7609f185c82 SHA512 2e9c3f049a0d77d94ec1f6b231cf2ee04df148115dd2daa8bc8faf717d509843949964bbed990b804bde5788ab20460ce109f166a936ed176797a093b8973f73
-DIST lure-de-1.1.zip 3717138 BLAKE2B c239e8b89c26e1de212a50ffa22eda12b4fc14f9dabd7d79e4738a92f682eda7c11fafcfc4ba75c1250d5b76958fb1cd47f5a5bc0419551b5ccd82d703450ab8 SHA512 67a0bebe62d343492316351fcf51d928a2323038b915b228322882a98988bdd60dcbce3b39d50c75fb675acc16fd87efbfc4d2a747ba0c6a43b246a689383767
-DIST lure-en-1.1.zip 5678861 BLAKE2B 60dffd497db6291f030fc74065846fe9e95b0479bbc92ea23389ecdea383749573e61c3b2b70bcacf905a4b86f38e9165acaa291d65f93912bb08d0695889013 SHA512 9c178b0df178cf70c3d912300911972589e3ecd44ad478393d423f646da79a6084dc76496dfef740f961ff0d6991d7e5cfb6d9c39e2cf1920c9276386403e281
-DIST lure-es-1.1.zip 2176970 BLAKE2B 61cb1a36d1033bac293b5cab30840f992581cb77fb38464dad80f31feea18cb5bd6906356c9d56207970f04f47344ada17c24b97430badbe4d22ef3f78877c1c SHA512 744a8d9443a8e4c41c0a07383c7143ff0423702b0893e9e3200b5c8a002d76231c48d9dd7d7076eabcf68c50b1755d2ba71f505122d1cf6a42aae8a825e2db29
-DIST lure-fr-1.1.zip 3583274 BLAKE2B d6cf52139bf728ec15a10fd6e7d06e62e8a64f3acfcf9f2c79c217eb6618d756c3787ef04a296ee8829da5f5fd20312a342a961b06796b2658a6376701420f64 SHA512 d2972d1c19da2ff74f72e54290f53e4af89a96b9e647ef6d50c686fd1ff8433020eac78ab24613551be8343b854c80c61a1140fc2ccda3e20dd05f22c6fc7f4a
-DIST lure-it-1.1.zip 4718011 BLAKE2B ba04504dd9d35ac767de9933bd2c9b9629fb0fd0ff5a36044a81639657e87a2ae4041e5195c65853e9ea7a48f8f9977ed1b732fc05901d64582bb875b8587b16 SHA512 1af90c8867f6426983fd3eb22651f0f2ab425b1a74110bda0277339ad82c7cffcc9ba9d9790909f5120f8a4d5c2cd82ed1ef9555511fc4c4064dd1563ec75abf
-EBUILD lure-1.1-r1.ebuild 2738 BLAKE2B 6f8513605c1cef2fb69cf69c24a3172e5fcb203f7c6d1136941ce21dd73df5938307253fc6131ed161577d87820a49583462e4b49cd9e802e44b85e0df3efb72 SHA512 ecfbcf36866feb2b13a301e3a4833f1ed42023434564fd9892e5d8ca5e629b57a0099442f3af3434863ae8e139612d94917406947105cddd95740c0c50623249
-MISC metadata.xml 330 BLAKE2B 4f070e6c8bc4c2f6b4efb4f0eb84ea861773fba85acda1f4dec223a6594e2cdf4ac90c895a98819e2fab2ba2cd30081aee591554d2e932025a9da6d3c16a275b SHA512 4541c93daab84bd6d0764adccf44bb4986ba02303e731b5b9a7a8060bb88a32c1cef91e2b2910e15915b67cf3ea2b5f31b4e637909d1d0b7c3b627f1134206dc
diff --git a/games-rpg/lure/lure-1.1-r1.ebuild b/games-rpg/lure/lure-1.1-r1.ebuild
deleted file mode 100644
index 0cfadea6e171..000000000000
--- a/games-rpg/lure/lure-1.1-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DAT_PV=0.13.1
-DESCRIPTION="Lure of the Temptress"
-HOMEPAGE="http://www.revolution.co.uk/_display.php?id=10"
-SRC_URI="
-	https://raw.githubusercontent.com/scummvm/scummvm/266aef932a8a052df897e4d79b4572e5d169916f/dists/engine-data/lure.dat -> lure-${DAT_PV}.dat
-	!l10n_en? ( !l10n_es? ( !l10n_fr? ( !l10n_de? ( !l10n_it?
-		( mirror://sourceforge/scummvm/${P}.zip -> ${PN}-en-${PV}.zip ) ) ) ) )
-	l10n_en? ( mirror://sourceforge/scummvm/${P}.zip  -> ${PN}-en-${PV}.zip )
-	l10n_es? ( mirror://sourceforge/scummvm/${PN}-es-${PV}.zip )
-	l10n_fr? ( mirror://sourceforge/scummvm/${PN}-fr-${PV}.zip )
-	l10n_de? ( mirror://sourceforge/scummvm/${PN}-de-${PV}.zip )
-	l10n_it? ( mirror://sourceforge/scummvm/${PN}-it-${PV}.zip )"
-
-LICENSE="lure"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LANGS_IUSE="l10n_en l10n_es l10n_de l10n_fr l10n_it"
-IUSE=${LANGS_IUSE}
-RESTRICT="mirror"
-
-RDEPEND=">=games-engines/scummvm-0.13.1"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-any_l10n() {
-	use l10n_en || use l10n_es || use l10n_de || use l10n_fr || use l10n_it
-}
-
-src_unpack() {
-	local lang
-
-	if any_l10n ; then
-		for lang in ${LANGS_IUSE}
-		do
-			use ${lang} && unpack ${PN}-${lang/l10n_}-${PV}.zip
-		done
-		mv lure lure-en 2> /dev/null
-	else
-		unpack ${PN}-en-${PV}.zip
-	fi
-}
-
-src_prepare() {
-	local lang f
-
-	default
-
-	find . \
-		\( -iname "*exe" \
-		-o -iname "*ega" \
-		-o -iname LICENSE.txt \) \
-		-exec rm -f '{}' +
-	mkdir docs
-	if any_l10n ; then
-		for lang in ${LANGS_IUSE}
-		do
-			mkdir docs/${lang}
-			find lure-${lang/l10n_} \
-				\( -iname "*pdf" \
-				-o -iname README \
-				-o -iname "*txt" \) \
-				-exec mv '{}' docs/${lang} \; 2> /dev/null
-		done
-	else
-		find lure \
-			\( -iname "*pdf" \
-			-o -iname README \
-			-o -iname "*txt" \) \
-			-exec mv '{}' docs \; 2> /dev/null
-	fi
-	for f in $(find docs -type f)
-	do
-		mv ${f} ${f%.*}.$(echo ${f#*.} | tr '[[:upper:]]' '[[:lower:]]') 2> /dev/null
-	done
-}
-
-src_install() {
-	local lang
-
-	if any_l10n ; then
-		for lang in ${LANGS_IUSE}
-		do
-			if use ${lang} ; then
-				lang=${lang/l10n_}
-				insinto "/usr/share/${PN}-${lang}"
-				newins "${DISTDIR}"/lure-${DAT_PV}.dat lure.dat
-				doins -r ${PN}-${lang}/*
-				make_wrapper ${PN}-${lang} "scummvm -q ${lang} -f -p \"/usr/share/${PN}-${lang}\" lure" .
-				make_desktop_entry ${PN}-${lang} "Lure of the Temptress (${lang})" ${PN}
-				docinto l10n_${lang}
-				dodoc docs/l10n_${lang}/*
-			fi
-		done
-	else
-		insinto "/usr/share/${PN}"
-		newins "${DISTDIR}"/lure-${DAT_PV}.dat lure.dat
-		doins -r ${PN}/*
-		make_wrapper ${PN} "scummvm -f -p \"/usr/share/${PN}\" lure" .
-		make_desktop_entry ${PN} "Lure of the Temptress"
-	fi
-}
diff --git a/games-rpg/lure/metadata.xml b/games-rpg/lure/metadata.xml
deleted file mode 100644
index 801e2cc48963..000000000000
--- a/games-rpg/lure/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">scummvm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-rpg/manaplus-1.8.2.17 b/games-rpg/manaplus-1.8.2.17
new file mode 100644
index 000000000000..9d639c54ae18
--- /dev/null
+++ b/games-rpg/manaplus-1.8.2.17
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=>=dev-games/physfs-1.0.0 media-fonts/dejavu media-fonts/liberation-fonts media-fonts/mplus-outline-fonts media-fonts/wqy-microhei media-libs/libpng:0= net-misc/curl sys-libs/zlib x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils mumble? ( media-sound/mumble ) nls? ( virtual/libintl ) opengl? ( virtual/opengl ) pugixml? ( dev-libs/pugixml ) !pugixml? ( dev-libs/libxml2 ) sdl2? ( media-libs/libsdl2[X,opengl?,video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net media-libs/sdl2-ttf ) !sdl2? ( media-libs/libsdl[X,opengl?,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf ) virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=OpenSource 2D MMORPG client for Evol Online and The Mana World
+EAPI=6
+HOMEPAGE=http://manaplus.evolonline.org
+IUSE=mumble nls opengl pugixml +sdl2 test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-games/physfs-1.0.0 media-fonts/dejavu media-fonts/liberation-fonts media-fonts/mplus-outline-fonts media-fonts/wqy-microhei media-libs/libpng:0= net-misc/curl sys-libs/zlib x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils mumble? ( media-sound/mumble ) nls? ( virtual/libintl ) opengl? ( virtual/opengl ) pugixml? ( dev-libs/pugixml ) !pugixml? ( dev-libs/libxml2 ) sdl2? ( media-libs/libsdl2[X,opengl?,video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net media-libs/sdl2-ttf ) !sdl2? ( media-libs/libsdl[X,opengl?,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf )
+SLOT=0
+SRC_URI=http://download.evolonline.org/manaplus/download/1.8.2.17/manaplus-1.8.2.17.tar.xz
+_md5_=fc0eb614533c862571c73fb2fbe383c1
diff --git a/games-rpg/manaplus-1.8.4.14 b/games-rpg/manaplus-1.8.4.14
new file mode 100644
index 000000000000..7ca7b10bc30a
--- /dev/null
+++ b/games-rpg/manaplus-1.8.4.14
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=>=dev-games/physfs-1.0.0 media-fonts/dejavu media-fonts/liberation-fonts media-fonts/mplus-outline-fonts media-fonts/wqy-microhei media-libs/libpng:0= net-misc/curl sys-libs/zlib x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils mumble? ( media-sound/mumble ) nls? ( virtual/libintl ) opengl? ( virtual/opengl ) pugixml? ( dev-libs/pugixml ) !pugixml? ( dev-libs/libxml2 ) sdl2? ( media-libs/libsdl2[X,opengl?,video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net media-libs/sdl2-ttf ) !sdl2? ( media-libs/libsdl[X,opengl?,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf ) virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=OpenSource 2D MMORPG client for Evol Online and The Mana World
+EAPI=6
+HOMEPAGE=http://manaplus.evolonline.org
+IUSE=mumble nls opengl pugixml +sdl2 test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-games/physfs-1.0.0 media-fonts/dejavu media-fonts/liberation-fonts media-fonts/mplus-outline-fonts media-fonts/wqy-microhei media-libs/libpng:0= net-misc/curl sys-libs/zlib x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils mumble? ( media-sound/mumble ) nls? ( virtual/libintl ) opengl? ( virtual/opengl ) pugixml? ( dev-libs/pugixml ) !pugixml? ( dev-libs/libxml2 ) sdl2? ( media-libs/libsdl2[X,opengl?,video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net media-libs/sdl2-ttf ) !sdl2? ( media-libs/libsdl[X,opengl?,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf )
+SLOT=0
+SRC_URI=http://download.evolonline.org/manaplus/download/1.8.4.14/manaplus-1.8.4.14.tar.xz
+_md5_=fc0eb614533c862571c73fb2fbe383c1
diff --git a/games-rpg/manaplus-9999 b/games-rpg/manaplus-9999
new file mode 100644
index 000000000000..29bc2f2e18a5
--- /dev/null
+++ b/games-rpg/manaplus-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install prepare test unpack
+DEPEND=>=dev-games/physfs-1.0.0 media-fonts/dejavu media-fonts/liberation-fonts media-fonts/mplus-outline-fonts media-fonts/wqy-microhei media-libs/libpng:0= net-misc/curl sys-libs/zlib x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils mumble? ( media-sound/mumble ) nls? ( virtual/libintl ) opengl? ( virtual/opengl ) pugixml? ( dev-libs/pugixml ) !pugixml? ( dev-libs/libxml2 ) sdl2? ( media-libs/libsdl2[X,opengl?,video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net media-libs/sdl2-ttf ) !sdl2? ( media-libs/libsdl[X,opengl?,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf ) 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:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=OpenSource 2D MMORPG client for Evol Online and The Mana World
+EAPI=6
+HOMEPAGE=http://manaplus.evolonline.org
+IUSE=mumble nls opengl pugixml +sdl2 test
+LICENSE=GPL-2+
+RDEPEND=>=dev-games/physfs-1.0.0 media-fonts/dejavu media-fonts/liberation-fonts media-fonts/mplus-outline-fonts media-fonts/wqy-microhei media-libs/libpng:0= net-misc/curl sys-libs/zlib x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils mumble? ( media-sound/mumble ) nls? ( virtual/libintl ) opengl? ( virtual/opengl ) pugixml? ( dev-libs/pugixml ) !pugixml? ( dev-libs/libxml2 ) sdl2? ( media-libs/libsdl2[X,opengl?,video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net media-libs/sdl2-ttf ) !sdl2? ( media-libs/libsdl[X,opengl?,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf )
+SLOT=0
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=609f04dc4da4d8458f5de2321e909951
diff --git a/games-rpg/manaplus/Manifest b/games-rpg/manaplus/Manifest
deleted file mode 100644
index cfa37efc0ce3..000000000000
--- a/games-rpg/manaplus/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST manaplus-1.8.2.17.tar.xz 14982240 BLAKE2B 8ed41c0af49ed3c3bfce69e4c29fc4a3a555fbda1cb05f2c3fb6395c74cdca4d22e890422137573a6b308d3cfe09416892bc6850f11469a267d9419a44b112a8 SHA512 b67a7e5986b5aa9716e4ae4ee651e63445f11e7efe258726d8f7c5245ebc9e5da9b4b65fb561023bfcca492098f3a6da9cac77e5ace27a4b7b0a7245e38ac08d
-DIST manaplus-1.8.4.14.tar.xz 14991068 BLAKE2B d4d075230fa65ec480576521808d380781262a420783c838b5986f1a747ef672344efb684a90cbe2fea757f8256940a29250756d48cdcfc40c99466a40407bb4 SHA512 81ed9a7de09aa03f8585361a205fac97b604fbd39c78e584d2d9808fb72a789b33fc4e6bde9bedd6e0b1a53308c9299777d1434d5e81ce13e4c09ef9118f4b40
-EBUILD manaplus-1.8.2.17.ebuild 3230 BLAKE2B c91d5ddf5dcb75dc455e260bffd57942ab7b669a76b5f97d8eddb4b50fe0f2f95caef66e85ef7aefa2c88152c65f202ca9cd40f37ddd6426d2414e2f7033a276 SHA512 761173492ccbd58b39041b73b732c4e383010907bb103717ea03cfdf8a7b10046975776c93ff2ea5f2e2217ad3d42db6e94b3ab425a74795d8e1a10777cec979
-EBUILD manaplus-1.8.4.14.ebuild 3230 BLAKE2B c91d5ddf5dcb75dc455e260bffd57942ab7b669a76b5f97d8eddb4b50fe0f2f95caef66e85ef7aefa2c88152c65f202ca9cd40f37ddd6426d2414e2f7033a276 SHA512 761173492ccbd58b39041b73b732c4e383010907bb103717ea03cfdf8a7b10046975776c93ff2ea5f2e2217ad3d42db6e94b3ab425a74795d8e1a10777cec979
-EBUILD manaplus-9999.ebuild 3230 BLAKE2B f52d143d1d65408977c51e11cef63dda60d907bac57f5a818897274ae1819bea37b602acbfaea8a84269165ad9993bf00f1938f64fd0a78f886efe81ab4d76e4 SHA512 4db1f628715e6978cdd6d7a59e739ac1b339ff90a18fdf08649f7a68157abbb934efc4fae0e047151a8c9f0979aba6cfe23c8e8c4ad46d52cf1adbdebd6c75aa
-MISC metadata.xml 501 BLAKE2B 2fbdeba8c61dc321a8e89eae7580ffbed4c528f8f8cc367482aa7e344b666322414a5a0c9cf5d4b017e8bd4ed4d5e703fc719c86affe74c40acae4d52c47a424 SHA512 12cc5fda141e141100145ccdf97f56b4dfd5e9941348598e88f13b6524133585dcb9c9ee66c74660c6ab1b8c497d5d943ae59547d5e4ed9272c352ed6e4bb1f5
diff --git a/games-rpg/manaplus/manaplus-1.8.2.17.ebuild b/games-rpg/manaplus/manaplus-1.8.2.17.ebuild
deleted file mode 100644
index 0008d1923b6b..000000000000
--- a/games-rpg/manaplus/manaplus-1.8.2.17.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
-
-DESCRIPTION="OpenSource 2D MMORPG client for Evol Online and The Mana World"
-HOMEPAGE="http://manaplus.evolonline.org"
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/ManaPlus/ManaPlus.git"
-else
-	SRC_URI="http://download.evolonline.org/manaplus/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="mumble nls opengl pugixml +sdl2 test"
-
-RDEPEND="
-	>=dev-games/physfs-1.0.0
-	media-fonts/dejavu
-	media-fonts/liberation-fonts
-	media-fonts/mplus-outline-fonts
-	media-fonts/wqy-microhei
-	media-libs/libpng:0=
-	net-misc/curl
-	sys-libs/zlib
-	x11-apps/xmessage
-	x11-libs/libX11
-	x11-misc/xdg-utils
-	mumble? ( media-sound/mumble )
-	nls? ( virtual/libintl )
-	opengl? ( virtual/opengl )
-	pugixml? ( dev-libs/pugixml )
-	!pugixml? ( dev-libs/libxml2 )
-	sdl2? (
-		media-libs/libsdl2[X,opengl?,video]
-		media-libs/sdl2-gfx
-		media-libs/sdl2-image[png]
-		media-libs/sdl2-mixer[vorbis]
-		media-libs/sdl2-net
-		media-libs/sdl2-ttf
-	)
-	!sdl2? (
-		media-libs/libsdl[X,opengl?,video]
-		media-libs/sdl-gfx
-		media-libs/sdl-image[png]
-		media-libs/sdl-mixer[vorbis]
-		media-libs/sdl-net
-		media-libs/sdl-ttf
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localedir=/usr/share/locale
-		--without-internalsdlgfx
-		$(use_with mumble)
-		$(use_enable nls)
-		$(use_with opengl)
-		--enable-libxml=$(usex pugixml pugixml libxml)
-		$(use_with sdl2)
-		$(use_enable test unittests)
-	)
-	CONFIG_SHELL=/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	local destpath="/usr/share/${PN}"
-	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf "${destpath}"/data/fonts/dejavusans-bold.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${destpath}"/data/fonts/dejavusans.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf "${destpath}"/data/fonts/dejavusansmono-bold.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSansMono.ttf "${destpath}"/data/fonts/dejavusansmono.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSerifCondensed-Bold.ttf "${destpath}"/data/fonts/dejavuserifcondensed-bold.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSerifCondensed.ttf "${destpath}"/data/fonts/dejavuserifcondensed.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationMono-Bold.ttf "${destpath}"/data/fonts/liberationsansmono-bold.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationMono-Regular.ttf "${destpath}"/data/fonts/liberationsansmono.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationSans-Bold.ttf "${destpath}"/data/fonts/liberationsans-bold.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationSans-Regular.ttf "${destpath}"/data/fonts/liberationsans.ttf
-	dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-bold.ttf "${destpath}"/data/fonts/mplus-1p-bold.ttf
-	dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-regular.ttf "${destpath}"/data/fonts/mplus-1p-regular.ttf
-	dosym /usr/share/fonts/wqy-microhei/wqy-microhei.ttc "${destpath}"/data/fonts/wqy-microhei.ttf
-}
-
-src_test() {
-	make check
-}
diff --git a/games-rpg/manaplus/manaplus-1.8.4.14.ebuild b/games-rpg/manaplus/manaplus-1.8.4.14.ebuild
deleted file mode 100644
index 0008d1923b6b..000000000000
--- a/games-rpg/manaplus/manaplus-1.8.4.14.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
-
-DESCRIPTION="OpenSource 2D MMORPG client for Evol Online and The Mana World"
-HOMEPAGE="http://manaplus.evolonline.org"
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/ManaPlus/ManaPlus.git"
-else
-	SRC_URI="http://download.evolonline.org/manaplus/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="mumble nls opengl pugixml +sdl2 test"
-
-RDEPEND="
-	>=dev-games/physfs-1.0.0
-	media-fonts/dejavu
-	media-fonts/liberation-fonts
-	media-fonts/mplus-outline-fonts
-	media-fonts/wqy-microhei
-	media-libs/libpng:0=
-	net-misc/curl
-	sys-libs/zlib
-	x11-apps/xmessage
-	x11-libs/libX11
-	x11-misc/xdg-utils
-	mumble? ( media-sound/mumble )
-	nls? ( virtual/libintl )
-	opengl? ( virtual/opengl )
-	pugixml? ( dev-libs/pugixml )
-	!pugixml? ( dev-libs/libxml2 )
-	sdl2? (
-		media-libs/libsdl2[X,opengl?,video]
-		media-libs/sdl2-gfx
-		media-libs/sdl2-image[png]
-		media-libs/sdl2-mixer[vorbis]
-		media-libs/sdl2-net
-		media-libs/sdl2-ttf
-	)
-	!sdl2? (
-		media-libs/libsdl[X,opengl?,video]
-		media-libs/sdl-gfx
-		media-libs/sdl-image[png]
-		media-libs/sdl-mixer[vorbis]
-		media-libs/sdl-net
-		media-libs/sdl-ttf
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localedir=/usr/share/locale
-		--without-internalsdlgfx
-		$(use_with mumble)
-		$(use_enable nls)
-		$(use_with opengl)
-		--enable-libxml=$(usex pugixml pugixml libxml)
-		$(use_with sdl2)
-		$(use_enable test unittests)
-	)
-	CONFIG_SHELL=/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	local destpath="/usr/share/${PN}"
-	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf "${destpath}"/data/fonts/dejavusans-bold.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${destpath}"/data/fonts/dejavusans.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf "${destpath}"/data/fonts/dejavusansmono-bold.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSansMono.ttf "${destpath}"/data/fonts/dejavusansmono.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSerifCondensed-Bold.ttf "${destpath}"/data/fonts/dejavuserifcondensed-bold.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSerifCondensed.ttf "${destpath}"/data/fonts/dejavuserifcondensed.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationMono-Bold.ttf "${destpath}"/data/fonts/liberationsansmono-bold.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationMono-Regular.ttf "${destpath}"/data/fonts/liberationsansmono.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationSans-Bold.ttf "${destpath}"/data/fonts/liberationsans-bold.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationSans-Regular.ttf "${destpath}"/data/fonts/liberationsans.ttf
-	dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-bold.ttf "${destpath}"/data/fonts/mplus-1p-bold.ttf
-	dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-regular.ttf "${destpath}"/data/fonts/mplus-1p-regular.ttf
-	dosym /usr/share/fonts/wqy-microhei/wqy-microhei.ttc "${destpath}"/data/fonts/wqy-microhei.ttf
-}
-
-src_test() {
-	make check
-}
diff --git a/games-rpg/manaplus/manaplus-9999.ebuild b/games-rpg/manaplus/manaplus-9999.ebuild
deleted file mode 100644
index 2d5897b5d6f1..000000000000
--- a/games-rpg/manaplus/manaplus-9999.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
-
-DESCRIPTION="OpenSource 2D MMORPG client for Evol Online and The Mana World"
-HOMEPAGE="http://manaplus.evolonline.org"
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/ManaPlus/ManaPlus.git"
-else
-	SRC_URI="http://download.evolonline.org/manaplus/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="mumble nls opengl pugixml +sdl2 test"
-
-RDEPEND="
-	>=dev-games/physfs-1.0.0
-	media-fonts/dejavu
-	media-fonts/liberation-fonts
-	media-fonts/mplus-outline-fonts
-	media-fonts/wqy-microhei
-	media-libs/libpng:0=
-	net-misc/curl
-	sys-libs/zlib
-	x11-apps/xmessage
-	x11-libs/libX11
-	x11-misc/xdg-utils
-	mumble? ( media-sound/mumble )
-	nls? ( virtual/libintl )
-	opengl? ( virtual/opengl )
-	pugixml? ( dev-libs/pugixml )
-	!pugixml? ( dev-libs/libxml2 )
-	sdl2? (
-		media-libs/libsdl2[X,opengl?,video]
-		media-libs/sdl2-gfx
-		media-libs/sdl2-image[png]
-		media-libs/sdl2-mixer[vorbis]
-		media-libs/sdl2-net
-		media-libs/sdl2-ttf
-	)
-	!sdl2? (
-		media-libs/libsdl[X,opengl?,video]
-		media-libs/sdl-gfx
-		media-libs/sdl-image[png]
-		media-libs/sdl-mixer[vorbis]
-		media-libs/sdl-net
-		media-libs/sdl-ttf
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localedir=/usr/share/locale
-		--without-internalsdlgfx
-		$(use_with mumble)
-		$(use_enable nls)
-		$(use_with opengl)
-		--enable-libxml=$(usex pugixml pugixml libxml)
-		$(use_with sdl2)
-		$(use_enable test unittests)
-	)
-	CONFIG_SHELL=/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	local destpath="/usr/share/${PN}"
-	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf "${destpath}"/data/fonts/dejavusans-bold.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${destpath}"/data/fonts/dejavusans.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf "${destpath}"/data/fonts/dejavusansmono-bold.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSansMono.ttf "${destpath}"/data/fonts/dejavusansmono.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSerifCondensed-Bold.ttf "${destpath}"/data/fonts/dejavuserifcondensed-bold.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSerifCondensed.ttf "${destpath}"/data/fonts/dejavuserifcondensed.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationMono-Bold.ttf "${destpath}"/data/fonts/liberationsansmono-bold.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationMono-Regular.ttf "${destpath}"/data/fonts/liberationsansmono.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationSans-Bold.ttf "${destpath}"/data/fonts/liberationsans-bold.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationSans-Regular.ttf "${destpath}"/data/fonts/liberationsans.ttf
-	dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-bold.ttf "${destpath}"/data/fonts/mplus-1p-bold.ttf
-	dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-regular.ttf "${destpath}"/data/fonts/mplus-1p-regular.ttf
-	dosym /usr/share/fonts/wqy-microhei/wqy-microhei.ttc "${destpath}"/data/fonts/wqy-microhei.ttf
-}
-
-src_test() {
-	make check
-}
diff --git a/games-rpg/manaplus/metadata.xml b/games-rpg/manaplus/metadata.xml
deleted file mode 100644
index 474048077e6d..000000000000
--- a/games-rpg/manaplus/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="sdl2">Use libsdl2 instead of libsdl</flag>
-		<flag name="pugixml">Use <pkg>dev-libs/pugixml</pkg> for XML parsing isntead of <pkg>dev-libs/libxml2</pkg></flag>
-		<flag name="mumble">Enable support for voice chat</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-rpg/metadata.xml b/games-rpg/metadata.xml
deleted file mode 100644
index 69a2c2a773bf..000000000000
--- a/games-rpg/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The games-rpg category contains role-playing games.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie games-rpg enthält Rollenspiele.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría games-rpg contiene juegos de rol.
-	</longdescription>
-	<longdescription lang="ja">
-		games-rpgカテゴリーにはロール・プレイング・ゲームが含まれています。
-	</longdescription>
-	<longdescription lang="nl">
-		De games-rpg categorie bevat rollenspellen (Role-Playing Games).
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm games-rpg chứa các trò chơi dạng chơi theo lượt (role-playing - RPG).
-	</longdescription>
-	<longdescription lang="it">
-		La categoria games-rpg contiene giochi di ruolo.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria games-rpg contém jogos de RPG (Role-Playing Games).
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria games-rpg zawiera gry RPG.
-	</longdescription>
-</catmetadata>
-
diff --git a/games-rpg/openglad-0.98-r1 b/games-rpg/openglad-0.98-r1
new file mode 100644
index 000000000000..8c486f870432
--- /dev/null
+++ b/games-rpg/openglad-0.98-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=media-libs/libsdl[joystick,sound,video] media-libs/sdl-image media-libs/sdl-mixer
+DESCRIPTION=An SDL clone of Gladiator, a classic RPG game
+EAPI=6
+HOMEPAGE=http://snowstorm.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[joystick,sound,video] media-libs/sdl-image media-libs/sdl-mixer
+SLOT=0
+SRC_URI=mirror://sourceforge/snowstorm/openglad-0.98.tar.gz mirror://gentoo/openglad.png
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a0f2dd61f3213a983f9bc8784d116b5c
diff --git a/games-rpg/openglad/Manifest b/games-rpg/openglad/Manifest
deleted file mode 100644
index 920a954af436..000000000000
--- a/games-rpg/openglad/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX 0.98-gladpack.c.patch 511 BLAKE2B 57434e5edd25f0757e18f2c2c73198236fa069eb09e30fd4c314232db1d1448aa5b190f5a2c9d600419c37b6301e5760af2c7a7803f23026a9fd3b0d49a731af SHA512 ea9fca36e2fef7157a2d2b81541d8fd7be1cad6087349927874aa3950001e3e02f2d21ce3793cd5c600236b21e64e0ed86839c41a39e5ba458c1714220ad2f01
-AUX openglad-0.98-gcc43.patch 205 BLAKE2B 05dac9336eac12434d51ebe1322387ec1c32d77bda52f654312075260f1add0a24d4d5834e2d72d6c8208851f583b245147595a8df2e9a9b6e72bf72dcc1421c SHA512 c7f6b4602234f7119dea119a6fd7c2edd07af856dd711195a942d291063912c46a202f446db8183eb62cc0a2aea3586bb3a2b8e1140d4d915be1fd6e166eb4d1
-AUX openglad-0.98-ovfl.patch 381 BLAKE2B 28a7d1dabbacaf665f01f1b238c904855706921b9ae33e09802104734c3456889aa409cdc38bc12e076d609df0909f6ecab7a02be15933d90c4ec8fba11abb00 SHA512 00ac89d9cf223ac8db111b30ce7838b892f318ac8c8a93522afa719a98887c386eb95c788a912c4bfce99ef804a8395b3c2260b9ec22454651e6f2539d1833e8
-DIST openglad-0.98.tar.gz 724106 BLAKE2B 6cd9df5fd260af9902997bc0708c8285e48081e52fff7af05f432ae94f2f6fdbfba162c664ac4f531796a0372f1be3be064843dad75163e68b7e324b9b6d506d SHA512 3f9165fbf8fff081a862bfe81401a3b2ac227da58b84409beee8b0441f88b1a6deb3d24a1af6e71bd3a3484fc90de5574950fd54be82d837021a07f06302f0e1
-DIST openglad.png 5593 BLAKE2B 1fbc5a32861dc4cc5bb4aae4b1b42e92411756618ccfa4172e1494c4f98eb527f6bd36273a250cd7ce721baa76ba80548d75ec1e89b3da134c78d0a7b415b6bd SHA512 27419fcbbbf8640718968304a4824101860736c2091f494defcd111b5cc252856b5373c0e7a2bca1c79f9c7551012b0ba04577f9ed97769e436637ee25f5caeb
-EBUILD openglad-0.98-r1.ebuild 868 BLAKE2B 70f20201f2cbf7f82701e2d4d6058213121bd8d2c05fcfe3c1f0230410901feea5c82954933c3dfc30c5d852d574facccada3157571a4b07f36151f1ad052f4a SHA512 20fc6585c53de645d5a0b12858819cd28a2174a4f67518f245d33a8c6a8647ef69ccee4954df15365966ffa613a7c3bc3fe92b1e16b7cd5789c9af0e9bb7555e
-MISC metadata.xml 332 BLAKE2B 29e8535bbe3b4ccd5225fdee9e19b41afba42751a9926226375f47e320cb743944b4fb81eb1b665ea9782df581eba22db602e4515b2cd723ca319ef90bfa86ff SHA512 b751058cb6393309c0635329d5fd5236b013d2e07d5e2e2a7fdffcb50ee8dd60e8b0157d161ba498e01140106f91f3b2052a43737be12214f7f065ebd9f6d07d
diff --git a/games-rpg/openglad/files/0.98-gladpack.c.patch b/games-rpg/openglad/files/0.98-gladpack.c.patch
deleted file mode 100644
index b4f5de9e3995..000000000000
--- a/games-rpg/openglad/files/0.98-gladpack.c.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- openglad-0.98/util/gladpack.c	2002-09-14 18:37:50.000000000 +1000
-+++ openglad-0.98/util/gladpack.c	2003-12-06 12:42:31.393812945 +1100
-@@ -9,8 +9,8 @@
- 
- int main(int argc, char **argv)
- {
--	if (argc > 1 && !strcmp(argv[1], "p")) pack(argc, argv);
--	else if (argc > 1 && !strcmp(argv[1], "u")) unpack(argc, argv);
-+	if (argc > 1 && !strcmp(argv[1], "p")) return pack(argc, argv);
-+	else if (argc > 1 && !strcmp(argv[1], "u")) return unpack(argc, argv);
- 	else
- 	{
- 		printf("Usage: gladpack (p|u) ...\n");
diff --git a/games-rpg/openglad/files/openglad-0.98-gcc43.patch b/games-rpg/openglad/files/openglad-0.98-gcc43.patch
deleted file mode 100644
index 9f46ce8e5b95..000000000000
--- a/games-rpg/openglad/files/openglad-0.98-gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/parser.cpp
-+++ b/src/parser.cpp
-@@ -23,6 +23,8 @@
- #include <iostream>
- #include <fstream>
- #include <string>
-+#include <cstring>
-+#include <cstdlib>
- #include "parser.h"
- 
- using namespace std;
diff --git a/games-rpg/openglad/files/openglad-0.98-ovfl.patch b/games-rpg/openglad/files/openglad-0.98-ovfl.patch
deleted file mode 100644
index 8ec89d22559d..000000000000
--- a/games-rpg/openglad/files/openglad-0.98-ovfl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/screen.cpp	2011-07-23 21:35:34.385063301 +0200
-+++ b/src/screen.cpp	2011-07-23 21:35:59.948063312 +0200
-@@ -2383,7 +2383,7 @@
- 	short listsize;
- 	short i;
- 	walker * new_guy;
--	char newgrid[12] = "grid.pix";  // default grid
-+	char newgrid[13] = "grid.pix";  // default grid
- 	char new_scen_type; // read the scenario type
- 	char oneline[80];
- 	char numlines, tempwidth;
diff --git a/games-rpg/openglad/metadata.xml b/games-rpg/openglad/metadata.xml
deleted file mode 100644
index b093b0fee1ec..000000000000
--- a/games-rpg/openglad/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">snowstorm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-rpg/openglad/openglad-0.98-r1.ebuild b/games-rpg/openglad/openglad-0.98-r1.ebuild
deleted file mode 100644
index 8d38d5ca0ff0..000000000000
--- a/games-rpg/openglad/openglad-0.98-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="An SDL clone of Gladiator, a classic RPG game"
-HOMEPAGE="http://snowstorm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/snowstorm/${P}.tar.gz
-	mirror://gentoo/${PN}.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	media-libs/libsdl[joystick,sound,video]
-	media-libs/sdl-image
-	media-libs/sdl-mixer"
-RDEPEND=${DEPEND}
-
-PATCHES=(
-		"${FILESDIR}"/${P}-gcc43.patch
-		"${FILESDIR}"/${PV}-gladpack.c.patch
-		"${FILESDIR}"/${P}-ovfl.patch
-)
-
-src_configure() {
-	econf \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--datadir=/usr/share/${PN}
-}
-
-src_install() {
-	emake install \
-		DESTDIR="${D}" \
-		docdir="${D}"/usr/share/doc/${PF}
-	doicon "${DISTDIR}"/${PN}.png
-	make_desktop_entry openglad OpenGladiator
-}
diff --git a/games-rpg/pcgen-6.04.01-r1 b/games-rpg/pcgen-6.04.01-r1
new file mode 100644
index 000000000000..0c38ef9e4708
--- /dev/null
+++ b/games-rpg/pcgen-6.04.01-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=D&D character generator
+EAPI=6
+HOMEPAGE=http://pcgen.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1 OGL-1.0a
+RDEPEND=>=virtual/jre-1.6
+SLOT=0
+SRC_URI=mirror://sourceforge/pcgen/pcgen-6.04.01-full.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fb8ad46c75f6fe3315784346e56ce4b5
diff --git a/games-rpg/pcgen/Manifest b/games-rpg/pcgen/Manifest
deleted file mode 100644
index 9b2cefe9d8e1..000000000000
--- a/games-rpg/pcgen/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pcgen-6.04.01-full.zip 68679438 BLAKE2B e9afa6b9937804988425d8d18cfed7728197ecc303f586ed899491e4d500eb0e6ddc0ae92aef1d4bfef7ff3fb987cca34af95246c83ebe71e089e3e5e91aa9dd SHA512 37e76e9bca3defe803459f898d3c51015cb4c4f69905c4179b78b1b26977b7d720ef413b3f5b2ef4252aa98f732075b9567c4f4822c61d169a5a0a6e2c78c0d4
-EBUILD pcgen-6.04.01-r1.ebuild 842 BLAKE2B d5d84e121027a78a3f4a61f86ada0ad7131364351afa76037824accdb759b98ea52e1fee918b14fb6dbaa134afe058f79b8e0c516e37703007bfa8314b6a45d8 SHA512 03ee28a1f12050b8cbbc1498a9f218983955ab6ecb2d5b10a60880bef6eb45eeb4032462b7afb733bcab705f18ffdcf68e5896a7d47b65d745b16665eb9800b6
-MISC metadata.xml 328 BLAKE2B 45ace1f30157cc4450f9dc90a24a7a6112a09fe61c1a17dca06b87d32fdbce9c7f704b36bb217da0371f71a8ff9b2ecdccbb63ad7b981587f61c33a3c4ef6adb SHA512 cd3e9ca2c51782031b89444cc5c3eda37537c04467753e9a6bd5c2e5357d5ba3077ed6aee0adeac6dd91c829c7fded3077fb8d39ab8e80d87e3dc62af5605cb7
diff --git a/games-rpg/pcgen/metadata.xml b/games-rpg/pcgen/metadata.xml
deleted file mode 100644
index e2b2929d7fb9..000000000000
--- a/games-rpg/pcgen/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">pcgen</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-rpg/pcgen/pcgen-6.04.01-r1.ebuild b/games-rpg/pcgen/pcgen-6.04.01-r1.ebuild
deleted file mode 100644
index 45e32d2039b7..000000000000
--- a/games-rpg/pcgen/pcgen-6.04.01-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils
-
-DESCRIPTION="D&D character generator"
-HOMEPAGE="http://pcgen.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pcgen/${P}-full.zip"
-
-LICENSE="LGPL-2.1 OGL-1.0a"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	default
-
-	rm -vf *.bat || die
-	sed "/dirname/ c\cd \"\/usr\/share\/${PN}\"" pcgen.sh > "${T}"/${PN} || die
-}
-
-src_install() {
-	dobin "${T}"/${PN}
-	insinto /usr/share/${PN}
-	doins -r *
-	newicon -s 128 system/sponsors/pcgen/pcgen_128x128.png ${PN}.png
-	make_desktop_entry ${PN} PCGen
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/queen-1-r1 b/games-rpg/queen-1-r1
new file mode 100644
index 000000000000..5bc0a0447784
--- /dev/null
+++ b/games-rpg/queen-1-r1
@@ -0,0 +1,14 @@
+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=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] )
+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_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4dd867ef6ff08929f6191b45dd339901
diff --git a/games-rpg/queen/Manifest b/games-rpg/queen/Manifest
deleted file mode 100644
index 8ddf6b94c23e..000000000000
--- a/games-rpg/queen/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST FOTAQ_Fr_Talkie_1.0.zip 64531589 BLAKE2B b78af1adcf19d726ce0348a4b26bdf1d88833e7f7b5b00abfb3d6c112fddd5e4266f2dcf792b06c8828f308e50328d67d5c550b1ddf15dccd027c60d83cfccb0 SHA512 c53180eabb797e5a857ef97d0e70f880a0c729fbbf6443e67ea21ec6af36f69e7039b8341b21c1e998064cfdae916f6a799bce7b38038e83bc91aee16737f797
-DIST FOTAQ_Ger_talkie-1.0.zip 75938507 BLAKE2B fe88beb385fa74854b3f84bdac76d6382266e0be74a56a6b9c07cbd48849c04dc9065d051185f840a1bffc73fd4cbaabfc588f7482a9ecdd383ab3f13c18f67f SHA512 65b6ae3fec052d616b52efb9eb74017587e39c0aa27a96f46b733b5caf2039193e6e1a99b873cdd8efe9d67b70fb0c48067731ba2d146350ed2fcf4551963837
-DIST FOTAQ_Heb_talkie.zip 66213122 BLAKE2B d739899f64bdda23726a35ad1f9959c931378dab45afe6ef887dd0fcb963fdb85844ba1d50dbcb4b641b6f02062294df414aad1ce340375e169c47731d3344aa SHA512 497c4b9a08dbb1abb3eec69f540ec06a4b66c681fe9c032e58307e7fe1fb31391eb6f1001fe0e0b429542c512f43786e518d101912c97cef33d2deda35c1670e
-DIST FOTAQ_It_Talkie_1.0.zip 65091076 BLAKE2B 4f4ee3a4f4ef6f2f3375d5cfa7fd67c17f0bea7b9a6758bbfee865f2a39ec921f145a80b9356b15745a4b2564c56ff152d2083ddb0e032247e73ecf71971b93e SHA512 01ce230232d0288fed5af55c2cb7f06cf31e89cabcb6547ba6f284eee794beaafbeb3182bc391bf209ce5d58189b82afbca126d167a9f986db4b4816fc69b90e
-DIST FOTAQ_Talkie-1.1.zip 33744817 BLAKE2B bd6edb28de6c4bede38b3d41365a27ba75373a51753a1853f136107a0abb20d8c8c694b268e551c3a4aad0c5a33780128903a3a0c700efeda1b22e722a66d0ad SHA512 b543c863b557de24250adde78badc7b12a0de5aabb484f50d6b682c3ec7f710e991614254d2cfae960280f984ba2889703d42d51d20746080a9b7bb2996063b1
-DIST cat-queen.png 1099 BLAKE2B 4035d73ccecc0bf91c4411d6018682d11f3fb8a246718d3762b216d44e299e9c0f3c9325206e4ab2f454f3005af0197b027dbb85c6f772631c823ed032c6f040 SHA512 009f30e2f9abbc803cd47314d8ff53009898640c12a26cb155b7e0b29c0a2bdaa06cf97fca6ca6f8b428300d63ca8200f627695a3f0b71585374a4a2b63ed2df
-DIST queen-readme.txt 5351 BLAKE2B 8b1859540668102a1ac25019f824084393440dee080528aa98a92b205bc8bdba45649c062d7ad88f3c82645e186ed98c4628719295d0d8efb8147c095166999a SHA512 ed2b5bc18896f9eeadea7526a70ad0a115bda229d1074d8c3a5a64228a7089cc20c6e296d82dc482634ab9bde06a07635d10ee68f47420f00625e0f5c29ef6ad
-DIST queen.1.bz2 90404210 BLAKE2B d854e0d7b82cf06551ebef5dd8b44f99e4a924cdd5721894e1b09698e2bc790f591906bcaa5208e37f8f05773152c1da4edf3186080b5a1f279276b8dd112b45 SHA512 f931584c141403019dcd91c43c8610c23cf39b37272440517c75cd4946da005d7fabcdd76fce2ec7504f35ec02727bede7d6a98381bd4f0c6a8d65b3c4363278
-EBUILD queen-1-r1.ebuild 3342 BLAKE2B f75eb1f99e88f69de8616166d2f505c57cf782d2cbe7ff91a2b9294bc6f0d4ed1f563fae03bb94710a52d17dd57c52dca20b70c6119926cf3905f40c493e9806 SHA512 d12b85b68198bf5523e527b08ed8a9fbc7af92f07c8cbb020ace978bdcf48040ce20139c8b8ece65e0455b4631c24aad51d142fe4f96abded31b68941c0e2e0a
-MISC metadata.xml 330 BLAKE2B 4f070e6c8bc4c2f6b4efb4f0eb84ea861773fba85acda1f4dec223a6594e2cdf4ac90c895a98819e2fab2ba2cd30081aee591554d2e932025a9da6d3c16a275b SHA512 4541c93daab84bd6d0764adccf44bb4986ba02303e731b5b9a7a8060bb88a32c1cef91e2b2910e15915b67cf3ea2b5f31b4e637909d1d0b7c3b627f1134206dc
diff --git a/games-rpg/queen/metadata.xml b/games-rpg/queen/metadata.xml
deleted file mode 100644
index 801e2cc48963..000000000000
--- a/games-rpg/queen/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">scummvm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-rpg/queen/queen-1-r1.ebuild b/games-rpg/queen/queen-1-r1.ebuild
deleted file mode 100644
index e9e011cf3398..000000000000
--- a/games-rpg/queen/queen-1-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Flight of the Amazon Queen - 2D point-and-click adventure game set in the 1940s"
-HOMEPAGE="http://scummvm.sourceforge.net/"
-SF_BASE_URL="mirror://sourceforge/scummvm/"
-LYS_BASE_URL="http://www.lysator.liu.se/~zino/scummvm/queen/"
-FILE_DE="FOTAQ_Ger_talkie-1.0.zip"
-FILE_EN="FOTAQ_Talkie-1.1.zip"
-FILE_FR="FOTAQ_Fr_Talkie_1.0.zip"
-FILE_HE="FOTAQ_Heb_talkie.zip"
-FILE_IT="FOTAQ_It_Talkie_1.0.zip"
-SRC_URI="
-	l10n_de? (
-		${SF_BASE_URL}${FILE_DE}
-		${LYS_BASE_URL}readme.txt -> queen-readme.txt
-	)
-	l10n_en? (
-		mp3? ( ${SF_BASE_URL}${FILE_EN} )
-		!mp3? (
-			${LYS_BASE_URL}queen.1.bz2
-			${LYS_BASE_URL}readme.txt -> queen-readme.txt
-		)
-	)
-	l10n_fr? ( ${SF_BASE_URL}${FILE_FR} )
-	l10n_he? (
-		${SF_BASE_URL}${FILE_HE}
-		${LYS_BASE_URL}readme.txt -> queen-readme.txt
-	)
-	l10n_it? ( ${SF_BASE_URL}${FILE_IT} )
-	http://www.scummvm.org/images/cat-queen.png
-"
-
-LICENSE="queen"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="mp3 l10n_de +l10n_en l10n_fr l10n_he l10n_it"
-REQUIRED_USE="|| ( l10n_de l10n_en l10n_fr l10n_he l10n_it )"
-
-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] )
-"
-DEPEND="${RDEPEND}
-	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 )
-"
-
-S=${WORKDIR}
-
-src_unpack() {
-	if use l10n_de ; then
-		mkdir de
-		unpack ${FILE_DE}
-		mv queen.1c de/queen.1c
-		rm COPYING
-		cp "${DISTDIR}"/queen-readme.txt de/readme.txt
-	fi
-	if use l10n_en ; then
-		mkdir en
-		if use mp3 ; then
-			unpack ${FILE_EN}
-			mv queen.1c en/queen.1c
-			mv readme.txt en/readme.txt
-		else
-			unpack queen.1.bz2
-			mv queen.1 en/queen.1
-			cp "${DISTDIR}"/queen-readme.txt en/readme.txt
-		fi
-	fi
-	if use l10n_fr ; then
-		mkdir fr
-		unpack ${FILE_FR}
-		mv queen.1c fr/queen.1c
-		mv readme.txt fr/readme.txt
-	fi
-	if use l10n_he ; then
-		mkdir he
-		unpack ${FILE_HE}
-		mv queen.1c he/queen.1c
-		rm COPYING
-		cp "${DISTDIR}"/queen-readme.txt he/readme.txt
-	fi
-	if use l10n_it ; then
-		mkdir it
-		unpack ${FILE_IT}
-		mv queen.1c it/queen.1c
-		mv readme.txt it/readme.txt
-	fi
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r *
-	newicon "${DISTDIR}"/cat-queen.png queen.png
-	if use l10n_de ; then
-		make_wrapper queen-de "scummvm -f -p \"/usr/share/${PN}/de\" queen" .
-		make_desktop_entry ${PN}-de "Flight of the Amazon Queen (German)" queen
-	fi
-	if use l10n_en ; then
-		make_wrapper queen-en "scummvm -f -p \"/usr/share/${PN}/en\" queen" .
-		make_desktop_entry ${PN}-en "Flight of the Amazon Queen (English)" queen
-	fi
-	if use l10n_fr ; then
-		make_wrapper queen-fr "scummvm -f -p \"/usr/share/${PN}/fr\" queen" .
-		make_desktop_entry ${PN}-fr "Flight of the Amazon Queen (French)" queen
-	fi
-	if use l10n_he ; then
-		make_wrapper queen-he "scummvm -f -p \"/usr/share/${PN}/he\" queen" .
-		make_desktop_entry ${PN}-he "Flight of the Amazon Queen (Hebrew)" queen
-	fi
-	if use l10n_it ; then
-		make_wrapper queen-it "scummvm -f -p \"/usr/share/${PN}/it\" queen" .
-		make_desktop_entry ${PN}-it "Flight of the Amazon Queen (Italian)" queen
-	fi
-}
diff --git a/games-rpg/runescape-launcher-2.2.4-r2 b/games-rpg/runescape-launcher-2.2.4-r2
new file mode 100644
index 000000000000..9918309ed6f8
--- /dev/null
+++ b/games-rpg/runescape-launcher-2.2.4-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info >=sys-apps/sed-4
+DESCRIPTION=Official RuneScape NXT client launcher
+EAPI=6
+HOMEPAGE=http://www.runescape.com
+IUSE=kde
+KEYWORDS=-* ~amd64
+LICENSE=RuneScape-EULA
+RDEPEND=media-libs/libpng:1.2 >=media-libs/libsdl2-2.0.2 media-libs/glew:1.10 >=media-libs/libvorbis-1.3.2 >=net-misc/curl-7.35.0
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=http://content.runescape.com/downloads/ubuntu/pool/non-free/r/runescape-launcher/runescape-launcher_2.2.4_amd64.deb
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f3653bae47f573ec76a265f1a67ba374
diff --git a/games-rpg/runescape-launcher/Manifest b/games-rpg/runescape-launcher/Manifest
deleted file mode 100644
index 4addaa5c6a13..000000000000
--- a/games-rpg/runescape-launcher/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST runescape-launcher_2.2.4_amd64.deb 3014372 BLAKE2B 9ac215ff5f4b50a432fe14924d9bd7b8891d488cac05c6e2e657b97df68446e3d6a71c5c8330ff2ee995eddbfa63f885915a0c26413546845edeb219c2e56ac4 SHA512 47a3d757f2719474767ba95346f7e2d51a41612c8287656e78a958c68f62a26abcffc187b21d6cb7584bc94b2b5583d55dde4f27cfc18174e917864a7002c518
-EBUILD runescape-launcher-2.2.4-r2.ebuild 1598 BLAKE2B b95abd705ca66db473dd163822aecaaf36204fa8113d114fa05d0a5106df5b3f4f5791a17c23987625583ed1021dc3f3273f910e7ffbf6ad54231cf7129a176b SHA512 0bd6b875e864fe88081d6a6effa28421b2bd746e1f5162ede3b66a6e5b9e866234a74ef0cbbc6af0918207baec9fad6c473d8dc2077f362cd0da18a7ea72ce6c
-MISC metadata.xml 363 BLAKE2B 6ab4a2ef28cdbe1f2872fd2e354e1a16af1d6d23f78f8852c38737050c114adc33c916fb8ee1f2dc5d48460e2e76ab7c9e5fc16509f1afe01d259c0897289658 SHA512 c0b7f88e26968ff9cc1657152682755bdcdcd5dbe2490c54ca871f166e50cfff171b8a9a96c7fe09c97b39311c5be826ac5561d64a48152f0b4e4d1fa585e9df
diff --git a/games-rpg/runescape-launcher/metadata.xml b/games-rpg/runescape-launcher/metadata.xml
deleted file mode 100644
index d030cf30027d..000000000000
--- a/games-rpg/runescape-launcher/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>jscinoz@jscinoz.so</email>
-		<name>Jack Coulter</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/runescape-launcher/runescape-launcher-2.2.4-r2.ebuild b/games-rpg/runescape-launcher/runescape-launcher-2.2.4-r2.ebuild
deleted file mode 100644
index 19f039b0e8f3..000000000000
--- a/games-rpg/runescape-launcher/runescape-launcher-2.2.4-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit unpacker xdg gnome2-utils
-
-DESCRIPTION="Official RuneScape NXT client launcher"
-HOMEPAGE="http://www.runescape.com"
-
-SRC_URI="http://content.runescape.com/downloads/ubuntu/pool/non-free/r/${PN}/${PN}_${PV}_amd64.deb"
-
-QA_PREBUILT="/opt/runescape-launcher/runescape"
-
-SLOT="0"
-
-IUSE="kde"
-
-KEYWORDS="-* ~amd64"
-
-LICENSE="RuneScape-EULA"
-RESTRICT="bindist mirror strip"
-
-S="${WORKDIR}"
-
-RDEPEND="
-	media-libs/libpng:1.2
-	>=media-libs/libsdl2-2.0.2
-	media-libs/glew:1.10
-	>=media-libs/libvorbis-1.3.2
-	>=net-misc/curl-7.35.0
-"
-DEPEND=""
-
-src_prepare() {
-	# Fix path in launcher script
-	sed -i "s:/usr/share/games/$PN:/opt/$PN:" usr/bin/$PN || die
-
-	# Add missing trailing semicolon to .desktop MimeType entry
-	sed -i '/MimeType=/{/;$/!{s/$/;/}}' usr/share/applications/${PN}.desktop || die
-
-	# Fix path to launcher script
-	sed -i "s:/usr/bin/$PN:/opt/bin/$PN:" usr/share/applications/${PN}.desktop || die
-
-	xdg_src_prepare
-
-	eapply_user
-}
-
-src_install() {
-	into /opt
-	dobin usr/bin/$PN
-	dodoc usr/share/doc/$PN/*
-
-	exeinto /opt/$PN
-	doexe usr/share/games/$PN/runescape
-
-	insinto /usr/share/applications
-	doins usr/share/applications/${PN}.desktop
-
-	insinto /usr/share/icons
-	doins -r usr/share/icons/hicolor
-
-	if use kde ; then
-		insinto /usr/share/kde4
-		doins -r usr/share/kde4/services
-	fi
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/soltys-1.0-r2 b/games-rpg/soltys-1.0-r2
new file mode 100644
index 000000000000..9227d2158bc1
--- /dev/null
+++ b/games-rpg/soltys-1.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=app-arch/unzip
+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	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0fb84a6001163ec73fd35fc521159215
diff --git a/games-rpg/soltys/Manifest b/games-rpg/soltys/Manifest
deleted file mode 100644
index be517d7221a3..000000000000
--- a/games-rpg/soltys/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST cat-soltys.png 1917 BLAKE2B c33be51239b1df521b117c44ad2a6e427c26b64a37a1c72331aacfa797913e6d9a83b87689cccaa1e28fef44f47f7ffbc5f712a47b7488f4a237eb121f8297e1 SHA512 c2df23275372582300d3d87d2b629548dabf61ad9d031cb352f4167d956d5126926efee41b24f48040390177b6f28e1b432ff5049bb66858316cce37106aaca8
-DIST soltys-en-v1.0.zip 3484518 BLAKE2B 04d49de79af0d18a5e35ee618de18c0c70b0d9670f9533ce29759aae34542038d31d9b096b25f7d7ee830bea6d0933df9d782b705b7dcaa46144023b9d88a037 SHA512 92637d760033c044b3979dfe21f617db0b2cf98c48587e058910f877b38e0887fed8102782f1dfac85bc8eefa68d3791d7ff2d6074396bea2728a128e37cee1d
-DIST soltys-es-v1.0.zip 3527349 BLAKE2B ac567c7727c8150b75d681e8f416aab859725a665c8e0b6ec628c7a0f101b0ffcf9fb2822d0dafbbd252c1a92f01bcb43f05c8f39447ef8dcf4a591afa441b8a SHA512 eac3aa60e274720f65504ffe5bc18f99401a24c5775c3bc6eb893aef2af7e02055eb52e3da162f124babe5b611f93ff5444aca6e2ea26e5baa98a2131dd49da0
-DIST soltys-pl-v1.0.zip 3483638 BLAKE2B 35269130a2d4699cd709deaeaf96cd95786dcb3b4ceb77b00682f865ab796245e7830805ff4989d4298e54bcc963c45ef8e58ef2200376b41722df33a82b41b5 SHA512 b8c04366d360eb4b7f296718ae46a2e417b676f9bddd6fb8555069d8972ae2ff1706c67fc473a52a5009cb433ff58db377e5f02ff6b27e68e35d2a89c8108f24
-EBUILD soltys-1.0-r2.ebuild 1819 BLAKE2B ea89b54fd17e3dabcfe84994b373ba26ffd06fc149797eea9134f6ae9e12ae279811087e87c1d7ce3635d0d6b4ccd4f660cf3dcdca7bec93da74c468728984e4 SHA512 19504fc8f85901d85d07d57f9d85b9cec7f7101fdc691851904ee0824cd006add695531ff0cf0ef3a54bdaa1536b3f5cee215f063eebfef85f3e19a118a8711f
-MISC metadata.xml 330 BLAKE2B 4f070e6c8bc4c2f6b4efb4f0eb84ea861773fba85acda1f4dec223a6594e2cdf4ac90c895a98819e2fab2ba2cd30081aee591554d2e932025a9da6d3c16a275b SHA512 4541c93daab84bd6d0764adccf44bb4986ba02303e731b5b9a7a8060bb88a32c1cef91e2b2910e15915b67cf3ea2b5f31b4e637909d1d0b7c3b627f1134206dc
diff --git a/games-rpg/soltys/metadata.xml b/games-rpg/soltys/metadata.xml
deleted file mode 100644
index 801e2cc48963..000000000000
--- a/games-rpg/soltys/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">scummvm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-rpg/soltys/soltys-1.0-r2.ebuild b/games-rpg/soltys/soltys-1.0-r2.ebuild
deleted file mode 100644
index f3e8b8ccb22a..000000000000
--- a/games-rpg/soltys/soltys-1.0-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Classic adventure game"
-HOMEPAGE="http://wiki.scummvm.org/index.php/Soltys"
-SRC_URI="l10n_en? ( mirror://sourceforge/scummvm/${PN}-en-v${PV}.zip )
-	l10n_es? ( mirror://sourceforge/scummvm/${PN}-es-v${PV}.zip )
-	l10n_pl? ( mirror://sourceforge/scummvm/${PN}-pl-v${PV}.zip )
-	!l10n_en? ( !l10n_es? ( !l10n_pl? ( mirror://sourceforge/scummvm/${PN}-en-v${PV}.zip ) ) )
-	http://www.scummvm.org/images/cat-soltys.png"
-
-LICENSE="Soltys"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="l10n_en l10n_es l10n_pl"
-
-RDEPEND=">=games-engines/scummvm-1.5"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	if use l10n_en || ( ! use l10n_en && ! use l10n_es && ! use l10n_pl ) ; then
-		mkdir -p en || die
-		unpack ${PN}-en-v${PV}.zip
-		mv vol.{cat,dat} en/ || die
-	fi
-	if use l10n_es ; then
-		mkdir -p es || die
-		unpack ${PN}-es-v${PV}.zip
-		mv soltys-es-v1-0/vol.{cat,dat} es/ || die
-	fi
-	if use l10n_pl ; then
-		mkdir -p pl || die
-		unpack ${PN}-pl-v${PV}.zip
-		mv vol.{cat,dat} pl/ || die
-	fi
-}
-
-src_prepare() {
-	default
-	rm -rf license.txt soltys-es-v1-0
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r *
-	newicon "${DISTDIR}"/cat-soltys.png soltys.png
-	if use l10n_en || ( ! use l10n_en && ! use l10n_es && ! use l10n_pl ) ; then
-		make_wrapper soltys-en "scummvm -f -p \"/usr/share/${PN}/en\" soltys" .
-		make_desktop_entry ${PN}-en "Soltys (English)" soltys
-	fi
-	if use l10n_es ; then
-		make_wrapper soltys-es "scummvm -f -p \"/usr/share/${PN}/es\" soltys" .
-		make_desktop_entry ${PN}-es "Soltys (Español)" soltys
-	fi
-	if use l10n_pl ; then
-		make_wrapper soltys-pl "scummvm -f -p \"/usr/share/${PN}/pl\" soltys" .
-		make_desktop_entry ${PN}-pl "Soltys (Polski)" soltys
-	fi
-}
diff --git a/games-rpg/sumwars-0.5.8-r1 b/games-rpg/sumwars-0.5.8-r1
new file mode 100644
index 000000000000..56ce5f6f1a1c
--- /dev/null
+++ b/games-rpg/sumwars-0.5.8-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-games/cegui-0.8[ogre] >=dev-games/ogre-1.7.4-r1[freeimage,opengl] dev-games/ois dev-games/physfs >=dev-lang/lua-5.1:0 >=dev-libs/tinyxml-2.6.2-r2 media-libs/freealut media-libs/openal media-libs/libogg media-libs/libvorbis >=net-libs/enet-1.3.0 x11-libs/libX11 x11-libs/libXrandr tools? ( dev-libs/boost ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=a multi-player, 3D action role-playing game
+EAPI=6
+HOMEPAGE=http://sumwars.org
+IUSE=+tools debug l10n_de l10n_en l10n_it l10n_pl l10n_pt l10n_ru l10n_uk
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 CC-BY-SA-3.0
+RDEPEND=>=dev-games/cegui-0.8[ogre] >=dev-games/ogre-1.7.4-r1[freeimage,opengl] dev-games/ois dev-games/physfs >=dev-lang/lua-5.1:0 >=dev-libs/tinyxml-2.6.2-r2 media-libs/freealut media-libs/openal media-libs/libogg media-libs/libvorbis >=net-libs/enet-1.3.0 x11-libs/libX11 x11-libs/libXrandr tools? ( dev-libs/boost )
+SLOT=0
+SRC_URI=mirror://sourceforge/sumwars/sumwars-0.5.8-src.tar.bz2
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=02713299c5a36aaf0dd3480e5acfb65a
diff --git a/games-rpg/sumwars/Manifest b/games-rpg/sumwars/Manifest
deleted file mode 100644
index e2ea4f79992a..000000000000
--- a/games-rpg/sumwars/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sumwars-0.5.8-src.tar.bz2 107811288 BLAKE2B d7eef29ae9ba91d7a368730169d49c4b84e5db5cdbd4be7aa183e91baa50fd45be2b91928903e9cb17d947c2a4947094138c65efe076cdc85f14fbfacadddbd1 SHA512 ccf156f4484b0aeb8984631321d6691dc180ad63fdfa59d92aaa05ada3e871fc10656f32f9ba1b65abe7342e1481e14ca01f025ffc0ec5797cd8e91d97240cf1
-EBUILD sumwars-0.5.8-r1.ebuild 1917 BLAKE2B 270f82d9eb275df0f211ffdf752e8278190d37a1f9b5954406d2e33c094e6fd684f6a4f9be68b7f9ad17d570f95a12bf0c636a72a45aa0730ad06a354c0bda18 SHA512 35ec46e0888370d1d896c154089e9d65dba0a86ff81decbc6dc2bb6c0478b1bc6b45e2062586d3b272ad7d20a2925189755a0ffe64ba708182a98fa93224eb73
-MISC metadata.xml 521 BLAKE2B 773a7729ffb1deb23e15e7ad061596099bfce5e590fd6a4dd04014527df7ab7a91384b86429221960e54331ab094472277e0f23a9ea8e61f1b02a869437a57a7 SHA512 8ff8a6777a1d50900f210f97c22a80c68491d452c550550578cd0481653d4dbc52e3e88ae40dfcd547c62f0f43ad15c5d766330522e04a096c59a93265a470c0
diff --git a/games-rpg/sumwars/metadata.xml b/games-rpg/sumwars/metadata.xml
deleted file mode 100644
index ee9203d83eb5..000000000000
--- a/games-rpg/sumwars/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<changelog>http://sumwars.org/mantis/changelog_page.php</changelog>
-		<bugs-to>https://sumwars.org/mantis/index.php</bugs-to>
-		<remote-id type="sourceforge">sumwars</remote-id>
-	</upstream>
-	<use>
-		<flag name="tools">Builds editor tools</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-rpg/sumwars/sumwars-0.5.8-r1.ebuild b/games-rpg/sumwars/sumwars-0.5.8-r1.ebuild
deleted file mode 100644
index caba1802db8a..000000000000
--- a/games-rpg/sumwars/sumwars-0.5.8-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils eutils flag-o-matic gnome2-utils
-
-DESCRIPTION="a multi-player, 3D action role-playing game"
-HOMEPAGE="http://sumwars.org"
-SRC_URI="mirror://sourceforge/sumwars/${P//_/-}-src.tar.bz2"
-
-LICENSE="GPL-3 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+tools debug"
-
-LANGS="de en it pl pt ru uk"
-for L in ${LANGS} ; do
-	IUSE="${IUSE} l10n_${L}"
-done
-unset L
-
-RDEPEND="
-	>=dev-games/cegui-0.8[ogre]
-	>=dev-games/ogre-1.7.4-r1[freeimage,opengl]
-	dev-games/ois
-	dev-games/physfs
-	>=dev-lang/lua-5.1:0
-	>=dev-libs/tinyxml-2.6.2-r2
-	media-libs/freealut
-	media-libs/openal
-	media-libs/libogg
-	media-libs/libvorbis
-	>=net-libs/enet-1.3.0
-	x11-libs/libX11
-	x11-libs/libXrandr
-	tools? ( dev-libs/boost )"
-DEPEND=${RDEPEND}
-
-S=${WORKDIR}/${PN}-${PV%_*}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-
-	use debug && CMAKE_BUILD_TYPE=Debug
-
-	local l langs
-	for l in ${LANGS}; do
-		if use l10n_${l}; then
-			langs="${langs} ${l}"
-		fi
-	done
-
-	[[ -z "${langs}" ]] && langs="en"
-
-	# configure sumwars with cmake
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX=""
-		-DSUMWARS_BUILD_TOOLS="$(usex tools)"
-		-DSUMWARS_DOC_DIR="/usr/share/doc/${PF}"
-		-DSUMWARS_EXECUTABLE_DIR="/usr/bin"
-		-DSUMWARS_LANGUAGES="${langs}"
-		-DSUMWARS_NO_ENET=ON
-		-DSUMWARS_NO_TINYXML=ON
-		-DSUMWARS_PORTABLE_MODE=OFF
-		-DSUMWARS_POST_BUILD_COPY=OFF
-		-DSUMWARS_RANDOM_REGIONS=ON
-		-DSUMWARS_SHARE_DIR="/usr/share/${PN}"
-		-DSUMWARS_STANDALONE_MODE=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	newicon -s 128 share/icon/SumWarsIcon_128x128.png ${PN}.png
-	make_desktop_entry ${PN} "Summoning Wars"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/to-the-moon-0 b/games-rpg/to-the-moon-0
new file mode 100644
index 000000000000..60c2c858d306
--- /dev/null
+++ b/games-rpg/to-the-moon-0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=Two doctors traversing the memories of a dying man to fulfill his last wish
+EAPI=5
+HOMEPAGE=http://freebirdgames.com/games/to-the-moon
+IUSE=bundled-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved bundled-libs? ( LGPL-2 LGPL-2.1 ZLIB )
+RDEPEND=!bundled-libs? ( dev-libs/libsigc++:2 >=media-libs/libsdl2-2.0.1[X,joystick,opengl,sound,threads,video] media-libs/openal media-libs/sdl2-image[png] media-libs/sdl2-ttf ) sys-libs/zlib virtual/opengl games-misc/games-envd
+RESTRICT=fetch bindist splitdebug
+SLOT=0
+SRC_URI=ToTheMoon_linux_1389114090.sh
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c7a3717724637ef1e92dee8278c882c9
diff --git a/games-rpg/to-the-moon/Manifest b/games-rpg/to-the-moon/Manifest
deleted file mode 100644
index eed3a69bd4fd..000000000000
--- a/games-rpg/to-the-moon/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ToTheMoon_linux_1389114090.sh 75823678 BLAKE2B de63a8c5eff7d99f5af4fbc85c8e416c7bd7a07fad03dfb0424bf43f410bdbc9a0d064c8892dbb6c9fdc637391f2b2ef6ef40c72c501790ffec0aac8448add21 SHA512 bed844f143ef9c3ff8fe93da186422e84d259229874c331315d8f1c7538fd6c417d6ca1aeecbe6c2a664fad98aff51f4723227d0ef07612acf29f86313f9aa1a
-EBUILD to-the-moon-0.ebuild 2492 BLAKE2B bc3017c2c0e28f78d084a6bbea466ceb3e3411db3a0b5134a8e4bccdc5acfcd7fc00b80e5db0083fdc60320d1c7b75a09968bb3e2e68febbdafa72a147f47883 SHA512 940033be5a9114f29d9e0f8f6dca75e9b68b3d5a0980710a02159cc66ab1f01fab2e208223a3492ed70103052680b86c52dfbc88ef5409d654b512f1f0e475ce
-MISC metadata.xml 325 BLAKE2B 27d3f66c92edf0dda747247d5a31972620750facfbad0d6f82c51c5ca5a99327a0b3918264ab590da1e7250ee8aebb85393981049a33843883238734df348d31 SHA512 a8068b353b7597ae988ad3fd9855339beb981eb11a392483129346d2ee51d658934fb772e8b3f3062e1d14d553e73de9f6bc2f456b4bf5de15902257c22e69ce
diff --git a/games-rpg/to-the-moon/metadata.xml b/games-rpg/to-the-moon/metadata.xml
deleted file mode 100644
index 451145245bfb..000000000000
--- a/games-rpg/to-the-moon/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="bundled-libs">Use bundled libraries</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-rpg/to-the-moon/to-the-moon-0.ebuild b/games-rpg/to-the-moon/to-the-moon-0.ebuild
deleted file mode 100644
index 7560ad283a8c..000000000000
--- a/games-rpg/to-the-moon/to-the-moon-0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: unbundling sdl-sound breaks the game
-
-EAPI=5
-
-inherit eutils unpacker gnome2-utils games
-
-MY_PN=ToTheMoon
-DESCRIPTION="Two doctors traversing the memories of a dying man to fulfill his last wish"
-HOMEPAGE="http://freebirdgames.com/games/to-the-moon"
-SRC_URI="${MY_PN}_linux_1389114090.sh"
-
-LICENSE="all-rights-reserved bundled-libs? ( LGPL-2 LGPL-2.1 ZLIB )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bundled-libs"
-RESTRICT="fetch bindist splitdebug"
-
-QA_PREBUILT="${GAMES_PREFIX_OPT}/${PN}/${MY_PN}.bin*"
-if [[ ${ARCH} == "amd64" ]] ; then
-	QA_PREBUILT="${QA_PREBUILT} ${GAMES_PREFIX_OPT}/${PN}/lib64/*"
-else
-	QA_PREBUILT="${QA_PREBUILT} ${GAMES_PREFIX_OPT}/${PN}/lib/*"
-fi
-
-RDEPEND="
-	!bundled-libs? (
-		dev-libs/libsigc++:2
-		>=media-libs/libsdl2-2.0.1[X,joystick,opengl,sound,threads,video]
-		media-libs/openal
-		media-libs/sdl2-image[png]
-		media-libs/sdl2-ttf
-	)
-	sys-libs/zlib
-	virtual/opengl"
-
-S=${WORKDIR}/data
-
-pkg_nofetch() {
-	einfo
-	einfo "Please buy & download \"${SRC_URI}\" from:"
-	einfo "  ${HOMEPAGE}"
-	einfo "and move/link it to \"${DISTDIR}\""
-	einfo
-}
-
-src_unpack() {
-	# mojo stuff inside makeself archive, unpack_makeself fails
-	local lastline=$(( $(grep -a -h -n -m 1 -F -e "Extra newline, because in very rare cases (OpenSolaris) stub is directly added after script" "${DISTDIR}/${A}" | cut -d':' -f1) + 1 ))
-	[[ ${lastline} ]] || die "no last line"
-	local offset=$(head -n ${lastline} "${DISTDIR}/${A}" | wc -c)
-	[[ ${offset} ]] || die "no offset"
-	dd ibs=${offset} skip=1 if="${DISTDIR}/${A}" of="${T}"/moon.zip || die
-	unpack_zip "${T}"/moon.zip
-}
-
-src_install() {
-	local dir=${GAMES_PREFIX_OPT}/${PN}
-	local libsuffix=$(usex amd64 "64" "")
-	local arch=$(usex amd64 "x86_64" "x86")
-
-	insinto "${dir}"
-	doins -r noarch/{Audio,Data,Fonts,Graphics,Game.ini,mkxp.conf,ToTheMoon.png}
-
-	exeinto "${dir}"
-	doexe ${arch}/${MY_PN}.bin.${arch}
-
-	exeinto "${dir}/lib${libsuffix}"
-	if use bundled-libs ; then
-		doexe ${arch}/lib${libsuffix}/*
-	else
-		doexe ${arch}/lib${libsuffix}/libSDL_sound-1.0.so.1
-	fi
-
-	games_make_wrapper ${PN} "./${MY_PN}.bin.${arch}" "${dir}" "${dir}/lib${libsuffix}"
-	make_desktop_entry ${PN} "To the Moon"
-	newicon -s 32 noarch/${MY_PN}.png ${PN}.png
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/twclone-0.14-r1 b/games-rpg/twclone-0.14-r1
new file mode 100644
index 000000000000..1e2aeb07a9da
--- /dev/null
+++ b/games-rpg/twclone-0.14-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Clone of BBS Door game Trade Wars 2002
+EAPI=6
+HOMEPAGE=http://twclone.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/twclone/twclone-source-0.14.tar.gz
+_md5_=af9a8d88ecd7a2c68a198bd130bb8f85
diff --git a/games-rpg/twclone/Manifest b/games-rpg/twclone/Manifest
deleted file mode 100644
index 3a6a08ed143b..000000000000
--- a/games-rpg/twclone/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX twclone-0.14-format.patch 2700 BLAKE2B 35c25983f3d8544405ecb4095c52866b7b3043aca6b32c1dedd25f3e5c8e7c22e0343bb1c1f7f4d662304a12abdf0c2380a55ce53a4f39c9e76229b00ee511de SHA512 ee5f7aebe920270194bb28ff9d788d040c50c3dffcfc4f2b05ccb05c61e8e1bef53b6e030cd1be9291121ad33e6345cbcb99c02f79d7eccc7a5c009556a636b3
-DIST twclone-source-0.14.tar.gz 163065 BLAKE2B 58d5fb13c5d6dc6bb5f73d2f4da8eace8aad7625a464b45099bd21d9cd8c3d29b25714f73e505d895b7fd8815c0dd3227a289009b7298ebaf83b0ada58deff73 SHA512 66a63e2cc5fe82fb5a5b1f887c9eb3bf8b89044f7f7d489b67e5bb15a21426a5a0eb27b53ab59c05c784fc6fb7ffaadcfc5453fc55943959db859a053adb7843
-EBUILD twclone-0.14-r1.ebuild 556 BLAKE2B 243f28a30624aa42dd70d4b0d1389cf9a5192b7aa25a5de583ce1c433e3f6a2cbbb65496825041c00fca762f04b66cc036924220748072bdbd26a238c43892a6 SHA512 18f5be3eb6e6d0fef5eddfccf4f7b2344aeb2dae7cec2a05160da1ae785a2ec43578f21547ff71c7b6aac9a9457ca7702c2edcb3af90d68d3532cc7007121d32
-MISC metadata.xml 687 BLAKE2B bdfc645799af71efafb6ab5c399dd7243f60584ec3be6333f40830cfdbf21618358eb210abcbd8c8d2c6cbfefdf8735886892781b4e9a7587c7f4f7f3eb21e53 SHA512 376bb763d716ad1cb9513b72f9b301b013339aad3d3df02124d14e653275b322dc18ff4c7d87899a424b2d75cb09f090b516845d6e3e7f46f91e98273abf7320
diff --git a/games-rpg/twclone/files/twclone-0.14-format.patch b/games-rpg/twclone/files/twclone-0.14-format.patch
deleted file mode 100644
index d9d1a1c52516..000000000000
--- a/games-rpg/twclone/files/twclone-0.14-format.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- a/bigbang.c	2015-10-27 09:21:51.172611109 +0100
-+++ b/bigbang.c	2015-10-27 09:25:41.117233447 +0100
-@@ -530,13 +530,11 @@
-     planetfile = fopen ("./planets.data", "w");
-     for (loop = 1; loop <= 299 - strlen(terraInfo); loop++)
-         strcat(terraInfo, " ");
--    strcat(terraInfo, "\n");
--    fprintf (planetfile, terraInfo);
-+    fprintf (planetfile, "%s\n", terraInfo);
-     sprintf (ferrinfo, "%d:%d:Ferringhi:1:-2:Unknown:1000:1000:1000:0:0:0:0:3:100000:20:30:10:0:0:0:0:", 2, ferringhiSector);
-     for (loop = 1; loop <= 299 - strlen(ferrinfo); loop++)
-         strcat(ferrinfo, " ");
--    strcat(ferrinfo, "\n");
--    fprintf(planetfile, ferrinfo);
-+    fprintf(planetfile, "%s\n", ferrinfo);
-     randomPlanetInfo = malloc (sizeof (strNameLength));
-     if (numRandomPlanets > 0)
-     {
-@@ -552,8 +550,7 @@
-                      , c, tempint, randomname (randomPlanetInfo), randomnum(1,5));
-             for (loop = 1; loop <= 299 - strlen(ferrinfo); loop++)
-                 strcat(ferrinfo, " ");
--            strcat(ferrinfo, "\n");
--            fprintf(planetfile, ferrinfo);
-+            fprintf(planetfile, "%s\n", ferrinfo);
- 
-             c++;
-         }
-@@ -616,10 +613,9 @@
-         fileline = strcat (fileline, ":");
-         if (sectorlist[x]->nebulae != NULL)
-             fileline = strcat (fileline, sectorlist[x]->nebulae);
--        fileline = strcat (fileline, ":\n");
-         /*  Later put in whitespace buffer for saving */
-         /*  Not needed until user created beacons put in */
--        fprintf (file, fileline);
-+        fprintf (file, "%s:\n", fileline);
-     }
-     fclose (file);
-     free (fileline);
-@@ -646,8 +642,7 @@
-         len = (int) strlen (fileline);
-         for (y = 0; y <= 99 - len; y++)
-             strcat (fileline, " ");
--        strcat (fileline, "\n");
--        fprintf (file, fileline);
-+        fprintf (file, "%s\n", fileline);
-     }
-     fclose (file);
- 
---- a/config.c	2015-10-27 09:30:00.091283678 +0100
-+++ b/config.c	2015-10-27 09:30:25.068806593 +0100
-@@ -140,9 +140,8 @@
- 
-   for (loop=0; loop < 199 - strlen(buffer); loop++)
- 		strcat(buffer, " ");
--  strcat(buffer, "\n");
- 
--  fprintf(configfile, buffer);
-+  fprintf(configfile, "%s\n", buffer);
- 
-   fclose(configfile);
-   free(buffer);
---- a/planet.c	2015-10-27 09:31:44.867282757 +0100
-+++ b/planet.c	2015-10-27 09:32:17.083667674 +0100
-@@ -59,8 +59,7 @@
- 		addint(stufftosave, planets[index]->citdl->upgradestart, ':', BUFF_SIZE);
- 		for (loop=0; loop< 399 - strlen(stufftosave); loop++)
- 			strcat(stufftosave, " ");
--		strcat(stufftosave, "\n");
--		fprintf(planetfile, stufftosave);
-+		fprintf(planetfile, "%s\n", stufftosave);
- 		}
- 	}
- 	fclose(planetfile);
diff --git a/games-rpg/twclone/metadata.xml b/games-rpg/twclone/metadata.xml
deleted file mode 100644
index 56bd9d00cd1f..000000000000
--- a/games-rpg/twclone/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription>
-How many of you remeber the BBS days back in the late 80's and early 90's? 
-Back when you would call in play games and go on with your life? Well I'm 
-trying to duplicate one of those old games. It was called Trade Wars 
-2002(Created by Martech Software). So I decided to make a game similar to it 
-that runs in Linux.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">twclone</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-rpg/twclone/twclone-0.14-r1.ebuild b/games-rpg/twclone/twclone-0.14-r1.ebuild
deleted file mode 100644
index 95f7c5550971..000000000000
--- a/games-rpg/twclone/twclone-0.14-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-source-${PV}"
-DESCRIPTION="Clone of BBS Door game Trade Wars 2002"
-HOMEPAGE="http://twclone.sourceforge.net/"
-SRC_URI="mirror://sourceforge/twclone/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-format.patch
-)
-
-src_install() {
-	DOCS="AUTHORS ChangeLog PROTOCOL README TODO" \
-		default
-	cd "${D}/usr/bin"
-	for f in * ; do
-		mv {,${PN}-}${f}
-	done
-}
diff --git a/games-rpg/vendetta-online-bin-1.8.296-r1 b/games-rpg/vendetta-online-bin-1.8.296-r1
new file mode 100644
index 000000000000..5c60e614d490
--- /dev/null
+++ b/games-rpg/vendetta-online-bin-1.8.296-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=dev-util/patchelf
+DESCRIPTION=Space-based MMORPG
+EAPI=6
+HOMEPAGE=https://www.vendetta-online.com
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=guild
+RDEPEND=virtual/opengl x11-libs/gtk+:2
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=amd64? ( http://mirror.cle.vendetta-online.com/vendetta-linux-amd64-installer.sh -> vendetta-online-bin-1.8.296-amd64.sh ) x86? ( http://mirror.cle.vendetta-online.com/vendetta-linux-ia32-installer.sh -> vendetta-online-bin-1.8.296-x86.sh )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ecd9b8cd52f2cda7ce97600d0114510a
diff --git a/games-rpg/vendetta-online-bin/Manifest b/games-rpg/vendetta-online-bin/Manifest
deleted file mode 100644
index 63f3e0072b7e..000000000000
--- a/games-rpg/vendetta-online-bin/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX vendetta 113 BLAKE2B 7f4afc48107ced2af51cb691d2c64229b717016bc81b997bbd6326d5e41f858202b713fb0c87b68938debefd593c56a52024d2827feec11c55c0126c876984fb SHA512 a6b21095a87585ce9e96e87941f651ce3a6bbb123bff7d49d3c00a9b7dbab9864151a00adcae168d9949a28e83a4057916091516278245cfa925111197096a95
-DIST vendetta-online-bin-1.8.296-amd64.sh 235822235 BLAKE2B d5b3218a6928da2f6b0ad8e12d7dbf7052140bb194aceee948ab89d019b59d361c8ddc7eff6d97cf361a9b9b99a7f1b1b8af91339245201203b9aa6d3c4a60ee SHA512 f57b8da6b2364df7ca78c0a8df66cadbc568927376548f95b49da5d641d49a155315583d4323599f59e982b0569b972311fa4717e11dab48e4da95ab235d05a4
-DIST vendetta-online-bin-1.8.296-x86.sh 235890404 BLAKE2B cb59204f54a60a42639e542527a7b07019c4d9873bd7b4027abede84f6e2ca321449dabdacb082d7fd3fce343de1db5039d4da8f230ee52a2c0d64b5d5c41cc0 SHA512 909e4960fe85c7bc71cf1530cd8fd9fa096b28c9ba621e3c16e14d1264858939e859fad182e76301322eb45b7c451bd21d87a90274eefb9e71e1fd1eb1f498b0
-EBUILD vendetta-online-bin-1.8.296-r1.ebuild 1452 BLAKE2B 16c5233d83ab3714e198e6b825de32691761f4e51aeca9af65cf7b6f1393f8d5836e563ee77f54e95fb40414301bcafa363adab5bfaf1165f3bd4c8ca56a0391 SHA512 191fe6b63415d0ab26176793a61d29568e630b1bd3cd3b62904a474e0767d38c0263ebf838a035b745d3296bb05dbe74405273ffdcc4f366e8cf4bf97ae6faae
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-rpg/vendetta-online-bin/files/vendetta b/games-rpg/vendetta-online-bin/files/vendetta
deleted file mode 100644
index 113f5d0925b1..000000000000
--- a/games-rpg/vendetta-online-bin/files/vendetta
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if [ ! -e ~/.vendetta ] ; then
-	cp -vR "DATADIR"/install ~/.vendetta
-fi
-
-exec "DATADIR"/vendetta "$@"
diff --git a/games-rpg/vendetta-online-bin/metadata.xml b/games-rpg/vendetta-online-bin/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-rpg/vendetta-online-bin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/vendetta-online-bin/vendetta-online-bin-1.8.296-r1.ebuild b/games-rpg/vendetta-online-bin/vendetta-online-bin-1.8.296-r1.ebuild
deleted file mode 100644
index fc3e5e7afad7..000000000000
--- a/games-rpg/vendetta-online-bin/vendetta-online-bin-1.8.296-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eutils unpacker
-
-DESCRIPTION="Space-based MMORPG"
-HOMEPAGE="https://www.vendetta-online.com"
-SRC_URI="amd64? (
-		http://mirror.cle.vendetta-online.com/vendetta-linux-amd64-installer.sh
-			-> ${P}-amd64.sh
-	)
-	x86? (
-		http://mirror.cle.vendetta-online.com/vendetta-linux-ia32-installer.sh
-			-> ${P}-x86.sh
-	)"
-
-LICENSE="guild"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror strip"
-
-DEPEND="dev-util/patchelf"
-RDEPEND="virtual/opengl
-	x11-libs/gtk+:2"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_makeself
-}
-
-src_prepare() {
-	# Won't do much good since this is a -bin, but there's no bin_prepare :)
-	default
-
-	# scanelf: rpath_security_checks(): Security problem with relative DT_RPATH '.'
-	for file in install/drivers/{gkvc.so,soundbackends/libalsa_linux_amd64.so,soundbackends/libpulseaudio_linux_amd64.so}
-	do
-		patchelf --set-rpath '$ORIGIN' $file || die
-	done
-}
-
-src_install() {
-	local dir=/opt/${PN}
-
-	insinto "${dir}"
-	doins -r * || die "doins failed"
-	fperms +x "${dir}"/{vendetta,install/{media.rlb,update.rlb,vendetta}} \
-		|| die "fperms failed"
-
-	sed \
-		-e "s:DATADIR:${dir}:" \
-		"${FILESDIR}"/vendetta > "${T}"/vendetta \
-		|| die "sed failed"
-
-	dobin "${T}"/vendetta
-	newicon install/manual/images/ships.valkyrie.jpg ${PN}.jpg
-	make_desktop_entry vendetta "Vendetta Online" /usr/share/pixmaps/${PN}.jpg
-}
diff --git a/games-rpg/wasteland2-1.9.0.13 b/games-rpg/wasteland2-1.9.0.13
new file mode 100644
index 000000000000..3ee1ab6d38f0
--- /dev/null
+++ b/games-rpg/wasteland2-1.9.0.13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=Sequel to 1988 Wasteland, post-apocalyptic computer RPG inspiration for Fallout
+EAPI=5
+HOMEPAGE=https://wasteland.inxile-entertainment.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=>=dev-libs/atk-2.12.0-r1[abi_x86_32(-)] >=dev-libs/glib-2.40.0-r1:2[abi_x86_32(-)] >=media-libs/fontconfig-2.10.92:1.0[abi_x86_32(-)] >=media-libs/freetype-2.5.3-r1:2[abi_x86_32(-)] >=x11-libs/cairo-1.12.16-r2[abi_x86_32(-)] >=x11-libs/gdk-pixbuf-2.30.8:2[abi_x86_32(-)] >=x11-libs/gtk+-2.24.24:2[abi_x86_32(-)] >=x11-libs/pango-1.36.5[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=virtual/glu-9.0-r1[abi_x86_32(-)] virtual/opengl games-misc/games-envd
+RESTRICT=bindist fetch mirror
+SLOT=0
+SRC_URI=gog_wasteland_2_1.9.0.13.tar.gz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=59d5f4594800a80ee26d0c8a165a76ef
diff --git a/games-rpg/wasteland2/Manifest b/games-rpg/wasteland2/Manifest
deleted file mode 100644
index 499c27eec031..000000000000
--- a/games-rpg/wasteland2/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gog_wasteland_2_1.9.0.13.tar.gz 10959158010 BLAKE2B 8a82a608b3530fd2000ebe689b337529630da3c81ac4fc9369d9dd210b48b842658770b16ea451f3eedd63fcc682ad0c898fcff895d119ab4395fad32c04e9c4 SHA512 8b5ed19ffee9505efaf03f7ef3ba55dbdbbeda68b7961e92c22776bbb7e842df8c5e5ee727967e79dec753fd03d39f0a1c98e380e540971834b56066b6a79929
-EBUILD wasteland2-1.9.0.13.ebuild 2051 BLAKE2B a8762193eec699034a3bbfef566c23c81b638730d02ec1409565d5c85a7f866df3817a9ba270bdac5b45614ce5825906d7696eabe9588afdb30caf2f170c7ea5 SHA512 158bfcb7eaeb02efbb2fac3a31f25d2f1b1f221de81f62252a00f33b1b7a5569cfe320a9c7622fb72d20987b81c2b1d9a02a16ec8ad4e50bc8588b4e5f6e7166
-MISC metadata.xml 252 BLAKE2B 1b951d2e730631865ae5f379b19ed9de2c8adf2f2786da3f75d0871d967374198ddd9106433f388bdc7050c37063fb28cda4320ae7bdc9a03854838693d9f952 SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638
diff --git a/games-rpg/wasteland2/metadata.xml b/games-rpg/wasteland2/metadata.xml
deleted file mode 100644
index 3c186688e265..000000000000
--- a/games-rpg/wasteland2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/wasteland2/wasteland2-1.9.0.13.ebuild b/games-rpg/wasteland2/wasteland2-1.9.0.13.ebuild
deleted file mode 100644
index c457367707b7..000000000000
--- a/games-rpg/wasteland2/wasteland2-1.9.0.13.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils gnome2-utils check-reqs games
-
-DESCRIPTION="Sequel to 1988 Wasteland, post-apocalyptic computer RPG inspiration for Fallout"
-HOMEPAGE="https://wasteland.inxile-entertainment.com/"
-SRC_URI="gog_wasteland_2_${PV}.tar.gz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="bindist fetch mirror"
-
-QA_PREBUILT="${GAMES_PREFIX_OPT}/${PN}/*"
-
-RDEPEND="
-	>=dev-libs/atk-2.12.0-r1[abi_x86_32(-)]
-	>=dev-libs/glib-2.40.0-r1:2[abi_x86_32(-)]
-	>=media-libs/fontconfig-2.10.92:1.0[abi_x86_32(-)]
-	>=media-libs/freetype-2.5.3-r1:2[abi_x86_32(-)]
-	>=x11-libs/cairo-1.12.16-r2[abi_x86_32(-)]
-	>=x11-libs/gdk-pixbuf-2.30.8:2[abi_x86_32(-)]
-	>=x11-libs/gtk+-2.24.24:2[abi_x86_32(-)]
-	>=x11-libs/pango-1.36.5[abi_x86_32(-)]
-	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-	>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-	>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-	>=virtual/glu-9.0-r1[abi_x86_32(-)]
-	virtual/opengl
-"
-
-S="${WORKDIR}/Wasteland 2"
-
-CHECKREQS_DISK_BUILD="22000M"
-CHECKREQS_DISK_USR="21600M"
-
-pkg_nofetch() {
-	einfo
-	einfo "Please buy Wasteland 2"
-	einfo "from https://www.gog.com/ and"
-	einfo "download \"${SRC_URI}\""
-	einfo "and move/link it to \"${DISTDIR}\""
-	einfo
-	einfo "This ebuild was tested with the CLASSICAL edition."
-	einfo "If it works with the deluxe edition too, please"
-	einfo "open a bug report. If not, open a bug report too."
-	einfo
-}
-
-src_install() {
-	local dir=${GAMES_PREFIX_OPT}/${PN}
-
-	# over 20GB of data
-	dodir "${dir}"
-	mv game/WL2_Data "${D%/}${dir}"/ || die
-	exeinto "${dir}"
-	doexe game/WL2
-
-	games_make_wrapper ${PN} ./WL2 "${dir}"
-	newicon -s 256 support/gog-wasteland-2.png ${PN}.png
-	make_desktop_entry ${PN} "Wasteland 2"
-
-	dodoc docs/*.pdf
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/wastesedge-0.3.5-r1 b/games-rpg/wastesedge-0.3.5-r1
new file mode 100644
index 000000000000..ad434087ba06
--- /dev/null
+++ b/games-rpg/wastesedge-0.3.5-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install 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_python3_7(-),python_single_target_python2_7(+)] >=games-rpg/adonthell-0.3.5-r2[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_python3_7(-),python_single_target_python2_7(+)] nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
+DESCRIPTION=role playing game to showcase the adonthell engine
+EAPI=6
+HOMEPAGE=http://adonthell.linuxgames.com/
+IUSE=nls 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_python3_7(-),python_single_target_python2_7(+)] >=games-rpg/adonthell-0.3.5-r2[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_python3_7(-),python_single_target_python2_7(+)] nls? ( virtual/libintl )
+REQUIRED_USE=python_targets_python2_7
+RESTRICT=userpriv
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/adonthell/wastesedge-src-0.3.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4958f7b5f934a283ae2eeb3e487a0689
diff --git a/games-rpg/wastesedge/Manifest b/games-rpg/wastesedge/Manifest
deleted file mode 100644
index 2dcf1deb2deb..000000000000
--- a/games-rpg/wastesedge/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST wastesedge-src-0.3.5.tar.gz 10749912 BLAKE2B ec4cd1135cd09c92937c8749905872b635e72575662bb7c1e188281e47ec0a285045aced378659fed20942c4bc7e67f11fa95e1cf0fe220c0be0f3b6527aa754 SHA512 d4c77eb1bde2c28002e4f56a6bfa5f816ea53de7061b5e60635f15c670ff45c3a18e3316b92007f74033a62538503f14b67e1175cf22c718c22ca1021dc7af3b
-EBUILD wastesedge-0.3.5-r1.ebuild 926 BLAKE2B eaa70de34e663ce856473f2a4ab44613e48ecf15cc0092ed12e4221508494660a8b1498ada6bd73e186671c6c7e8fa317a8bc8f7dda4937e8c4a8a88536dc452 SHA512 d150ce0a36aafd7b5e304b2c24e38ced6fc20734512aa9c6f2aaa9b3906a8d9be2df36854bcc6be86bf52b722644b235a87f3e3eab0e2285a01c4d73d20a2cf8
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-rpg/wastesedge/metadata.xml b/games-rpg/wastesedge/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-rpg/wastesedge/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/wastesedge/wastesedge-0.3.5-r1.ebuild b/games-rpg/wastesedge/wastesedge-0.3.5-r1.ebuild
deleted file mode 100644
index 2f28fcfac7b9..000000000000
--- a/games-rpg/wastesedge/wastesedge-0.3.5-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1
-
-DESCRIPTION="role playing game to showcase the adonthell engine"
-HOMEPAGE="http://adonthell.linuxgames.com/"
-SRC_URI="https://savannah.nongnu.org/download/adonthell/${PN}-src-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="userpriv"
-
-RDEPEND="${PYTHON_DEPS}
-	>=games-rpg/adonthell-0.3.5-r2[${PYTHON_USEDEP}]
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_configure(){
-	econf \
-		$(use_enable nls) \
-		--with-adonthell-binary="/usr/bin/adonthell"
-}
-
-src_install(){
-	emake DESTDIR="${D}" pixmapdir=/usr/share/pixmaps install
-	dodoc AUTHORS ChangeLog NEWS PLAYING README
-	make_desktop_entry adonthell-wastesedge "Waste's Edge" wastesedge_32x32
-}
diff --git a/games-rpg/xu4-0.9-r1 b/games-rpg/xu4-0.9-r1
new file mode 100644
index 000000000000..8e0690760e63
--- /dev/null
+++ b/games-rpg/xu4-0.9-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=dev-libs/libxml2 media-libs/libsdl[sound,video] media-libs/sdl-mixer[timidity] app-arch/unzip
+DESCRIPTION=A remake of the computer game Ultima IV
+EAPI=6
+HOMEPAGE=http://xu4.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libxml2 media-libs/libsdl[sound,video] media-libs/sdl-mixer[timidity]
+SLOT=0
+SRC_URI=mirror://sourceforge/xu4/xu4-0.9.tar.gz mirror://sourceforge/xu4/ultima4-1.01.zip mirror://sourceforge/xu4/u4upgrad.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9ff4bee37f837705458a8fdb1ce4c28d
diff --git a/games-rpg/xu4/Manifest b/games-rpg/xu4/Manifest
deleted file mode 100644
index bfb57e535012..000000000000
--- a/games-rpg/xu4/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX 0.9-savegame.patch 1716 BLAKE2B fc0fb7a9fac04bb9a386b52de0dc44719ad24f17b9cb086651803169a1a43a0a01129d3c5ecaad1bfa056355a488e9bbd743820b5a7716a3c599f63febb58c96 SHA512 b6484a2abc6b32933157cf3e7875d2863473bc863076efa3c4398dbd28cc037cbac2e376c5ce4bbd6c7fabdb2c0bc907be872e2167f6a00f4ca311ea8301ad77
-AUX xu4-0.9-ldflags.patch 1721 BLAKE2B 99181c971612b6ef1c929743612a0cbf8c0a7b90c4269dfe665e0909b3d1fcf7ae92a242b803474442e7f3aa7999799163089417e0a2efd4b22cc5a65420997d SHA512 1e0c3b8f6595f9b9f7fecda9264460cd67e289a7a0ba19fc181473546e3db4b2cadde825be46f27fdfec9b872fb6cb6ea8e474a890f25677b49b85093ffa957c
-AUX xu4-0.9-warnings.patch 454 BLAKE2B fb8c8b32013893e4db0aa7c20a39ceba9077b1fe64e10df5a4d0e2b7356bfedf9122a1d900b2527dc292054d827a1ed2237d16f18536045bc6113afb81c7189e SHA512 0a92b7510789a55c712f8d9a2130ac4d9cdf6e2403201c258d24c121fdae6e0d932504677715bea062652ee6aff7b27ec6419c578cb5fe56406b1965c387b361
-AUX xu4-0.9-zip.patch 4980 BLAKE2B 761a3251b23a22c3b1bc445a6cdc5a90f5ebe374dabd2ffebdf27c255250508db2010a514b256c07d8e94a6dfcf1fa50d4224b7d675360fa02e3394452453a44 SHA512 b531fd545f1827cff61eec4f5b60bb9b98e4b907c02a9477c269f75e3cccaf1741189abe47a1dcac6205c3fffadff7b13e57bfd80e2ac771f38546ef7c21a85c
-DIST u4upgrad.zip 632072 BLAKE2B 3691f1cbac940021ef6043dd5e2ee26dcee5f8d7181ed525179211a6984f5ab498b84533d28146129c3e747f0af8946f7d691b7cb817a5a4ecb39e71e2df7b9a SHA512 4832d8cfd266d3ccc5eab5184bd2b6b9acd4c0203478873fb5e11704d95104dd9285a7752bad77f873d4f8603673184ae9421964509b948ec69944a4ceadd083
-DIST ultima4-1.01.zip 537487 BLAKE2B 9af5c934e57d3b0151a575efc3ed34fa25f81ed2c43e2cb95ee200afb1b2f49365634199e066787de3d20c4c97903f918de2a4d4f2e9aeeb361ee585e59fbbc1 SHA512 c86c29d51e21b93992316552fbaaec948e7e8048fea484f003f43ac82211f82fa587fb15db991cddf744f2c3ff0fc4d411cd51cc7650e13a5b520c4dc620518c
-DIST xu4-0.9.tar.gz 320090 BLAKE2B 298a97edd2c42edcc2f63ec99656e76f3c541fce13f01a0767f02f63223e0d842a33ee1012742b7cd5bdefa7c66cddba6799130f539a8bb306c87ece8585ea62 SHA512 6c0b27472074d96a5f76e024c800bed89c57c29dbd760278c819ad8b024362480bda5f1584eb9fe64fd6f6cae0b3b8d8571c8cf533f25b842471803acd7cea8d
-EBUILD xu4-0.9-r1.ebuild 1664 BLAKE2B b6cdc4c4b22521b2a8892b55965aa5daa74a2654c58aeb718372dc1bfd27eb9d036ba5c855947dc0d911a1bfacf8c5ff4922524e0912e6b4ce64eedc8a2f2cd2 SHA512 558b73be5403e28590790461f416cd7179dd57ea6303a5cc55de678eaefb9bb40f394a04bc1e836219f165eb172f6fddff15213fb17b344ff52032c635bb12c1
-MISC metadata.xml 326 BLAKE2B c34bb1f21e6b7a60bb30b7bb3196af118f53137fcfd6508c3bc84c6abd1f62d53c1f43e72a1816c86f982f6f49b7dfa774647d1f42fc6ab696479b1ad645f9a9 SHA512 cdeb23df21e2a0ad4994adffe0ecf7fdca9fb886b6afc13483a80ffd481c9a031c2039894c86693b1ecf9652f882c2816e7091a3d6dd9ad76013b563e8780ec3
diff --git a/games-rpg/xu4/files/0.9-savegame.patch b/games-rpg/xu4/files/0.9-savegame.patch
deleted file mode 100644
index 96d16360f37c..000000000000
--- a/games-rpg/xu4/files/0.9-savegame.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- a/src/savegame.c.
-+++ b/src/savegame.c
-@@ -21,23 +21,24 @@
- char *partySavFilename() {
-     char *fname;
-     
--#if defined(MACOSX)
-     char *home;
- 
-     home = getenv("HOME");
-     if (home && home[0]) {
-         fname = (char *) malloc(strlen(home) + 
-+#if defined(MACOSX)
- strlen(MACOSX_USER_FILES_PATH) +
-+#endif
-+strlen("/.u4/") +
- strlen(PARTY_SAV_BASE_FILENAME) + 2);
-         strcpy(fname, home);
-+#if defined(MACOSX)
-         strcat(fname, MACOSX_USER_FILES_PATH);
--        strcat(fname, "/");
-+#endif
-+        strcat(fname, "/.u4/");
-         strcat(fname, PARTY_SAV_BASE_FILENAME);
-     } else
-         fname = strdup(PARTY_SAV_BASE_FILENAME);
--#else
--    fname = strdup(PARTY_SAV_BASE_FILENAME);
--#endif
-     
-     return fname;
- }
-@@ -45,24 +45,24 @@
- char *monstersSavFilename() {
-     char *fname;
-     
--#if defined(MACOSX)
-     char *home;
- 
-     home = getenv("HOME");
-     if (home && home[0]) {
-         fname = (char *) malloc(strlen(home) + 
-+#if defined(MACOSX)
- strlen(MACOSX_USER_FILES_PATH) +
-+#endif
-+strlen("/.u4/") +
- strlen(MONSTERS_SAV_BASE_FILENAME) + 2);
-         strcpy(fname, home);
-+#if defined(MACOSX)
-         strcat(fname, MACOSX_USER_FILES_PATH);
--        strcat(fname, "/");
-+#endif
-+        strcat(fname, "/.u4/");
-         strcat(fname, MONSTERS_SAV_BASE_FILENAME);
-     } else
-         fname = strdup(MONSTERS_SAV_BASE_FILENAME);
--#else
--    fname = strdup(MONSTERS_SAV_BASE_FILENAME);
--#endif
--    
-     return fname;
- }
-     
---- a/src/u4.c
-+++ b/src/u4.c
-@@ -38,6 +38,10 @@
-     osxInit(argv[0]);
- #endif
- 
-+    if (getenv("HOME")) {
-+    	chdir(getenv("HOME"));
-+	mkdir(".u4", 0777);
-+    }
-     settingsRead();
- 
-     for (i = 1; i < (unsigned int)argc; i++) {
diff --git a/games-rpg/xu4/files/xu4-0.9-ldflags.patch b/games-rpg/xu4/files/xu4-0.9-ldflags.patch
deleted file mode 100644
index 7f1e5cd922d7..000000000000
--- a/games-rpg/xu4/files/xu4-0.9-ldflags.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/src/Makefile.common
-+++ b/src/Makefile.common
-@@ -68,25 +68,25 @@
- mkutils::  dumpsavegame$(EXEEXT) lzwenc$(EXEEXT) lzwdec$(EXEEXT) rleenc$(EXEEXT) rledec$(EXEEXT) tlkconv$(EXEEXT)
- 
- $(MAIN): $(OBJS)
--	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(LIBS)
- 
- dumpsavegame$(EXEEXT) : util/dumpsavegame.o savegame.o io.o names.o
--	$(CC) $(CFLAGS) -o dumpsavegame util/dumpsavegame.o savegame.o io.o names.o
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o dumpsavegame util/dumpsavegame.o savegame.o io.o names.o
- 
- lzwenc$(EXEEXT) : util/lzwenc.o lzw/hash.o util/pngconv.o
--	$(CC) $(CFLAGS) -o lzwenc util/lzwenc.o lzw/hash.o util/pngconv.o -lpng -lz
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o lzwenc util/lzwenc.o lzw/hash.o util/pngconv.o -lpng -lz
- 
- lzwdec$(EXEEXT) : util/lzwdec.o lzw/lzw.o lzw/u4decode.o lzw/hash.o util/pngconv.o
--	$(CC) $(CFLAGS) -o lzwdec util/lzwdec.o lzw/lzw.o lzw/u4decode.o lzw/hash.o util/pngconv.o -lpng -lz
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o lzwdec util/lzwdec.o lzw/lzw.o lzw/u4decode.o lzw/hash.o util/pngconv.o -lpng -lz
- 
- rleenc$(EXEEXT) : util/rleenc.o util/pngconv.o
--	$(CC) $(CFLAGS) -o rleenc util/rleenc.o util/pngconv.o -lpng -lz
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o rleenc util/rleenc.o util/pngconv.o -lpng -lz
- 
- rledec$(EXEEXT) : util/rledec.o rle.o util/pngconv.o
--	$(CC) $(CFLAGS) -o rledec util/rledec.o rle.o util/pngconv.o -lpng -lz
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o rledec util/rledec.o rle.o util/pngconv.o -lpng -lz
- 
- tlkconv$(EXEEXT) : util/tlkconv.o
--	$(CC) $(CFLAGS) -o tlkconv util/tlkconv.o $(shell xml2-config --libs)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o tlkconv util/tlkconv.o $(shell xml2-config --libs)
- 
- clean:: cleanutil
- 	rm -rf *~ */*~ $(OBJS) $(MAIN)
diff --git a/games-rpg/xu4/files/xu4-0.9-warnings.patch b/games-rpg/xu4/files/xu4-0.9-warnings.patch
deleted file mode 100644
index e52b610e61d4..000000000000
--- a/games-rpg/xu4/files/xu4-0.9-warnings.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/src/u4.c
-+++ b/src/u4.c
-@@ -3,6 +3,8 @@
-  */
- 
- #include <stdio.h>
-+#include <sys/stat.h>
-+#include <sys/types.h>
- #include <stdlib.h>
- #include <stdarg.h>
- #include <string.h>
---- a/u4.desktop
-+++ b/u4.desktop
-@@ -1,9 +1,8 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=Ultima 4
- Comment=Ultima 4 (xu4)
- Exec=u4
--Icon=u4.png
--Terminal=0
-+Icon=u4
-+Terminal=false
- Type=Application
--Categories=Application;Game;RolePlaying;
-+Categories=Game;RolePlaying;
diff --git a/games-rpg/xu4/files/xu4-0.9-zip.patch b/games-rpg/xu4/files/xu4-0.9-zip.patch
deleted file mode 100644
index a8d2c58971c9..000000000000
--- a/games-rpg/xu4/files/xu4-0.9-zip.patch
+++ /dev/null
@@ -1,144 +0,0 @@
---- a/src/unzip.c
-+++ b/src/unzip.c
-@@ -493,7 +493,7 @@
- /*
-   Get Info about the current file in the zipfile, with internal only info
- */
--local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,
-+local int unzlocal_GetCurrentFileInfoInternal _Z_OF((unzFile file,
-                                                   unz_file_info *pfile_info,
-                                                   unz_file_info_internal 
-                                                   *pfile_info_internal,
---- a/src/unzip.h
-+++ b/src/unzip.h
-@@ -8,7 +8,7 @@
-    Encryption and multi volume ZipFile (span) are not supported.
-    Old compressions used by old PKZip 1.x are not supported
- 
--   THIS IS AN ALPHA VERSION. AT THIS STAGE OF DEVELOPPEMENT, SOMES API OR STRUCTURE
-+   THIS IS AN ALPHA VERSION. AT THIS STAGE _Z_OF DEVELOPPEMENT, SOMES API OR STRUCTURE
-    CAN CHANGE IN FUTURE VERSION !!
-    I WAIT FEEDBACK at mail info@winimage.com
-    Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution
-@@ -111,7 +111,7 @@
-     tm_unz tmu_date;
- } unz_file_info;
- 
--extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
-+extern int ZEXPORT unzStringFileNameCompare _Z_OF ((const char* fileName1,
- 												 const char* fileName2,
- 												 int iCaseSensitivity));
- /*
-@@ -124,7 +124,7 @@
- */
- 
- 
--extern unzFile ZEXPORT unzOpen OF((const char *path));
-+extern unzFile ZEXPORT unzOpen _Z_OF((const char *path));
- /*
-   Open a Zip file. path contain the full pathname (by example,
-      on a Windows NT computer "c:\\zlib\\zlib111.zip" or on an Unix computer
-@@ -135,14 +135,14 @@
- 	   of this unzip package.
- */
- 
--extern int ZEXPORT unzClose OF((unzFile file));
-+extern int ZEXPORT unzClose _Z_OF((unzFile file));
- /*
-   Close a ZipFile opened with unzipOpen.
-   If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
-     these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
-   return UNZ_OK if there is no problem. */
- 
--extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
-+extern int ZEXPORT unzGetGlobalInfo _Z_OF((unzFile file,
- 					unz_global_info *pglobal_info));
- /*
-   Write info about the ZipFile in the *pglobal_info structure.
-@@ -150,7 +150,7 @@
-   return UNZ_OK if there is no problem. */
- 
- 
--extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
-+extern int ZEXPORT unzGetGlobalComment _Z_OF((unzFile file,
- 										   char *szComment,
- 					   uLong uSizeBuf));
- /*
-@@ -163,20 +163,20 @@
- /***************************************************************************/
- /* Unzip package allow you browse the directory of the zipfile */
- 
--extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
-+extern int ZEXPORT unzGoToFirstFile _Z_OF((unzFile file));
- /*
-   Set the current file of the zipfile to the first file.
-   return UNZ_OK if there is no problem
- */
- 
--extern int ZEXPORT unzGoToNextFile OF((unzFile file));
-+extern int ZEXPORT unzGoToNextFile _Z_OF((unzFile file));
- /*
-   Set the current file of the zipfile to the next file.
-   return UNZ_OK if there is no problem
-   return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
- */
- 
--extern int ZEXPORT unzLocateFile OF((unzFile file, 
-+extern int ZEXPORT unzLocateFile _Z_OF((unzFile file, 
- 				     const char *szFileName,
- 				     int iCaseSensitivity));
- /*
-@@ -189,7 +189,7 @@
- */
- 
- 
--extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
-+extern int ZEXPORT unzGetCurrentFileInfo _Z_OF((unzFile file,
- 					     unz_file_info *pfile_info,
- 					     char *szFileName,
- 					     uLong fileNameBufferSize,
-@@ -215,20 +215,20 @@
-    from it, and close it (you can close it before reading all the file)
-    */
- 
--extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
-+extern int ZEXPORT unzOpenCurrentFile _Z_OF((unzFile file));
- /*
-   Open for reading data the current file in the zipfile.
-   If there is no error, the return value is UNZ_OK.
- */
- 
--extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
-+extern int ZEXPORT unzCloseCurrentFile _Z_OF((unzFile file));
- /*
-   Close the file in zip opened with unzOpenCurrentFile
-   Return UNZ_CRCERROR if all the file was read but the CRC is not good
- */
- 
- 												
--extern int ZEXPORT unzReadCurrentFile OF((unzFile file, 
-+extern int ZEXPORT unzReadCurrentFile _Z_OF((unzFile file, 
- 					  voidp buf,
- 					  unsigned len));
- /*
-@@ -242,17 +242,17 @@
-     (UNZ_ERRNO for IO error, or zLib error for uncompress error)
- */
- 
--extern z_off_t ZEXPORT unztell OF((unzFile file));
-+extern z_off_t ZEXPORT unztell _Z_OF((unzFile file));
- /*
-   Give the current position in uncompressed data
- */
- 
--extern int ZEXPORT unzeof OF((unzFile file));
-+extern int ZEXPORT unzeof _Z_OF((unzFile file));
- /*
-   return 1 if the end of file was reached, 0 elsewhere 
- */
- 
--extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
-+extern int ZEXPORT unzGetLocalExtrafield _Z_OF((unzFile file,
- 											 voidp buf,
- 											 unsigned len));
- /*
diff --git a/games-rpg/xu4/metadata.xml b/games-rpg/xu4/metadata.xml
deleted file mode 100644
index 4bc2f4a79c26..000000000000
--- a/games-rpg/xu4/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">xu4</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-rpg/xu4/xu4-0.9-r1.ebuild b/games-rpg/xu4/xu4-0.9-r1.ebuild
deleted file mode 100644
index 69fd4ed87d0b..000000000000
--- a/games-rpg/xu4/xu4-0.9-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="A remake of the computer game Ultima IV"
-HOMEPAGE="http://xu4.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xu4/${P}.tar.gz
-	mirror://sourceforge/xu4/ultima4-1.01.zip
-	mirror://sourceforge/xu4/u4upgrad.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/libxml2
-	media-libs/libsdl[sound,video]
-	media-libs/sdl-mixer[timidity]"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/u4
-
-src_unpack() {
-	# xu4 will read the data files right out of the zip files
-	# but we want the docs from the original.
-	unpack ${P}.tar.gz
-	cp "${DISTDIR}"/{ultima4-1.01.zip,u4upgrad.zip} . || die
-	cd "${WORKDIR}" || die
-	mv ultima4-1.01.zip ultima4.zip || die
-	mkdir u4-dos || die
-	cd u4-dos || die
-	unzip -q ../ultima4.zip || die
-}
-
-PATCHES=(
-	"${FILESDIR}/${P}-ldflags.patch"
-	"${FILESDIR}/${PV}-savegame.patch"
-	"${FILESDIR}/${P}-warnings.patch"
-	"${FILESDIR}/${P}-zip.patch"
-)
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:/usr/local/lib/u4:/usr/$(get_libdir)/u4:" src/u4file.c \
-		|| die
-	sed -i \
-		-e 's:-Wall:$(E_CFLAGS):' src/Makefile \
-		|| die
-}
-
-src_compile() {
-	emake -C src \
-		DEBUGCFLAGS= \
-		E_CFLAGS="${CFLAGS}" \
-		bindir="/usr/bin" \
-		datadir="/usr/share" \
-		libdir="/usr/$(get_libdir)"
-}
-
-src_install() {
-	emake -C src \
-		DEBUGCFLAGS= \
-		E_CFLAGS="${CFLAGS}" \
-		bindir="${D}/usr/bin" \
-		datadir="${D}/usr/share" \
-		libdir="${D}/usr/$(get_libdir)" \
-		install
-	dodoc AUTHORS README doc/*txt "${WORKDIR}/u4-dos/ULTIMA4/"*TXT
-	insinto "/usr/$(get_libdir)/u4"
-	doins "${WORKDIR}/"*zip
-}
diff --git a/games-rpg/zsdx-1.9.0-r1 b/games-rpg/zsdx-1.9.0-r1
new file mode 100644
index 000000000000..5da5740f6c4d
--- /dev/null
+++ b/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	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2d1b2186d0dfb0437248eb489ef2ee36
diff --git a/games-rpg/zsdx/Manifest b/games-rpg/zsdx/Manifest
deleted file mode 100644
index e486a3865c69..000000000000
--- a/games-rpg/zsdx/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST zsdx-1.9.0.tar.gz 20757184 BLAKE2B 392aa36cfddaa82367cd3aa6769ffeb95f5e7235b5574d2793af629f289da107a67b70bfc2ad7d86651d2145a3f956bc000102919ca65ee18a1d83eac282d119 SHA512 2fc540d19856734050674945dd4903f254b325cab08ae0199722ae014447523ad9e979b54ddfd59d5cbc290b783481c79d5e155115c90f24feab5587d52804ee
-EBUILD zsdx-1.9.0-r1.ebuild 1130 BLAKE2B 24034d6b972196710ca4d9921c941bc661e0c05ece6dc5680e181ef884d225c1c1694843131c9c2cd2c0ebc792052d2e4dcb96d828fca5d6296ceff3427a5115 SHA512 29d003036632b3ac85d49db00ba01667ec31e20400d99bb49a67c6bb0743edf9ccac64972556b0b492ce064216d6e47d64b9f3b68948a39d3c1fcbb21ad62735
-MISC metadata.xml 333 BLAKE2B 34c8b3d3b3ef4c78241d40bd05613959e3d541561f6973c47c57489b0eea0e84ef21909fcb21102bdb4b5eaf0b8051c075a9649fe0975ead3c4cd1ff4c1471f7 SHA512 8135204b08f68188a8dc178b3083600e01a860b043cbc26415a111f6b23030cc067754dff74d77ac476e757caece3d44688f12126e81c17eaff74e4840f59ec9
diff --git a/games-rpg/zsdx/metadata.xml b/games-rpg/zsdx/metadata.xml
deleted file mode 100644
index 733429dcbd22..000000000000
--- a/games-rpg/zsdx/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">christopho/zsdx</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-rpg/zsdx/zsdx-1.9.0-r1.ebuild b/games-rpg/zsdx/zsdx-1.9.0-r1.ebuild
deleted file mode 100644
index dc00fda49542..000000000000
--- a/games-rpg/zsdx/zsdx-1.9.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils eutils gnome2-utils
-
-DESCRIPTION="A free 2D Zelda fangame"
-HOMEPAGE="http://www.solarus-games.org/"
-SRC_URI="http://www.zelda-solarus.com/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="all-rights-reserved CC-BY-SA-3.0 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="
-	>=games-engines/solarus-1.3.0
-	<games-engines/solarus-1.4.0
-"
-DEPEND="app-arch/zip"
-
-src_configure() {
-	local mycmakeargs=(
-		-DSOLARUS_INSTALL_DATAROOTDIR="/usr/share"
-		-DSOLARUS_INSTALL_BINDIR="/usr/bin"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	newicon -s 48 build/icons/${PN}_icon_48.png ${PN}.png
-	newicon -s 256 build/icons/${PN}_icon_256.png ${PN}.png
-
-	# install proper wrapper script
-	rm -f "${ED}"/usr/bin/${PN}
-	make_wrapper ${PN} "solarus \"/usr/share/solarus/${PN}\""
-
-	make_desktop_entry "${PN}" "Zelda: Mystery of Solarus DX"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/zsxd-1.9.0-r1 b/games-rpg/zsxd-1.9.0-r1
new file mode 100644
index 000000000000..d95170de04e3
--- /dev/null
+++ b/games-rpg/zsxd-1.9.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=app-arch/zip >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A free 2D Zelda fangame parody
+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.1-r1 <games-engines/solarus-1.4.0
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=http://www.zelda-solarus.com/downloads/zsxd/zsxd-1.9.0.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cabde41eadc75aa46f1e664920268d31
diff --git a/games-rpg/zsxd/Manifest b/games-rpg/zsxd/Manifest
deleted file mode 100644
index b730b625bc28..000000000000
--- a/games-rpg/zsxd/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST zsxd-1.9.0.tar.gz 3706125 BLAKE2B 3d83fff945bfecc387b79126628e3d1f45a461ae7b58b702dbe0c0f1799d6b57c53ecd4b1bfeb7a9ccebd279a3b299da8c328a2aca3126bea09f4865e1bfea1e SHA512 cecb8b4ff40b7129bb516cf71e9bbbc92e10ace944c735eb2885dbf0e0b8adef80491c1874ee91efb2c9779b819d0217639fe85f9e3a085c980af6a2972e571e
-EBUILD zsxd-1.9.0-r1.ebuild 1221 BLAKE2B 522806ed5eeb62fb95c5f59b79ef96f5995b4b877398bd1da3c80bcc7a65b29ca8f6c4ca3c6b17a7f24663d97f5c202e6b75715933a2546084307abe34767a21 SHA512 8ad18d02ef616549686d705f085f3d2145f37c03330e01e5021a6b4df6e57e1bf62cf815c1652429318d0adc1b1eef408e27335a66fb9acf35799682f9ae4f1f
-MISC metadata.xml 333 BLAKE2B 81d8a164a8319a24109c072f73e7959380cee2aef798b0ccceb6100825abfe51a6267f1e4f44da5c5ad4ec8881a36e09ac0a38187d936924e0ee85ebe59ee274 SHA512 bb078fd150a98e9326870e54347db0f9962d1f00707d7dcae5814808946e1ca673c45073d9bf886d6cb1d456e3ece9a236c6bb1b8448c3b9d9ef583acdf731f4
diff --git a/games-rpg/zsxd/metadata.xml b/games-rpg/zsxd/metadata.xml
deleted file mode 100644
index 742803c605cd..000000000000
--- a/games-rpg/zsxd/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">christopho/zsxd</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-rpg/zsxd/zsxd-1.9.0-r1.ebuild b/games-rpg/zsxd/zsxd-1.9.0-r1.ebuild
deleted file mode 100644
index 76a8fc0fe7f1..000000000000
--- a/games-rpg/zsxd/zsxd-1.9.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnome2-utils cmake-utils
-
-DESCRIPTION="A free 2D Zelda fangame parody"
-HOMEPAGE="http://www.solarus-games.org/"
-SRC_URI="http://www.zelda-solarus.com/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="all-rights-reserved CC-BY-SA-3.0 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror bindist"
-
-RDEPEND=">=games-engines/solarus-1.3.1-r1
-	<games-engines/solarus-1.4.0"
-DEPEND="app-arch/zip"
-
-DOCS=( ChangeLog readme.txt )
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSOLARUS_INSTALL_DATAROOTDIR="/usr/share"
-		-DSOLARUS_INSTALL_BINDIR="/usr/bin"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	newicon -s 48 build/icons/${PN}_icon_48.png ${PN}.png
-	newicon -s 256 build/icons/${PN}_icon_256.png ${PN}.png
-
-	# install proper wrapper script
-	rm -f "${ED%/}/usr/bin/${PN}
-	make_wrapper ${PN} "solarus \"/usr/share/solarus/${PN}\"
-
-	make_desktop_entry "${PN}" "Zelda: Mystery of Solarus XD"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
author	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 20:58:29 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 20:58:29 +0100
commit	0cf2f20608308acdf3cb922c3736446bbd8f3388 (patch)
tree	07815070629c7c11000a7f51ceb8ccbccb49a809 /games-rpg
parent	1798c4aeca70ac8d0a243684d6a798fbc65735f8 (diff)