241 files changed, 4957 insertions, 646 deletions
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index 62712b9e7f98..ec51ee7413e7 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/antimicro-2.20.2 b/games-util/antimicro-2.20.2
deleted file mode 100644
index 8013d11498ce..000000000000
--- a/games-util/antimicro-2.20.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 media-libs/libsdl2[X,joystick] x11-libs/libX11 x11-libs/libXtst dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Map keyboard and mouse buttons to gamepad buttons
-EAPI=5
-HOMEPAGE=https://github.com/Ryochan7/antimicro
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 media-libs/libsdl2[X,joystick] x11-libs/libX11 x11-libs/libXtst
-SLOT=0
-SRC_URI=https://github.com/Ryochan7/antimicro/archive/2.20.2.tar.gz -> antimicro-2.20.2.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=80be9fb8a713a571a3134300abaf1014
diff --git a/games-util/antimicro/Manifest b/games-util/antimicro/Manifest
new file mode 100644
index 000000000000..8bbd4e2c0a7a
--- /dev/null
+++ b/games-util/antimicro/Manifest
@@ -0,0 +1,3 @@
+DIST antimicro-2.20.2.tar.gz 1069469 BLAKE2B 8507c4f46e3e016c54d6cc0081ad5e90a0473bd1b99c30e6ceb74804564fdde6cd4bcb4897be5ae06272ae0aa55f36976d91ee9b1d531fce2013dad81379c1bb SHA512 09847c804b6a1d022f2990d269c9124cfdfab821e0fd1cb1ab5e27e4c6a3bd250fab5977ca614f03c46456ca6e1c7111135b9b4d8f75e54c435e0b712653e282
+EBUILD antimicro-2.20.2.ebuild 707 BLAKE2B 9ed42f69bc1865cae0e080bcf4a5a319c55ed23ff1798b992670ac27f3e64e560f8472fd2502852af8f42801f5f1d03a71ccfe4fd6133b010a32b1481994e6fd SHA512 18e36314e3be0461d4b3c3b729953df70f354e4ee8c92054fbed1b57768dd42e03e7c1000403e02358c157cc8bc36ad3c5461db62880bcaba95d443751f9f7e9
+MISC metadata.xml 336 BLAKE2B 356b2f4e6c4e30467d1d84264432d49a2bc60d6dcfdde3f7e019c8191b91d2f105016832990d188cfa0451509c88b543a7f5f0b99a843295dd92d1d838268ce8 SHA512 6df67abd609cd6d4e29875695481bca8857c6a1d1c8f4803c40d584cacd47a46ed3f9fdaa6a7369950a795ce07cc61ad47fa096ea35a463a6594916ae52a4968
diff --git a/games-util/antimicro/antimicro-2.20.2.ebuild b/games-util/antimicro/antimicro-2.20.2.ebuild
new file mode 100644
index 000000000000..c720d534fcee
--- /dev/null
+++ b/games-util/antimicro/antimicro-2.20.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils cmake-utils
+
+DESCRIPTION="Map keyboard and mouse buttons to gamepad buttons"
+HOMEPAGE="https://github.com/Ryochan7/antimicro"
+SRC_URI="https://github.com/Ryochan7/antimicro/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtnetwork:5
+	media-libs/libsdl2[X,joystick]
+	x11-libs/libX11
+	x11-libs/libXtst"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_SDL_2=ON
+	)
+
+	QT_SELECT=5 cmake-utils_src_configure
+}
diff --git a/games-util/antimicro/metadata.xml b/games-util/antimicro/metadata.xml
new file mode 100644
index 000000000000..68a912826f90
--- /dev/null
+++ b/games-util/antimicro/metadata.xml
@@ -0,0 +1,11 @@
+<?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">Ryochan7/antimicro</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-util/atlas-0.5.1_beta_pre20160907 b/games-util/atlas-0.5.1_beta_pre20160907
deleted file mode 100644
index 0465c000f5bd..000000000000
--- a/games-util/atlas-0.5.1_beta_pre20160907
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure postinst prepare
-DEPEND=media-libs/freeglut media-libs/glew:0= media-libs/libpng:0= net-misc/curl sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl >=dev-games/simgear-3.0.0 media-libs/plib >=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=Chart Program to use with Flightgear Flight Simulator
-EAPI=6
-HOMEPAGE=http://atlas.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/freeglut media-libs/glew:0= media-libs/libpng:0= net-misc/curl sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl >=games-simulation/flightgear-3.0.0
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~reavertm/atlas-hgcode-e183e3b3a0412b504edcb3664445b3e04fd484a2.zip
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=b31d708d941ba0bac26d9b1d766e8157
diff --git a/games-util/atlas/Manifest b/games-util/atlas/Manifest
new file mode 100644
index 000000000000..fa8e46e4cffb
--- /dev/null
+++ b/games-util/atlas/Manifest
@@ -0,0 +1,5 @@
+AUX atlas-0.5.1_beta_pre20160907-jpeg-9.patch 746 BLAKE2B 686bf154fd43d68f42c97d65ce0c0207cf65a206e9f931f0b5280149768d07a589248209e8286e9b80387c1af6e9d0a8d86d0f2213d640c828daba0ed58243d1 SHA512 0291dd266d23f6a5963a5095dac79cd001e16449fbbb5f5b3113253f3d252932be915f7afc0e4efa52f0e65f9117c446dabe9850ca9d8550219657916c3efd7a
+AUX atlas-0.5.1_beta_pre20160907-simgear-compilation.patch 8125 BLAKE2B f5b0b2e27e191ff32a6006b4d2d4f200d4a1a6f387adace607a9e421cf16c55a15d2182691d3bbb5994de9870176da80b520d8de70d2532a11b9febb9a10245a SHA512 871e576cb95565b658379d76c285067c820f591f97bd1826a11f396742651aa7e783f85b9278039ab4bd2c8e6f9f0268323185a8219408c8f01fa67db65f856f
+DIST atlas-hgcode-e183e3b3a0412b504edcb3664445b3e04fd484a2.zip 530005 BLAKE2B 3069f743ee83a1892283eebe27698c6360a90f67a05999f3f5cab8b786d976a4cd15151cbe8c7c1165b43cfb9e3265868a5b55b9364a82c5f78b1fe5f69dffcc SHA512 5f4453c81b01451ce69f4f1340a7c34736be3a9ecf638aa340455d0bb0af7a5d1a7e05d0b51e8b75f5c3acef4787d208ace75d4c686e8be7eafb8f81c71df360
+EBUILD atlas-0.5.1_beta_pre20160907.ebuild 1428 BLAKE2B 69a8ba0ea8f52eed8ec772f6c9b814cf1723d130a7c379bd52a651a9acce94214219fb85b2fd6ae455023034adc220bcd9af545744e34dd6c8d1232df6815083 SHA512 b9b3d336c011fdade103dbdf978a74bd9b280750bd51d5b24aa377c00f60bc6f06277497d8f91a9615d87b63e5fb9c3a03867bb4981170fe1ade0e5c5d626fd1
+MISC metadata.xml 440 BLAKE2B b07c76b0e7d3866e8a6f6e7ef2d73ea39a29e81c57cab9e77945124bf3817182434b504e9ec5022c40a764ce8d63e034b59eb92829e982c28db4d849f006d912 SHA512 761058431181d1ca1367ef68e464e7ee1a19a69576b46768a652be280ce7d161bcdf8f5d8b993a7d8a7ababe4a8e436f11ff3ee4ad1661b50e8a8c6edbf62158
diff --git a/games-util/atlas/atlas-0.5.1_beta_pre20160907.ebuild b/games-util/atlas/atlas-0.5.1_beta_pre20160907.ebuild
new file mode 100644
index 000000000000..4fed6a08e4a1
--- /dev/null
+++ b/games-util/atlas/atlas-0.5.1_beta_pre20160907.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MY_PN=atlas-hgcode
+MY_PV=e183e3b3a0412b504edcb3664445b3e04fd484a2
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Chart Program to use with Flightgear Flight Simulator"
+HOMEPAGE="http://atlas.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~reavertm/${MY_P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	media-libs/freeglut
+	media-libs/glew:0=
+	media-libs/libpng:0=
+	net-misc/curl
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-games/simgear-3.0.0
+	media-libs/plib
+"
+RDEPEND="${COMMON_DEPEND}
+	>=games-simulation/flightgear-3.0.0
+"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${P}-simgear-compilation.patch"
+	"${FILESDIR}/${P}-jpeg-9.patch"
+)
+
+src_prepare() {
+	default
+
+	# -Wnarrowing failure, #612986
+	sed -i -e 's:0x:(char)0x:g' src/tiles.h || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--datadir="${EPREFIX}"/usr/share/flightgear \
+		--enable-simgear-shared \
+		--with-fgbase="${EPREFIX}"/usr/share/flightgear
+}
+
+pkg_postinst() {
+	elog "To run Atlas concurrently with FlightGear use the following:"
+	elog "Atlas --path=[path of map images] --udp=[port number]"
+	elog "and start fgfs with the following switch (or in .fgfsrc):"
+	elog "--nmea=socket,out,0.5,[host that you run Atlas on],[port number],udp"
+}
diff --git a/games-util/atlas/files/atlas-0.5.1_beta_pre20160907-jpeg-9.patch b/games-util/atlas/files/atlas-0.5.1_beta_pre20160907-jpeg-9.patch
new file mode 100644
index 000000000000..639ff8217546
--- /dev/null
+++ b/games-util/atlas/files/atlas-0.5.1_beta_pre20160907-jpeg-9.patch
@@ -0,0 +1,27 @@
+Fix build with jpeg-9. Bug # 520908
+
+--- a/src/Image.cxx	2018-02-07 03:19:18.538699623 +0100
++++ b/src/Image.cxx	2018-02-07 03:20:15.105160934 +0100
+@@ -29,11 +29,12 @@
+ 
+ // Other libraries' include files
+ #include <png.h>
+-#include <jpeglib.h>
+ 
+ // Our project's include files
+ #include "misc.hxx"
+ 
++#include <jpeglib.h>
++
+ // This is a constant representing "Not an Elevation" - it is
+ // guaranteed to be less than any possible real elevation value.
+ static const float NanE = -std::numeric_limits<float>::max();
+@@ -266,7 +267,7 @@
+     cinfo.in_color_space = JCS_RGB;
+ 
+     jpeg_set_defaults(&cinfo);
+-    jpeg_set_quality(&cinfo, quality, true);
++    jpeg_set_quality(&cinfo, quality, TRUE);
+ 
+     jpeg_start_compress(&cinfo, TRUE);
+ 
diff --git a/games-util/atlas/files/atlas-0.5.1_beta_pre20160907-simgear-compilation.patch b/games-util/atlas/files/atlas-0.5.1_beta_pre20160907-simgear-compilation.patch
new file mode 100644
index 000000000000..f6e4d58bf3b2
--- /dev/null
+++ b/games-util/atlas/files/atlas-0.5.1_beta_pre20160907-simgear-compilation.patch
@@ -0,0 +1,273 @@
+diff -r e183e3b3a041 configure.ac
+--- a/configure.ac	Tue Sep 06 22:12:05 2016 -0700
++++ b/configure.ac	Sat Mar 18 05:09:04 2017 +0100
+@@ -10,6 +10,8 @@
+ AC_PREREQ(2.52)
+ AM_INIT_AUTOMAKE
+ 
++CXXFLAGS="-std=c++11"
++
+ dnl Checks for programs.
+ AC_PROG_MAKE_SET
+ AC_PROG_CC
+diff -r e183e3b3a041 src/FlightTrack.cxx
+--- a/src/FlightTrack.cxx	Tue Sep 06 22:12:05 2016 -0700
++++ b/src/FlightTrack.cxx	Sat Mar 18 05:09:04 2017 +0100
+@@ -81,7 +81,7 @@
+ 	throw runtime_error("flight file open failure");
+     }
+ 
+-    _file.set(filePath);
++    _file = SGPath(filePath);
+ 
+     _port = -1;
+     _device = "";
+@@ -101,7 +101,7 @@
+     _input_channel = new SGSocket("", portStr.str(), "udp");
+     _input_channel->open(SG_IO_IN);
+ 
+-    _file.set("");
++    _file = SGPath();
+ 
+     _port = port;
+     _device = "";
+@@ -123,7 +123,7 @@
+     _input_channel = new SGSerial(device, baudStr.str());
+     _input_channel->open(SG_IO_IN);
+ 
+-    _file.set("");
++    _file = SGPath();
+ 
+     _port = -1;
+     _device = device;
+@@ -399,11 +399,11 @@
+     return _name.str();
+ }
+ 
+-void FlightTrack::setFilePath(char *path)
++void FlightTrack::setFilePath(const char *path)
+ {
+     // EYE - check for existing name?  overwriting?
+     // EYE - call this (and other accessors) from constructors?
+-    _file.set(path);
++    _file = SGPath(path);
+     // We count this as a change.
+     _version++;
+     _versionAtLastSave = 0;
+diff -r e183e3b3a041 src/FlightTrack.hxx
+--- a/src/FlightTrack.hxx	Tue Sep 06 22:12:05 2016 -0700
++++ b/src/FlightTrack.hxx	Sat Mar 18 05:09:04 2017 +0100
+@@ -141,7 +141,7 @@
+     const char *fileName();	// File name
+     const char *filePath();	// Full path, including file
+     const char *niceName();	// Nicely formatted name
+-    void setFilePath(char *path);
++    void setFilePath(const char *path);
+     void save();
+     bool modified();
+ 
+diff -r e183e3b3a041 src/Geographics.cxx
+--- a/src/Geographics.cxx	Tue Sep 06 22:12:05 2016 -0700
++++ b/src/Geographics.cxx	Sat Mar 18 05:09:04 2017 +0100
+@@ -25,6 +25,7 @@
+ #include "Geographics.hxx"
+ 
+ // C++ system files
++#include <cmath>
+ #include <stdexcept>
+ 
+ // Our project's include files
+@@ -431,11 +432,11 @@
+ bool AtlasCoord::_geodValid() const
+ {
+     // Note: this has to agree with the value set in invalidate()!
+-    return !isnan(_geod.getLatitudeDeg());
++    return !std::isnan(_geod.getLatitudeDeg());
+ }
+ 
+ bool AtlasCoord::_cartValid() const
+ {
+     // Note: this has to agree with the value set in invalidate()!
+-    return !isnan(_cart.x());
++    return !std::isnan(_cart.x());
+ }
+diff -r e183e3b3a041 src/Map.cxx
+--- a/src/Map.cxx	Tue Sep 06 22:12:05 2016 -0700
++++ b/src/Map.cxx	Sat Mar 18 05:09:04 2017 +0100
+@@ -168,13 +168,13 @@
+ bool parse_arg(char* arg) 
+ {
+     if (strncmp(arg, "--fg-root=", 10) == 0) {
+-	fg_root.set(arg + 10);
++	fg_root = SGPath(arg + 10);
+     } else if (strncmp(arg, "--fg-scenery=", 13) == 0) {
+-	scenery.set(arg + 13);
++	scenery = SGPath(arg + 13);
+     } else if (strncmp(arg, "--atlas=", 8) == 0) {
+-	atlas.set(arg + 8);
++	atlas = SGPath(arg + 8);
+     } else if (strncmp(arg, "--palette=", 10) == 0) {
+-	palette.set(arg + 10);
++	palette = SGPath(arg + 10);
+     } else if (strcmp(arg, "--png") == 0) {
+ 	imageType = TileMapper::PNG;
+     } else if (strcmp(arg, "--jpeg") == 0) {
+@@ -272,23 +272,14 @@
+     // Read the FG_ROOT and FG_SCENERY environment variables before
+     // processing .atlasmaprc and command args, so that we can
+     // override them if necessary.
+-    char *env = getenv("FG_ROOT");
+-    if (env == NULL) {
+-	// EYE - is it possible for this to not be defined?
+-	fg_root.set(FGBASE_DIR);
+-    } else {
+-	fg_root.set(env);
+-    }
+ 
+-    env = getenv("FG_SCENERY");
+-    if (env == NULL) {
+-	fg_scenery.set(fg_root.str() + "/Scenery");
+-    } else {
+-	fg_scenery.set(env);
+-    }
++    // EYE - is it possible for this to not be defined?
++    fg_root = SGPath::fromEnv("FG_ROOT", SGPath(FGBASE_DIR));
++
++    fg_scenery = SGPath::fromEnv("FG_SCENERY", fg_root.str() + "/Scenery");
+ 
+     // Set a default palette.
+-    palette.set("default.ap");
++    palette = SGPath("default.ap");
+ 
+     // Process ~/.atlasmaprc.
+     char* homedir = getenv("HOME");
+@@ -332,10 +323,10 @@
+ 	// 'scenery'.  We're done.
+     } else if (!fg_scenery.str().empty()) {
+ 	// From FG_SCENERY
+-	scenery.set(fg_scenery.str());
++	scenery = SGPath(fg_scenery.str());
+     } else if (!fg_root.str().empty()) {
+ 	// Default: $FG_ROOT/Scenery
+-	scenery.set(fg_root.str());
++	scenery = SGPath(fg_root.str());
+ 	scenery.append("Scenery");
+     } else {
+ 	fprintf(stderr, "%s: No scenery directory specified.", appName);
+@@ -356,7 +347,7 @@
+     } else if (!fg_root.str().empty()) {
+ 	// EYE - make default $HOME/Atlas?
+ 	// Default: $FG_ROOT/Atlas
+-	atlas.set(fg_root.str());
++	atlas = SGPath(fg_root.str());
+ 	atlas.append("Atlas");
+     } else {
+ 	fprintf(stderr, "%s: No map directory specified.", appName);
+@@ -394,11 +385,11 @@
+     SGPath palettePath;
+     palettePath.append(palette.str());
+     if ((atlasPalette = loadPalette(palettePath.c_str())) == NULL) {
+-	palettePath.set(atlas.str());
++	palettePath = SGPath(atlas.str());
+ 	palettePath.append("Palettes");
+ 	palettePath.append(palette.str());
+ 	if ((atlasPalette = loadPalette(palettePath.c_str())) == NULL) {
+-	    palettePath.set(fg_root.str());
++	    palettePath = SGPath(fg_root.str());
+ 	    palettePath.append("Atlas");
+ 	    palettePath.append("Palettes");
+ 	    palettePath.append(palette.str());
+diff -r e183e3b3a041 src/Preferences.cxx
+--- a/src/Preferences.cxx	Tue Sep 06 22:12:05 2016 -0700
++++ b/src/Preferences.cxx	Sat Mar 18 05:09:04 2017 +0100
+@@ -317,7 +317,7 @@
+ {
+     string buf;
+     is >> buf;
+-    p.set(buf);
++    p = SGPath(buf);
+ 
+     return is;
+ }
+@@ -638,7 +638,7 @@
+     // EYE - just get()?
+     SGPath p(fg_root.get(Pref::FACTORY));
+     if (p.isNull()) {
+-	p.set(FGBASE_DIR);
++	p = SGPath(FGBASE_DIR);
+     }
+     p.append("Atlas");
+     path.set(p, Pref::FACTORY);
+@@ -770,10 +770,10 @@
+     char* homedir = getenv("HOME");
+     SGPath rcpath;
+     if (homedir != NULL) {
+-	rcpath.set(homedir);
++	rcpath = SGPath(homedir);
+ 	rcpath.append(atlasrc);
+     } else {
+-	rcpath.set(atlasrc);
++	rcpath = SGPath(atlasrc);
+     }
+ 
+     ifstream rc(rcpath.c_str());
+@@ -946,7 +946,7 @@
+     }
+     SGPath p;
+     while (optind < argc) {
+-	p.set(argv[optind++]);
++	p = SGPath(argv[optind++]);
+ 	flightFiles.push_back(p);
+     }
+ 
+diff -r e183e3b3a041 src/Scenery.cxx
+--- a/src/Scenery.cxx	Tue Sep 06 22:12:05 2016 -0700
++++ b/src/Scenery.cxx	Sat Mar 18 05:09:04 2017 +0100
+@@ -198,7 +198,7 @@
+ 	data = (GLubyte *)loadJPEG(f.c_str(), &width, &height, &depth, 
+ 				   maximumElevation);
+ 	if (!data) {
+-	    f.set(f.base());
++	    f = SGPath(f.base());
+ 	    f.concat(".png");
+ 	    data = (GLubyte *)loadPNG(f.c_str(), &width, &height, &depth,
+ 				      maximumElevation);
+diff -r e183e3b3a041 src/Subbucket.cxx
+--- a/src/Subbucket.cxx	Tue Sep 06 22:12:05 2016 -0700
++++ b/src/Subbucket.cxx	Sat Mar 18 05:09:04 2017 +0100
+@@ -346,10 +346,10 @@
+     // http://wiki.flightgear.org/index.php/BTG_File_Format
+ 
+     SGBinObject btg;
+-    if (!btg.read_bin(_path.c_str())) {
+-	// EYE - throw an error?
+-	// EYE - will the cache continue to call load() then?
+-	return false;
++    if (!btg.read_bin(SGPath(_path))) {
++        // EYE - throw an error?
++        // EYE - will the cache continue to call load() then?
++        return false;
+     }
+ 
+     //////////////////////////////////////////////////////////////////////
+diff -r e183e3b3a041 src/Tiles.cxx
+--- a/src/Tiles.cxx	Tue Sep 06 22:12:05 2016 -0700
++++ b/src/Tiles.cxx	Sat Mar 18 05:09:04 2017 +0100
+@@ -464,7 +464,7 @@
+ const SGPath& TileManager::mapPath(unsigned int level)
+ {
+     static SGPath result;
+-    result.set(_maps.str());
++    result = SGPath(_maps.str());
+ 
+     char str[3];
+     snprintf(str, 3, "%d", level);
+@@ -821,7 +821,7 @@
+ const SGPath& Tile::sceneryDir()
+ {
+     if (_sceneryIndex == TileManager::NaPI) {
+-	__sceneryPath = "";
++	__sceneryPath = SGPath();
+     } else {
+ 	__sceneryPath = _tm->sceneryPaths()[_sceneryIndex];
+ 	__sceneryPath.append(chunk()->name());
diff --git a/games-util/atlas/metadata.xml b/games-util/atlas/metadata.xml
new file mode 100644
index 000000000000..2b6588a24cac
--- /dev/null
+++ b/games-util/atlas/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>reavertm@gentoo.org</email>
+		<name>Maciej Mrozowski</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">atlas</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-util/biounzip-1.1a b/games-util/biounzip-1.1a
deleted file mode 100644
index f444e760d5ba..000000000000
--- a/games-util/biounzip-1.1a
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/zlib
-DESCRIPTION=Unpacks BioZip archives
-EAPI=5
-HOMEPAGE=http://biounzip.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib
-SLOT=0
-SRC_URI=mirror://sourceforge/biounzip/biounzip-1.1a.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6999aacc40642f87d0833e0ec65b8274
diff --git a/games-util/biounzip/Manifest b/games-util/biounzip/Manifest
new file mode 100644
index 000000000000..c5868f86b8e5
--- /dev/null
+++ b/games-util/biounzip/Manifest
@@ -0,0 +1,4 @@
+AUX biounzip-1.1a-64bit.patch 462 BLAKE2B 2c762b12ad665f48657419534307319d27efbc91929bd0795ea738f5f8214cc1b2ba3df6c00e8bd8f5eee9db9ada6bd14dd71165e6eb1666d90bb766ad80f901 SHA512 751078079fb663f7f229ccfbbb8e8ea2f779f6739144a75415d73937559ef08886156c8a9ae6e354269b4e0363b34b06bd2979400d671c6c4f7c646abc2b5328
+DIST biounzip-1.1a.tar.bz2 9894 BLAKE2B 950216a1b0b994b2ec271d836c7cf86471a2eca5ac0c259885e21a4df7b20425b74ae2ffb08610ed0841caced5d8b6783c448857df3a2a9030c788ee9b88db3b SHA512 4eaea5459cf6edaf289951f9048123496a4eb83fcfc39b3efcd2a81894f877d5db843d7448e2c0e3b797b09a70f6f3c133c53525d4f83408306089bd37796a8c
+EBUILD biounzip-1.1a.ebuild 588 BLAKE2B 1f1790eda791a50f937995da2854e80c8d4838146b963152b9df016e444b406b07fe9a89eae56031aa25302ecbc9ce507a51c60774e177438f85438f1dccd8fc SHA512 19df79ea2fdaf16e6b27016fc1624c0a83739165c7770ef34a64d8b5a20ffc45d0f3d581d9f9c3df293e7179f06750733474fe52b87a887f2eed2bc4ba70dd95
+MISC metadata.xml 331 BLAKE2B 0a7243a32e0bc9b5e20d89b4b62c0199413de7c1f0c11dab9b32d925ac1dce7f65e7b74ca0d7ba78fa02a0faaf5e651fe9e6319a240189a7f934bbad8e700118 SHA512 2cb5bc86ab42d6bacdf6a1991c9c54cb3c313dd3a7dd8a2aee4d25ab899dd20d88c5db6a340e2c56e21dc1725fc6b24c55ba212e23ec2ca03230e9a6ac023b53
diff --git a/games-util/biounzip/biounzip-1.1a.ebuild b/games-util/biounzip/biounzip-1.1a.ebuild
new file mode 100644
index 000000000000..8864926d8034
--- /dev/null
+++ b/games-util/biounzip/biounzip-1.1a.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Unpacks BioZip archives"
+HOMEPAGE="http://biounzip.sourceforge.net/"
+SRC_URI="mirror://sourceforge/biounzip/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-libs/zlib"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${P/a/}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-64bit.patch
+}
+
+src_compile() {
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN} *.c -lz || die
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc biozip.txt
+}
diff --git a/games-util/biounzip/files/biounzip-1.1a-64bit.patch b/games-util/biounzip/files/biounzip-1.1a-64bit.patch
new file mode 100644
index 000000000000..a8522189d31f
--- /dev/null
+++ b/games-util/biounzip/files/biounzip-1.1a-64bit.patch
@@ -0,0 +1,11 @@
+--- biounzip-1.1-old/biounzip.c	2007-03-08 02:06:16.000000000 +0200
++++ biounzip-1.1/biounzip.c	2007-03-08 02:06:50.000000000 +0200
+@@ -127,7 +127,7 @@
+ void writefile(bzfile *ptr, FILE *fp, char *destdir)
+ {
+   int startpos,returnval,n,debug=0;
+-  unsigned long size_uncompressed,size_compressed;
++  unsigned long size_uncompressed = 0, size_compressed = 0;
+   char *fname,*dirname,*fullname,*fullpath;
+   unsigned char *srcbuffer,*dstbuffer;
+   FILE *outfile;
diff --git a/games-util/biounzip/metadata.xml b/games-util/biounzip/metadata.xml
new file mode 100644
index 000000000000..0fb77f58b247
--- /dev/null
+++ b/games-util/biounzip/metadata.xml
@@ -0,0 +1,11 @@
+<?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">biounzip</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-util/catcodec-1.0.5 b/games-util/catcodec-1.0.5
deleted file mode 100644
index 5936270e8c7e..000000000000
--- a/games-util/catcodec-1.0.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Decodes and encodes sample catalogues for OpenTTD
-EAPI=6
-HOMEPAGE=http://www.openttd.org/en/download-catcodec
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://binaries.openttd.org/extra/catcodec/1.0.5/catcodec-1.0.5-source.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8e78a023dafea79bf33dc9d2616d140f
diff --git a/games-util/catcodec/Manifest b/games-util/catcodec/Manifest
new file mode 100644
index 000000000000..49fcb562ffff
--- /dev/null
+++ b/games-util/catcodec/Manifest
@@ -0,0 +1,3 @@
+DIST catcodec-1.0.5-source.tar.xz 17952 BLAKE2B e828e52426b26c0021365bb961d16028a52a8c8cedac06db6b825947562e6eb513d0c9f7b455710f05dc20b88a86b0cdab3123ede38c2f785709c1b76964e1b4 SHA512 e6e17da17f2449ff5d3a18c34ba3125d475a481ef1dc73ba03dac32fc8523a8929d2cbdfda5f647a0226aa007a217fc90c85ec4cc46937f75e15a596277e0db5
+EBUILD catcodec-1.0.5.ebuild 587 BLAKE2B 1027079128acb8523e471b98653a553e65324ba8c1f7adc55209aa7117946499bde772285d4482fad3697d7f0c94502edf7e63b5943bc9472b164ab7ba80dfe3 SHA512 d65a512c965cc716411ed1e5644b7f2f8c0910a0d4bf8e2fe6247796ff49b9dde4da02656f0bdc957fdae006e4f0734e8ce192eb82ef9490de432f12800e045a
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/catcodec/catcodec-1.0.5.ebuild b/games-util/catcodec/catcodec-1.0.5.ebuild
new file mode 100644
index 000000000000..3f5828e10959
--- /dev/null
+++ b/games-util/catcodec/catcodec-1.0.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Decodes and encodes sample catalogues for OpenTTD"
+HOMEPAGE="http://www.openttd.org/en/download-catcodec"
+SRC_URI="http://binaries.openttd.org/extra/catcodec/${PV}/${P}-source.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE=""
+
+src_prepare() {
+	default
+	tc-export CXX
+}
+
+src_compile() {
+	emake VERBOSE=1
+}
+
+src_install() {
+	dobin catcodec
+	dodoc changelog.txt docs/readme.txt
+	doman docs/catcodec.1
+}
diff --git a/games-util/catcodec/metadata.xml b/games-util/catcodec/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-util/catcodec/metadata.xml
@@ -0,0 +1,8 @@
+<?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-util/datutil-2.46 b/games-util/datutil-2.46
deleted file mode 100644
index f2b91ffd7708..000000000000
--- a/games-util/datutil-2.46
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Converter for dat files for Rom Managers
-EAPI=5
-HOMEPAGE=http://www.logiqx.com/Tools/DatUtil/
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=all-rights-reserved
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=http://www.logiqx.com/Tools/DatUtil/dutil246.zip http://www.logiqx.com/Tools/DatLib/datlib236.zip
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=b521cc9572704218b009badd677e522f
diff --git a/games-util/datutil/Manifest b/games-util/datutil/Manifest
new file mode 100644
index 000000000000..19579502bc42
--- /dev/null
+++ b/games-util/datutil/Manifest
@@ -0,0 +1,4 @@
+DIST datlib236.zip 109484 BLAKE2B 63dbaf4c70b5cd4259fbbe77a36e8608edb62d4a3663d836f237cb23ba85e2128cdb5ec055cd48913a7316c6334689e898fbd37c54a3eaae3428f6b2d54d7544 SHA512 0c601fe243c8ea4186abb6181cf70e749226a5eed871d7391b3686e7eb58195d1aab40305d498d1419c6fa49bf56c59fb74d032642822045cc7e36f8a5fe96b4
+DIST dutil246.zip 209577 BLAKE2B bd806974780bf03d89353a93dfc240dcec00aada4ffa7a3848d2b4e07cc8cb317834115b55b5074ee104db3df975bfc4c5ebbb2591cb9fda6a716bc49f2bb454 SHA512 f9e55eac41894681caaee7d6e3247d4e4d053ac6985d42708623fad415afeb8ece588dd728edc31cbd31bf6df1d9a06ec80f1b45979b0f77763c12e6627434b2
+EBUILD datutil-2.46.ebuild 1093 BLAKE2B d177170dcdc3873e3237e7d59c60be1e15983c8db64497d084e36586e74607dd05d1c94fccd83196e58abfdcde129a4a7a38733a858f1ce6f7d992ce6453aab8 SHA512 04404a03b78154810177ccce2e1b47fb43f91f4d68cc4e002f27d37f675e07d0b8cc11c32fa2b28b71fd953e6cd382affad1ddecb7a1d1bcdc33d35827e703a5
+MISC metadata.xml 577 BLAKE2B 2f3a9e5a6a73c6431efff8ddae66cbddf59b39d36ff30b6d4d243f150612d77e18887e3ab8f597b087f9cccb733b30abae69f7780f2ec636e647b98107699d3f SHA512 30770c001a7d5a072a6db5d913f010cbed6ae0cbe24b2ada950d14585fb1d5c9d4675023e491b6a43130dfcacaf24e4061c2a330d2a9e97fb4324f94e248861d
diff --git a/games-util/datutil/datutil-2.46.ebuild b/games-util/datutil/datutil-2.46.ebuild
new file mode 100644
index 000000000000..acf880241a00
--- /dev/null
+++ b/games-util/datutil/datutil-2.46.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+DL_PV=2.36
+DESCRIPTION="Converter for dat files for Rom Managers"
+HOMEPAGE="http://www.logiqx.com/Tools/DatUtil/"
+SRC_URI="http://www.logiqx.com/Tools/DatUtil/dutil${PV//.}.zip
+	http://www.logiqx.com/Tools/DatLib/datlib${DL_PV//.}.zip"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+RESTRICT="mirror bindist"
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack dutil${PV//.}.zip
+	cd "${S}"
+	mkdir -p dev/datlib
+	cd dev/datlib
+	unpack datlib${DL_PV//.}.zip
+}
+
+src_compile() {
+	# Parallel make issue, see bug #244879 (so make the dirs first)
+	emake -j1 CC="$(tc-getCC)" LD="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" \
+	CFLAGS="${CFLAGS} -Idev" LOGIQX=. EXT= UPX=@# dlmaketree maketree || die "emake failed"
+	emake CC="$(tc-getCC)" LD="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" \
+	CFLAGS="${CFLAGS} -Idev" LOGIQX=. EXT= UPX=@# || die "emake failed"
+}
+
+src_install() {
+	dobin datutil
+	dodoc readme.txt whatsnew.txt
+}
diff --git a/games-util/datutil/metadata.xml b/games-util/datutil/metadata.xml
new file mode 100644
index 000000000000..8840fa601df7
--- /dev/null
+++ b/games-util/datutil/metadata.xml
@@ -0,0 +1,14 @@
+<?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">
+DatUtil was created to aid in the creation of dat files for Rom Managers such as
+ClrMamePro and RomCenter (Roman Scherzer / Eric Bole-Feysot). It can convert
+between formats, extract individual games (and optionally their clones) and
+cleanse dats. It supports a variety of formats
+</longdescription>
+</pkgmetadata>
diff --git a/games-util/deutex-4.4.0 b/games-util/deutex-4.4.0
deleted file mode 100644
index 9afe3155555c..000000000000
--- a/games-util/deutex-4.4.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=A wad composer for Doom, Heretic, Hexen and Strife
-EAPI=5
-HOMEPAGE=http://www.teaser.fr/~amajorel/deutex/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2+ HPND
-SLOT=0
-SRC_URI=http://www.teaser.fr/~amajorel/deutex/deutex-4.4.0.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_=4a18f39a92a49567abf2a952a201e6de
diff --git a/games-util/deutex/Manifest b/games-util/deutex/Manifest
new file mode 100644
index 000000000000..ffcef0eb43a3
--- /dev/null
+++ b/games-util/deutex/Manifest
@@ -0,0 +1,6 @@
+AUX deutex-4.4.0-64bit.patch 524 BLAKE2B 4d95f5cdf0e184b56ed56d0039e38caaebd9ebfcfa1673f72d0182f4eb618540905ae614e7d388c7cf0ab10c00dddbd0918b91ecb929520cca042a5f3d3d1fa4 SHA512 c9ea2a50e5f3fe0cedfd1fb2494a3d4ab11a0d2d4505a9bcbc262ae8934db29f15ec2342d45d812e582380f3831b5f825c293b8bedb529373a903ea0393e88cd
+AUX deutex-4.4.0-makefile.patch 621 BLAKE2B 90d3f8fdd25a01ddd36bc23668a4ace971e16a92de10cd44b46331c26cf8ac5c1fa0ac4b8ab69a0e4df80c15f359a683185b0f8149d289ea118241b2b30efa75 SHA512 57872ee7c41f50db0d62385af10c1c27b6460050520c1403db075ea7e8b418000f2356f7db5b7393071708936e78728d5d23aea782dfa72a9ca355214f24fc6a
+AUX deutex-4.4.0-ovflfix.patch 695 BLAKE2B f3ae1908aa72797317aba2fa3e4d814e7a0f605817508336cecb9b846fd3b4b5e645dda7880da8fd1fbcaa7d0b2f4da2dd5c1795d6b55b49eccb55ea67d37765 SHA512 25e7930b422a565e732da80b183cb3270e7072ae77858319dde657c9439f0854c175f7fe93b4ca3627eda52b4e433a62369163537db396a1c8412c8678fc07e4
+DIST deutex-4.4.0.tar.gz 215945 BLAKE2B f1f2fffa5655cde9ccd04e4045890a41878d85ec76b9c0a3e13e5d67d4e312b13e7b83916961709863fceede90a94731e8351737f94928ef465681d1a7abcdd0 SHA512 fc9aaf399bc9d8ea812102decdf6b3c6d5f4c4a69e925e02fe0e75fa8dc9e54ad36afc352e83819ba13b9ae5dda90bb65c1856825c3ee17c7bd370909b866fb5
+EBUILD deutex-4.4.0.ebuild 648 BLAKE2B 196ffc33dd805ec37aa7193ca0cfa344b1b5a72dac19f25814947efb884600fa1589fabe6f19d2077a8aa1a523e075ab04bf71aff9b9672c24c7e4372413ecf4 SHA512 a26f6c621bb36040626f2edae7ed5330e0bc67c7c8ef129089e335da18af743e253b40db7543f11dd38b329f703f7ff65373dc014ae9de7cec7a2c5229da63d6
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/deutex/deutex-4.4.0.ebuild b/games-util/deutex/deutex-4.4.0.ebuild
new file mode 100644
index 000000000000..9ef3310f618d
--- /dev/null
+++ b/games-util/deutex/deutex-4.4.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs eutils
+
+DESCRIPTION="A wad composer for Doom, Heretic, Hexen and Strife"
+HOMEPAGE="http://www.teaser.fr/~amajorel/deutex/"
+SRC_URI="http://www.teaser.fr/~amajorel/deutex/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+ HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-makefile.patch \
+		"${FILESDIR}"/${P}-64bit.patch \
+		"${FILESDIR}"/${P}-ovflfix.patch
+	tc-export CC
+}
+
+src_install() {
+	dobin deusf deutex
+	doman deutex.6
+	dodoc CHANGES README TODO
+}
diff --git a/games-util/deutex/files/deutex-4.4.0-64bit.patch b/games-util/deutex/files/deutex-4.4.0-64bit.patch
new file mode 100644
index 000000000000..b5028cd4ffbd
--- /dev/null
+++ b/games-util/deutex/files/deutex-4.4.0-64bit.patch
@@ -0,0 +1,13 @@
+diff --git a/src/deutex.h b/src/deutex.h
+index 0a26df5..7af321c 100644
+--- a/src/deutex.h
++++ b/src/deutex.h
+@@ -31,7 +31,7 @@ Place, Suite 330, Boston, MA 02111-1307, USA.
+ #define DeuSF   for DOS .EXE  Unix Linux OS/2
+ *********************************************/
+ 
+-#if defined (__alpha)        /*__ALPHA__ for Alpha processor?*/
++#if defined (__alpha) || defined (__x86_64__)        /*__ALPHA__ for Alpha processor?*/
+ /*long = int64 on a 64bit processor*/
+ typedef char           Int8;
+ typedef short          Int16;
diff --git a/games-util/deutex/files/deutex-4.4.0-makefile.patch b/games-util/deutex/files/deutex-4.4.0-makefile.patch
new file mode 100644
index 000000000000..49265e14f3fb
--- /dev/null
+++ b/games-util/deutex/files/deutex-4.4.0-makefile.patch
@@ -0,0 +1,29 @@
+diff -ru deutex-4.4.0.orig/Makefile deutex-4.4.0/Makefile
+--- deutex-4.4.0.orig/Makefile	1999-12-24 07:50:16.000000000 -0500
++++ deutex-4.4.0/Makefile	2010-03-05 14:53:23.763604022 -0500
+@@ -16,11 +16,6 @@
+ 
+ PREFIX=/usr/local
+ 
+-# Compiled by users
+-CFLAGS   = -O2
+-CC       = cc
+-LDFLAGS  =
+-
+ # Compiled by developers
+ DCFLAGS  = -g -Wall -Wpointer-arith -Wstrict-prototypes
+ DCC      = gcc
+@@ -182,11 +177,11 @@
+ 	(sleep 1; mkdir -p tmp; touch tmp/_deusf) &
+ 
+ tmp/_deutex:
+-	-mkdir tmp
++	@mkdir tmp 2> /dev/null || true
+ 	touch $@
+ 
+ tmp/_deusf:
+-	-mkdir tmp
++	@mkdir tmp 2> /dev/null || true
+ 	touch $@
+ 
+ install:
diff --git a/games-util/deutex/files/deutex-4.4.0-ovflfix.patch b/games-util/deutex/files/deutex-4.4.0-ovflfix.patch
new file mode 100644
index 000000000000..32a7dce0d97c
--- /dev/null
+++ b/games-util/deutex/files/deutex-4.4.0-ovflfix.patch
@@ -0,0 +1,11 @@
+--- src/sound.c.old	2010-10-27 12:32:28.000000000 +0200
++++ src/sound.c	2010-10-27 12:32:52.000000000 +0200
+@@ -309,7 +309,7 @@
+   if(fread(&headv,sizeof(struct VOCHEAD),1,fp)!=1) ProgError("VOC: can't read header");
+   if(strncmp(VocId,headv.ident,VOCIDLEN)!=0) ProgError("VOC: bad header");
+   if(fseek(fp,headv.block1,SEEK_SET)) ProgError("VOC: bad header");
+-  if(fread(&blockv,sizeof(struct VOCHEAD),1,fp)!=1) ProgError("VOC: can't read block");
++  if(fread(&blockv,sizeof(struct VOCBLOCK1),1,fp)!=1) ProgError("VOC: can't read block");
+   if(blockv.type!=1) ProgError("VOC: first block is not sound");
+   datasize= ((blockv.sizeU)<<16)&0xFF0000L;
+   datasize+=((blockv.sizeM)<<8)&0xFF00L;
diff --git a/games-util/deutex/metadata.xml b/games-util/deutex/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-util/deutex/metadata.xml
@@ -0,0 +1,8 @@
+<?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-util/dfarc-3.12-r1 b/games-util/dfarc-3.12-r1
deleted file mode 100644
index 9869c57e36b2..000000000000
--- a/games-util/dfarc-3.12-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=app-arch/bzip2 x11-misc/xdg-utils x11-libs/wxGTK:3.0[X] nls? ( >=dev-util/intltool-0.31 ) >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Frontend and .dmod installer for GNU FreeDink
-EAPI=6
-HOMEPAGE=http://www.freedink.org/
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 BZIP2
-RDEPEND=app-arch/bzip2 x11-misc/xdg-utils x11-libs/wxGTK:3.0[X]
-SLOT=0
-SRC_URI=mirror://gnu/freedink/dfarc-3.12.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f00ba941c18d951d29ec19108c34f992
diff --git a/games-util/dfarc-3.14 b/games-util/dfarc-3.14
deleted file mode 100644
index 6053523309a7..000000000000
--- a/games-util/dfarc-3.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=app-arch/bzip2 x11-misc/xdg-utils x11-libs/wxGTK:3.0[X] nls? ( >=dev-util/intltool-0.31 ) >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Frontend and .dmod installer for GNU FreeDink
-EAPI=6
-HOMEPAGE=http://www.freedink.org/
-IUSE=nls
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 BZIP2
-RDEPEND=app-arch/bzip2 x11-misc/xdg-utils x11-libs/wxGTK:3.0[X]
-SLOT=0
-SRC_URI=mirror://gnu/freedink/dfarc-3.14.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0e915a4d883f5d99cd06be204cd7f6ce
diff --git a/games-util/dfarc/Manifest b/games-util/dfarc/Manifest
new file mode 100644
index 000000000000..9c336d90b160
--- /dev/null
+++ b/games-util/dfarc/Manifest
@@ -0,0 +1,6 @@
+AUX dfarc-3.12-nowindres.patch 648 BLAKE2B 0bc6d823c7bc44ff69730473a55542d974e1695086fef27a6b235306c20978b4645e00878123cadfa10202301b52f3e6731384c9bba140c76312e6cf9ab31b9d SHA512 1ac6a7b889a271b70a2ab606dfa7475c3053aca5f72192cae2b161db9d7ef955df74e7cf94e2db4ac89bee3ada433e20a4dc8ec37f836a12e2810ab61351bdc4
+DIST dfarc-3.12.tar.gz 329925 BLAKE2B ebebfdf42fbd8bcc53696777f5fb06a54635e269dafb59c888990250343e0bca0b20d46b051e753b047f008061ef74070456d83ee72eb37018a2bc1b386d1c9f SHA512 e87e89e67e383c3d25a6620edc38c6ab6f90b9df52b84d6e6de20af1ac3b50588b3037575f2f89a14c90c14151053c08a7bb97143f24471e33326f3f2d2574ab
+DIST dfarc-3.14.tar.gz 336910 BLAKE2B 50f0ad1af2d91a562ba6a7b1e0e5e1821c900fe8ab3cf48f3585ca10ea12d9f7e3125ae85bc2e31c1539bf13d5a950e30a467b05259a7df6e2bda35544820933 SHA512 536c1cb5d1c8bf7012920e39d69fafbb790da78acb89a18f8ab1a3ad985220c74da61adda238e39395b4d7fd8fc62894fb5579691b744fe17600a8fccabc3c13
+EBUILD dfarc-3.12-r1.ebuild 878 BLAKE2B 1015af2a3ad1bd03aed5659c3cd9e09040d4d6830dffa96bd75feeafa5e64ee1c88745b042edda83f4c0f978c804856c8e025ed027c8c99b24494a29e3b04b9a SHA512 dcbeb8a65243501a72dbf861adee7ba1efd771b9d7777992286674e7d5cbfc0db50be9e689e7083760cb5cf57e1545ec410a47d33ce73a8d39126b23e7ac5a1a
+EBUILD dfarc-3.14.ebuild 884 BLAKE2B 1ad3f1122cf29b8927f49b6d95ab151faf58649344027cf94bf313dd9951c082eea85d676f2b4039b14b2d5558e39cd58cd9513eed3a693f7cac48e813825d9d SHA512 9a5b85d95ba5999e289409f17883a1b1a9c9f88a33e872fb2cb73bf40a19193db821094eaeeaa36146cf9f68b0ea69ae47c0bdc8c145cafba0960aa4706f2565
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-util/dfarc/dfarc-3.12-r1.ebuild b/games-util/dfarc/dfarc-3.12-r1.ebuild
new file mode 100644
index 000000000000..c996a7d3172d
--- /dev/null
+++ b/games-util/dfarc/dfarc-3.12-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0"
+inherit eutils gnome2-utils wxwidgets xdg
+
+DESCRIPTION="Frontend and .dmod installer for GNU FreeDink"
+HOMEPAGE="http://www.freedink.org/"
+SRC_URI="mirror://gnu/freedink/${P}.tar.gz"
+
+LICENSE="GPL-3 BZIP2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	app-arch/bzip2
+	x11-misc/xdg-utils
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+"
+DEPEND="${RDEPEND}
+	nls? ( >=dev-util/intltool-0.31 )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-nowindres.patch )
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--disable-desktopfiles
+}
+
+src_install() {
+	default
+	dodoc TRANSLATIONS.txt
+}
+
+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-util/dfarc/dfarc-3.14.ebuild b/games-util/dfarc/dfarc-3.14.ebuild
new file mode 100644
index 000000000000..96118b386c92
--- /dev/null
+++ b/games-util/dfarc/dfarc-3.14.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0"
+inherit eutils gnome2-utils wxwidgets xdg
+
+DESCRIPTION="Frontend and .dmod installer for GNU FreeDink"
+HOMEPAGE="http://www.freedink.org/"
+SRC_URI="mirror://gnu/freedink/${P}.tar.gz"
+
+LICENSE="GPL-3 BZIP2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	app-arch/bzip2
+	x11-misc/xdg-utils
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+"
+DEPEND="${RDEPEND}
+	nls? ( >=dev-util/intltool-0.31 )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.12-nowindres.patch )
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--disable-desktopfiles
+}
+
+src_install() {
+	default
+	dodoc TRANSLATIONS.txt
+}
+
+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-util/dfarc/files/dfarc-3.12-nowindres.patch b/games-util/dfarc/files/dfarc-3.12-nowindres.patch
new file mode 100644
index 000000000000..9c4a74e52592
--- /dev/null
+++ b/games-util/dfarc/files/dfarc-3.12-nowindres.patch
@@ -0,0 +1,18 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -100,7 +100,6 @@
+ 	Package.$(OBJEXT) RecursiveDelete.$(OBJEXT) Tar.$(OBJEXT) \
+ 	DFArcFrame_Base.$(OBJEXT) Options_Base.$(OBJEXT) \
+ 	Package_Base.$(OBJEXT) InstallVerifyFrame_Base.$(OBJEXT)
+-@HAVE_WINDRES_TRUE@nodist_dfarc_OBJECTS = woeres.$(OBJEXT)
+ dfarc_OBJECTS = $(am_dfarc_OBJECTS) $(nodist_dfarc_OBJECTS)
+ dfarc_LDADD = $(LDADD)
+ AM_V_P = $(am__v_P_@AM_V@)
+@@ -346,7 +345,6 @@
+ 	InstallVerifyFrame_Base.wxg dink.ico
+ 
+ # How do we handle resources embedded in the executable binary?
+-@HAVE_WINDRES_TRUE@nodist_dfarc_SOURCES = woeres.rc
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+ 
diff --git a/games-util/dfarc/metadata.xml b/games-util/dfarc/metadata.xml
new file mode 100644
index 000000000000..26079e608bed
--- /dev/null
+++ b/games-util/dfarc/metadata.xml
@@ -0,0 +1,8 @@
+<?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-util/dzip-2.9-r3 b/games-util/dzip-2.9-r3
deleted file mode 100644
index ff185ac745cb..000000000000
--- a/games-util/dzip-2.9-r3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=app-arch/unzip
-DESCRIPTION=compressor/uncompressor for demo recordings from id's Quake
-EAPI=5
-HOMEPAGE=http://speeddemosarchive.com/dzip/
-KEYWORDS=~amd64 ~x86
-LICENSE=ZLIB
-SLOT=0
-SRC_URI=http://speeddemosarchive.com/dzip/dz29src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0a4cc68b2ff6a9125024e352ed817a60
diff --git a/games-util/dzip/Manifest b/games-util/dzip/Manifest
new file mode 100644
index 000000000000..2bb02e7a6b5b
--- /dev/null
+++ b/games-util/dzip/Manifest
@@ -0,0 +1,6 @@
+AUX dzip-2.9-scrub-names.patch 1816 BLAKE2B e56b4086e70ff682e8163dc8f6c7620882f7b4ee9245111da93faca8a5cee1fb0aa9422dc03451ff1c147664adc6dec34da0a1a99ec31c4f56179b37fcd6ea10 SHA512 94fceecee4538bb0d0aac460d864ebb4bbbb3ad3aa6be7593115bc850e19b1630bceb2df9268e569a30457e8b2483b3678199629b78d192dcdf3bee0b00178c8
+AUX dzip-2.9-system-zlib-r2.patch 1844 BLAKE2B ebaa30eb9100cd616c4986240d6ba2c360a2cbd17d16aa67172bbae41da1be92aeb77ec3af942a8f0c86029c29ad92900ba991020388a43eab050ca28d799a5f SHA512 04e95334b03b1590bfd73cd5905186a8ba28a36655b9c829dcd913842c0f2c2802133d453134080f3a4664ec106e7693482b43981c5849ecc1a781a7f37b0625
+AUX dzip-amd64.diff 643 BLAKE2B 6752ccdab94f080cc0905bceabfe4d49fdd007c366fb10f833e5d85935ce1f206c5ba39be7f7414ed1dd0f01f16995ed17e36c341e8accc4530ff75a5c88f43f SHA512 30a381f95807cc61b8c393f3e5fb5c1f250e4578b1601f5ee8944c7b94a3d3f983478075cee3c76858b5d0df768b6bd3e91578e6679f443fb8d6f7fa30b48f18
+DIST dz29src.zip 100354 BLAKE2B 1b0ab969daa030c135dab049f9950079f0337ca64636765298316e699614dfe3c139b0b88321c29278aadbe6b93ca75f2d656e82ae2dbf54b98f19d9fd3053d9 SHA512 3e1071da6ae5c9064b7222f1bb553b787ded4acbfe8463a7a94f17e60748b68cdfc17672ef7220deddd394c6709efe632e53e61508fd48bfa9001e43a37e788f
+EBUILD dzip-2.9-r3.ebuild 648 BLAKE2B 98bb809f8fc9e6232aa3ae0ff43af43c2661e0d523db63bc7f42f36af5059817362dc8a188833b262fbe9f08547c2830969dbd495658adf7ff381b559bd90fca SHA512 44cc75228481fabec5366375bb2418624fc26784df93894e42f1a28195109ab2a112b70cc3fcd29578c22ab2065f247425117a49d80839319411d079d8f8596c
+MISC metadata.xml 326 BLAKE2B 24ee80a289a9dc670ba0592e623568a083bff065c740db1dfeb877329aa2f12b59eb20491f488f6311afd3e8df849c123013503fdf2ef739ee9c357f965e5797 SHA512 a1550e2953010f4593e3c7cbe54783f4e0a5859f58e756b6cde50c0d404ca10f8eb0f43df223c6f7df454429d90f496a99aee08f68c8830a1aa396e1febcbe7c
diff --git a/games-util/dzip/dzip-2.9-r3.ebuild b/games-util/dzip/dzip-2.9-r3.ebuild
new file mode 100644
index 000000000000..a58b74eb99b2
--- /dev/null
+++ b/games-util/dzip/dzip-2.9-r3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="compressor/uncompressor for demo recordings from id's Quake"
+HOMEPAGE="http://speeddemosarchive.com/dzip/"
+SRC_URI="http://speeddemosarchive.com/dzip/dz${PV/./}src.zip"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S="${WORKDIR}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-system-zlib-r2.patch
+	epatch "${FILESDIR}"/${P}-scrub-names.patch #93079
+	epatch "${FILESDIR}/dzip-amd64.diff"
+	mv -f Makefile{.linux,}
+}
+
+src_install () {
+	dobin dzip
+	dodoc Readme
+}
diff --git a/games-util/dzip/files/dzip-2.9-scrub-names.patch b/games-util/dzip/files/dzip-2.9-scrub-names.patch
new file mode 100644
index 000000000000..079fae3fd070
--- /dev/null
+++ b/games-util/dzip/files/dzip-2.9-scrub-names.patch
@@ -0,0 +1,88 @@
+Fix directory traversals issues.
+
+Since .dz files normally just have relative directory trees:
+pak/
+pak/file
+pak/subdir/file
+
+we strip out all the components which ascend in the directory tree
+
+http://bugs.gentoo.org/93079
+
+--- main.c
++++ main.c
+@@ -77,6 +77,48 @@ int dzRead (int inlen)
+ 	return 1;
+ }
+ 
++#define IS_SEP(c) (c == '/' || c == ':' || c == '\\')
++void scrub_name(char *smee)
++{
++	char *paths[] = { "../", "..\\", "..:", NULL};
++	size_t p, i, len;
++	char scrubit, scrubbed;
++
++	scrubbed = 0;
++	len = strlen(smee);
++	i = 0;
++	scrubit = 1;
++
++	/* search the path and scrub out all relative paths */
++	while (i + 3 < len) {
++		for (p = 0; paths[p]; ++p) {
++			if (scrubit && !strncmp(paths[p], smee+i, 3)) {
++				scrubbed = 1;
++				memset(smee+i, '\0', 3);
++				i += 2;
++				break;
++			}
++		}
++		scrubit = IS_SEP(smee[i]) || smee[i] == '\0';
++		++i;
++	}
++
++	if (!scrubbed)
++		return;
++
++	/* condense the string over all the scrubbed bits */
++	p = 0;
++	for (i = 0; i < len; ++i) {
++		while (p < len && smee[p] == '\0')
++			++p;
++		if (p == len) {
++			smee[i] = '\0';
++			break;
++		}
++		smee[i] = smee[p++];
++	}
++}
++
+ int dzReadDirectoryEntry (direntry_t *de)
+ {
+ 	char *s;
+@@ -102,6 +144,7 @@ int dzReadDirectoryEntry (direntry_t *de
+ 	s = Dzip_malloc(de->len);
+ 	dzFile_Read(s, de->len);
+ 	de->name = s;
++	scrub_name(de->name);
+ 	if (de->pak && de->type != TYPE_PAK)
+ 		return 1;	/* dont mess with dirchar inside pakfiles */
+ 	do
+--- v1code.c
++++ v1code.c
+@@ -201,6 +201,7 @@ void demv1_dxentities(void)
+ 
+ }
+ 
++extern void scrub_name(char *smee);
+ void dzUncompressV1 (int testing)
+ {
+ 	int i, inlen = 0;
+@@ -221,6 +222,7 @@ void dzUncompressV1 (int testing)
+ 	{
+ 		de = directory + i;
+ 		crcval = INITCRC;
++		scrub_name(de->name);
+ 		printf("%s %s",action,de->name);
+ 		fflush(stdout);
+ 
diff --git a/games-util/dzip/files/dzip-2.9-system-zlib-r2.patch b/games-util/dzip/files/dzip-2.9-system-zlib-r2.patch
new file mode 100644
index 000000000000..4bf10f8b98f6
--- /dev/null
+++ b/games-util/dzip/files/dzip-2.9-system-zlib-r2.patch
@@ -0,0 +1,72 @@
+--- dzip.h
++++ dzip.h
+@@ -2,7 +2,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-#include "zlib/zlib.h"
++#include <zlib.h>
+ 
+ typedef unsigned char uchar;
+ 
+@@ -177,4 +177,4 @@
+ #else
+ #define DIRCHAR '/'
+ #define WRONGCHAR '\\'
+-#endif
+\ No newline at end of file
++#endif
+--- Makefile.linux
++++ Makefile.linux
+@@ -1,18 +1,17 @@
+ # Makefile for linux
+ 
+-CC = gcc
+-CFLAGS = -Wall -O3
++CC ?= gcc
++CFLAGS ?= -O3
++CFLAGS += -Wall
+ TARGET = dzip
+ OBJECTS = main.o compress.o uncompress.o list.o crc32.o \
+-	  encode.o decode.o v1code.o conmain.o delete.o \
+-	  zlib/adler32.o zlib/deflate.o zlib/trees.o \
+-	  zlib/inflate.o zlib/infblock.o zlib/inftrees.o zlib/infcodes.o \
+-	  zlib/infutil.o zlib/inffast.o
++	  encode.o decode.o v1code.o conmain.o delete.o
++LIBS = -lz
+ 
+ TMPFILES = gmon.out frag*
+ 
+ $(TARGET): $(OBJECTS)
+-	$(CC) $(CFLAGS) $(OBJECTS) -o $(TARGET) $(LDFLAGS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS)
+ 
+ clean:
+ 	rm -f $(TARGET) $(OBJECTS) $(TMPFILES)
+@@ -24,4 +23,4 @@
+ encode.o: encode.c dzip.h
+ list.o: list.c dzip.h dzipcon.h
+ decode.o: decode.c dzip.h dzipcon.h
+-v1code.o: v1code.c dzip.h dzipcon.h
+\ No newline at end of file
++v1code.o: v1code.c dzip.h dzipcon.h
+--- conmain.c.orig	2010-01-17 15:10:20.938605770 +0000
++++ conmain.c	2010-01-17 15:10:34.180603846 +0000
+@@ -507,8 +507,8 @@
+ 		if (!strcmp(argv[i],"-o")) i++;
+ 	}
+ 
+-	zs.zalloc = Dzip_calloc;
+-	zs.zfree = free;
++	zs.zalloc = Z_NULL; // Dzip_calloc; <- wrong number of arguments, reverting to default
++	zs.zfree = Z_NULL;  // free; 	    <- wrong number of arguments, reverting to default
+ 
+ 	if (flag[SW_LIST] || flag[SW_EXTRACT] || flag[SW_VERIFY])
+ 	{
+@@ -618,4 +618,4 @@
+ 		dzDeleteFiles_MakeList(files + 1, fileargs - 1);
+ 	free(files);
+ 	exit(0);
+-}
+\ No newline at end of file
++}
diff --git a/games-util/dzip/files/dzip-amd64.diff b/games-util/dzip/files/dzip-amd64.diff
new file mode 100644
index 000000000000..ef49ff330570
--- /dev/null
+++ b/games-util/dzip/files/dzip-amd64.diff
@@ -0,0 +1,30 @@
+--- dzip/crc32.c	2002-07-12 06:07:54.000000000 +0200
++++ dz/crc32.c	2010-01-20 23:23:43.000000000 +0100
+@@ -1,10 +1,12 @@
++#include <stdint.h>
++
+ unsigned long crcval;
+ unsigned long crctable[256];
+ 
+-unsigned long crc_reflect(unsigned long x, int bits)
+-{
+-	int i;
+-	unsigned long v = 0, b = 1 << (bits - 1);
++unsigned long crc_reflect(uint32_t x, int bits)
++{
++	uint32_t i;
++	uint32_t v = 0, b = 1 << (bits - 1);
+ 
+ 	for (i = 0; i < bits; i++)
+ 	{
+@@ -16,8 +18,8 @@
+ 
+ void crc_init(void)
+ {
+-	unsigned long crcpol = 0x04c11db7;
+-	unsigned long i, j, k;
++	uint32_t crcpol = 0x04c11db7;
++	uint32_t i, j, k;
+ 
+ 	for (i = 0; i < 256; i++)
+ 	{
diff --git a/games-util/dzip/metadata.xml b/games-util/dzip/metadata.xml
new file mode 100644
index 000000000000..d3c0508f60cd
--- /dev/null
+++ b/games-util/dzip/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>hanno@gentoo.org</email>
+</maintainer>
+<maintainer type="project">
+  <email>games@gentoo.org</email>
+  <name>Gentoo Games Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/games-util/etswitch-0.1.14-r1 b/games-util/etswitch-0.1.14-r1
deleted file mode 100644
index e0e8dcf86a66..000000000000
--- a/games-util/etswitch-0.1.14-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=x11-libs/libX11 x11-libs/libXxf86vm x11-libs/libXmu x11-libs/libXpm x11-libs/libXt x11-base/xorg-proto
-DESCRIPTION=*nix minimizer for a few games
-EAPI=6
-HOMEPAGE=http://hem.bredband.net/b400150/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXxf86vm x11-libs/libXmu x11-libs/libXpm
-SLOT=0
-SRC_URI=http://hem.bredband.net/b400150/etswitch/etswitch-0.1.14.tar.gz
-_md5_=4407ff455dbc7a77b085ffc520162f93
diff --git a/games-util/etswitch/Manifest b/games-util/etswitch/Manifest
new file mode 100644
index 000000000000..57fb6c90efd9
--- /dev/null
+++ b/games-util/etswitch/Manifest
@@ -0,0 +1,5 @@
+AUX etswitch-0.1.14-desktop-entry.patch 464 BLAKE2B 5058044958c26fdb6c062f3ea6d2a9d2d8a42421de016ab7c4d7263b638fb323d02771cd789bd57d35897b4a08a9e03031e0b6602edf241068d0574be72f2aa3 SHA512 aa21d15ce672f51903e8cd86df3d8794231037d8eb8cb97a8313dc6f3c7212b7bb89d8f78ecc249a589ad03b38ef41f5d346f41dc9f929d130eb83794b19b9ec
+AUX etswitch-0.1.14-glibc.patch 628 BLAKE2B e6a7228a90417cda917cd4218496643e6bb2fa6b41886b48cdbb17758591d6a5742f6f427ccb6dd75d78403d1d394bb5324fd63848260e35808ba5d232a4e2b9 SHA512 27249584033beb4cf81b37e387a814a7b213d4108f530bc21494196916fe395c15767e384c62257dd3abb1d04eb104c0863b7e2d80cfae4927912a836b181019
+DIST etswitch-0.1.14.tar.gz 165811 BLAKE2B 3d52b9dbddec9ddba914cf8e3ecb5013b2b7eac0b9a655d1be60c01cb77639d8ca2906140fc3ecd097005aaef5b11bf4ddd2ac88a5d2e0ba26aac9f2f1593248 SHA512 15447e728b8c6783e663bb76dd64a03b57ecfea6845991f4deca73ee5c5b8c2f87e92d842a46948e48468898eb036f17cbaf365887ea30c1b724db9133f9620c
+EBUILD etswitch-0.1.14-r1.ebuild 597 BLAKE2B ee3a7e7c2a51053cfd6abe75882253fa70ace235137ed9a2f756c6103cfc5e102451034fb5a6dcdd58c3d2084598b2be2fe49e1c8e5b01464968ca122c3a4210 SHA512 cd53988bc5ec85ff2882f458f6a349bad34712c6adf2be2a9cbe14c010270f889eacc22dca19f6adf82880092742334e2660ce7deecea829d108e7748035db52
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-util/etswitch/etswitch-0.1.14-r1.ebuild b/games-util/etswitch/etswitch-0.1.14-r1.ebuild
new file mode 100644
index 000000000000..da46e7ba4978
--- /dev/null
+++ b/games-util/etswitch/etswitch-0.1.14-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="*nix minimizer for a few games"
+HOMEPAGE="http://hem.bredband.net/b400150/"
+SRC_URI="http://hem.bredband.net/b400150/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXxf86vm
+	x11-libs/libXmu
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-libs/libXt
+	x11-base/xorg-proto"
+
+PATCHES=(
+		"${FILESDIR}"/${P}-desktop-entry.patch
+		"${FILESDIR}"/${P}-glibc.patch
+)
+
+src_configure() {
+	econf --datadir=/usr/share
+}
diff --git a/games-util/etswitch/files/etswitch-0.1.14-desktop-entry.patch b/games-util/etswitch/files/etswitch-0.1.14-desktop-entry.patch
new file mode 100644
index 000000000000..f3e6b5dcd805
--- /dev/null
+++ b/games-util/etswitch/files/etswitch-0.1.14-desktop-entry.patch
@@ -0,0 +1,20 @@
+--- a/etswitch.desktop.in	2008-02-02 10:54:51.000000000 -0500
++++ b/etswitch.desktop.in	2008-02-02 11:17:40.000000000 -0500
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Version=1.0
+ 
+ Name=ETSwitch
+@@ -15,9 +14,9 @@
+ Comment[fi_FI]=ETSwitch versio @VERSION@
+ 
+ Exec=etswitch --no-delay
+-Icon=etswitch.png
++Icon=etswitch
+ Terminal=false
+ Type=Application
+-Categories=Application;Game;Tool
++Categories=Game;Utility;
+ StartupNotify=true
+ StartupWMClass=ETSwitch
diff --git a/games-util/etswitch/files/etswitch-0.1.14-glibc.patch b/games-util/etswitch/files/etswitch-0.1.14-glibc.patch
new file mode 100644
index 000000000000..a51862d6722d
--- /dev/null
+++ b/games-util/etswitch/files/etswitch-0.1.14-glibc.patch
@@ -0,0 +1,12 @@
+diff -dupr etswitch-old/src/etswitch.c etswitch-0.1.14/src/etswitch.c
+--- etswitch-old/src/etswitch.c	2009-02-24 11:20:29.594339029 +0100
++++ etswitch-0.1.14/src/etswitch.c	2009-02-24 11:28:12.100463404 +0100
+@@ -461,7 +461,7 @@ int main(int argc, char *argv[]){
+     /* setup lock, fixme */
+     /* use temp var */
+     lock_file = "/tmp/.etswitch.pid";    /* now this isnt failsafe but at least something */
+-    lock_fd = open(lock_file, O_CREAT | O_RDWR);
++    lock_fd = open(lock_file, O_CREAT | O_RDWR, 0600);
+     if (lock_fd < 0) {
+ 	#ifdef DEBUG
+ 	fprintf(stdout, "'%s' allready exits, will try to open.\n",lock_file);
diff --git a/games-util/etswitch/metadata.xml b/games-util/etswitch/metadata.xml
new file mode 100644
index 000000000000..26079e608bed
--- /dev/null
+++ b/games-util/etswitch/metadata.xml
@@ -0,0 +1,8 @@
+<?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-util/fteqcc-2501 b/games-util/fteqcc-2501
deleted file mode 100644
index 1b835504e38d..000000000000
--- a/games-util/fteqcc-2501
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=app-arch/unzip
-DESCRIPTION=QC compiler
-EAPI=5
-HOMEPAGE=http://fteqw.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/fteqw/qclibsrc2501.zip
-_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_=e40540f454381fbaa0779714847cb542
diff --git a/games-util/fteqcc/Manifest b/games-util/fteqcc/Manifest
new file mode 100644
index 000000000000..f615138f3b66
--- /dev/null
+++ b/games-util/fteqcc/Manifest
@@ -0,0 +1,4 @@
+AUX fteqcc-2501-cleanup-source.patch 2655 BLAKE2B 3c0af9e2663e9f18aee250f79b1315744fe8aaf818d3b7aaa590a6dbe2eaf62d44280507d5a4a4796b6ede78ed76c89f4153998cca4a0cca2f3b4553763f1db1 SHA512 978f3fc8238383ba63be4095fb7ebe30b0a6a0220b2d0f28033ab61ed23251de3757414fecdda2d987996094e3953797d0d89f3b4cc812c4ce7e15335f06035c
+DIST qclibsrc2501.zip 204047 BLAKE2B 3e9b6aeeaadf44adf8ea32c7f1f627082cc5e98f6ea84f339d44a6e34adda5dbf01add1fb2957866323ab93b8f07393bb79d94cf0d5819cc8b48376d68fefc0d SHA512 60740e55c470dcb8deb235b49b5e8bd56f3c932fd9290808224b4d0ff2d6d8eb95302fdd1c972f36c992ac046fdbbc6a34c6de2fc67e1e7de54f23fd10de89d7
+EBUILD fteqcc-2501.ebuild 770 BLAKE2B b88373414e91d51c179faa8bc2b872ededd31446d12d1028bf0e598478207635c8a87324330df9ad6483e218bf85f074d42d129eaf346ef2ad18b5d939752bb9 SHA512 3528807c8d81e5243f16ee5c605e4c780b3a1e1fdcba05d9c29e8a64e3dcfa8da613beb162855433be1a786e7d64b84bd7586acdf25cf49050cda904972ca888
+MISC metadata.xml 328 BLAKE2B 3cf3ef53d251c16dbdf4dac64df6b6f61d39259def9e37191d28449b1eb733c89f1496a69eca590c536541e3763b5870880eec8f4b27e0a370d430c75dda9712 SHA512 9a114bb9f7d3e6d5995830c71662bc58b78bee8a1d104399b9f7a53efaf3410a6da94486e8a5a9a2b25677eb79327b1fad4b135c8ed63429e21fee500853a78f
diff --git a/games-util/fteqcc/files/fteqcc-2501-cleanup-source.patch b/games-util/fteqcc/files/fteqcc-2501-cleanup-source.patch
new file mode 100644
index 000000000000..35f3dcf100ae
--- /dev/null
+++ b/games-util/fteqcc/files/fteqcc-2501-cleanup-source.patch
@@ -0,0 +1,93 @@
+--- qcc_pr_comp.c
++++ qcc_pr_comp.c
+@@ -7322,7 +7322,7 @@
+ 	QCC_def_t		*def, *d;
+ 	QCC_function_t	*f;
+ 	QCC_dfunction_t	*df;
+-	int			i;
++	int			i = 0;
+ 	pbool shared=false;
+ 	pbool externfnc=false;
+ 	pbool isconstant = false;
+@@ -8541,8 +8545,6 @@
+ 	struct qcc_includechunk_s *oldcurrentchunk;
+ 	extern struct qcc_includechunk_s *currentchunk;
+ 
+-	extern char qccmsourcedir[];
+-
+ 	ocompilingfile = compilingfile;
+ 	os_file = s_file;
+ 	os_file2 = s_file2;
+--- hash.h
++++ hash.h
+@@ -19,12 +19,12 @@
+ int Hash_Key(char *name, int modulus);
+ void *Hash_Get(hashtable_t *table, char *name);
+ void *Hash_GetInsensative(hashtable_t *table, char *name);
+-void *Hash_GetKey(hashtable_t *table, int key);
++void *Hash_GetKey(hashtable_t *table, long key);
+ void *Hash_GetNext(hashtable_t *table, char *name, void *old);
+ void *Hash_GetNextInsensative(hashtable_t *table, char *name, void *old);
+ void *Hash_Add(hashtable_t *table, char *name, void *data, bucket_t *buck);
+ void *Hash_AddInsensative(hashtable_t *table, char *name, void *data, bucket_t *buck);
+ void Hash_Remove(hashtable_t *table, char *name);
+ void Hash_RemoveData(hashtable_t *table, char *name, void *data);
+-void Hash_RemoveKey(hashtable_t *table, int key);
+-void *Hash_AddKey(hashtable_t *table, int key, void *data, bucket_t *buck);
++void Hash_RemoveKey(hashtable_t *table, long key);
++void *Hash_AddKey(hashtable_t *table, long key, void *data, bucket_t *buck);
+--- hash.c
++++ hash.c
+@@ -68,7 +68,7 @@
+ 	}
+ 	return NULL;
+ }
+-void *Hash_GetKey(hashtable_t *table, int key)
++void *Hash_GetKey(hashtable_t *table, long key)
+ {
+ 	int bucknum = key%table->numbuckets;
+ 	bucket_t *buck;
+@@ -77,7 +77,7 @@
+ 
+ 	while(buck)
+ 	{
+-		if ((int)buck->keystring == key)
++		if ((long)buck->keystring == key)
+ 			return buck->data;
+ 
+ 		buck = buck->next;
+@@ -168,7 +168,7 @@
+ 
+ 	return buck;
+ }
+-void *Hash_AddKey(hashtable_t *table, int key, void *data, bucket_t *buck)
++void *Hash_AddKey(hashtable_t *table, long key, void *data, bucket_t *buck)
+ {
+ 	int bucknum = key%table->numbuckets;
+ 
+@@ -237,14 +237,14 @@
+ }
+ 
+ 
+-void Hash_RemoveKey(hashtable_t *table, int key)
++void Hash_RemoveKey(hashtable_t *table, long key)
+ {
+ 	int bucknum = key%table->numbuckets;
+ 	bucket_t *buck;	
+ 
+ 	buck = table->bucket[bucknum];
+ 
+-	if ((int)buck->keystring == key)
++	if ((long)buck->keystring == key)
+ 	{
+ 		table->bucket[bucknum] = buck->next;
+ 		return;
+@@ -253,7 +253,7 @@
+ 
+ 	while(buck->next)
+ 	{
+-		if ((int)buck->next->keystring == key)
++		if ((long)buck->next->keystring == key)
+ 		{
+ 			buck->next = buck->next->next;
+ 			return;
diff --git a/games-util/fteqcc/fteqcc-2501.ebuild b/games-util/fteqcc/fteqcc-2501.ebuild
new file mode 100644
index 000000000000..c03aa1ac4ee1
--- /dev/null
+++ b/games-util/fteqcc/fteqcc-2501.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic
+
+DESCRIPTION="QC compiler"
+HOMEPAGE="http://fteqw.sourceforge.net/"
+SRC_URI="mirror://sourceforge/fteqw/qclibsrc${PV}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="test"
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S=${WORKDIR}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cleanup-source.patch
+	sed -i \
+		-e '/^CC/d' \
+		-e "s: -O3 : :g" \
+		-e "s: -s : :g" \
+		-e 's/-o fteqcc.bin/$(LDFLAGS) -o fteqcc.bin/' \
+		Makefile || die "sed failed"
+	edos2unix readme.txt
+	append-flags -DQCCONLY
+}
+
+src_compile() {
+	emake BASE_CFLAGS="${CFLAGS} -Wall"
+}
+
+src_install() {
+	newbin fteqcc.bin fteqcc
+	dodoc readme.txt
+}
diff --git a/games-util/fteqcc/metadata.xml b/games-util/fteqcc/metadata.xml
new file mode 100644
index 000000000000..c93ba6816bc6
--- /dev/null
+++ b/games-util/fteqcc/metadata.xml
@@ -0,0 +1,11 @@
+<?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">fteqw</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-util/gamepick-0.35-r1 b/games-util/gamepick-0.35-r1
deleted file mode 100644
index 92582be9f064..000000000000
--- a/games-util/gamepick-0.35-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=x11-libs/gtk+:2 virtual/pkgconfig
-DESCRIPTION=Launch opengl games with custom graphic settings
-EAPI=6
-HOMEPAGE=http://www.rillion.net/gamepick/index.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2
-SLOT=0
-SRC_URI=http://www.rillion.net/gamepick/gamepick-0.35.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_=7ab54c67ad2792b73bc8e2b36a257e2b
diff --git a/games-util/gamepick/Manifest b/games-util/gamepick/Manifest
new file mode 100644
index 000000000000..a81ef0e6ac64
--- /dev/null
+++ b/games-util/gamepick/Manifest
@@ -0,0 +1,3 @@
+DIST gamepick-0.35.tar.gz 156725 BLAKE2B e761fead9528397d0819ff00ca0153d63ee7fcc7ecf2d8bd39c3f63e937d13a72be23758a53e415d8020466c3500abc64ae10c09384682f4e8bd2dea3305fdda SHA512 bd77d6584cb9bb5c358179226d20a1995badd7603332bde6692ecca6c30f26fe06e6ea202e04bd40c006e9f43ae8fcd885a09bcb696227be3da823dd68d5053c
+EBUILD gamepick-0.35-r1.ebuild 597 BLAKE2B 2a4fb4541ef66c31c44412b17750f198bd6b844b1cab9610d3ced2af2c943d519d534f103b9763dbca74d83466ed57a5cb4b55507db273033bbcdbc59a49f2ca SHA512 fd48d4116fe444201f7065406063b31f37399f121f60971f7e9c48a49e752d4222c4e7b6ea5483e5b0713de54514d5fb0b4671f1503a50a9dff74c2f34877dcb
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/gamepick/gamepick-0.35-r1.ebuild b/games-util/gamepick/gamepick-0.35-r1.ebuild
new file mode 100644
index 000000000000..0929757f8c47
--- /dev/null
+++ b/games-util/gamepick/gamepick-0.35-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="Launch opengl games with custom graphic settings"
+HOMEPAGE="http://www.rillion.net/gamepick/index.html"
+SRC_URI="http://www.rillion.net/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	sed -i \
+		-e 's/-O2//' \
+		src/Makefile.in || die
+}
+
+src_install() {
+	default
+	newicon ${PN}-48x48.xpm ${PN}.xpm
+	make_desktop_entry ${PN} ${PN}
+}
diff --git a/games-util/gamepick/metadata.xml b/games-util/gamepick/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-util/gamepick/metadata.xml
@@ -0,0 +1,8 @@
+<?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-util/glbsp-2.24 b/games-util/glbsp-2.24
deleted file mode 100644
index 66eb76b14880..000000000000
--- a/games-util/glbsp-2.24
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=fltk? ( x11-libs/fltk:1 )
-DESCRIPTION=A node builder specially designed for OpenGL ports of the DOOM game engine
-EAPI=5
-HOMEPAGE=http://glbsp.sourceforge.net/
-IUSE=fltk
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=fltk? ( x11-libs/fltk:1 )
-SLOT=0
-SRC_URI=mirror://sourceforge/glbsp/glbsp_src_224.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=92bfa50894aab7a85691a96b7daf8437
diff --git a/games-util/glbsp/Manifest b/games-util/glbsp/Manifest
new file mode 100644
index 000000000000..35756228aea6
--- /dev/null
+++ b/games-util/glbsp/Manifest
@@ -0,0 +1,4 @@
+AUX glbsp-2.24-ldflags.patch 737 BLAKE2B 8450c3fc7d83aa5444802de8e415f1776c82422ced5a4c2320f39ee7989ce601a6fc0b97cc1a94e548d7b8a6bd40d5e53644c0725a694ddea2c0e782515a8b6c SHA512 78425825ea6049299afae48c2de89e9fa3e8f4994f176b7a42785eb3fcff625c69a2b3230f5aa624987fa4290f83eb9cf298d397b74171a2b0d94b70ab446d4f
+DIST glbsp_src_224.tar.gz 230977 BLAKE2B a8fce559e2d37e0662dd773f94d781a63bbce66d7fca87b785b7ba095670844fe441093d721eba95eb679457d6217327e93002e54848ed919cf34e552e152030 SHA512 562201093b69ae1db113479f8dd71e474d2d4ea7798b5e156dc096660e0b725a16ba44e8d2bfd332eba89b66d07ac2a1ddd803e75802c8fb3739a420701b2e1a
+EBUILD glbsp-2.24.ebuild 1524 BLAKE2B d34b5efb35b791b9409014c4e92f5c6e7f7873759e38a5084bd8444ad7e391da50a0b4d9769b2e04fbb181273035a3a688fe13d19963f4ecec5e67a5522df637 SHA512 753f32d0be4271e40d992dade06d5a61cabace99334568ebcf4776248b03804fe98cdd9b6fb4235559c51e48b62e9ef64a3102964573c9c6ef3bcf40689506fc
+MISC metadata.xml 328 BLAKE2B 642bdaa12af0d72ec65674304abdf376413e4721907ff967369be6234f46fc053792bee05d921d14e86d7432f8f355c8329ace8dab8464bdd8332c0e93c4f624 SHA512 ec7fab9de36fc312330b2e8251da6909a7d6ec1350145a7ef9681085993173f8ff8da796d4c868605c4391c7ad8ea4a11fb40e00b4fde754711dd060e0486347
diff --git a/games-util/glbsp/files/glbsp-2.24-ldflags.patch b/games-util/glbsp/files/glbsp-2.24-ldflags.patch
new file mode 100644
index 000000000000..e6adb0ff035c
--- /dev/null
+++ b/games-util/glbsp/files/glbsp-2.24-ldflags.patch
@@ -0,0 +1,22 @@
+--- Makefile.unx.old	2010-11-25 11:24:48.000000000 +0100
++++ Makefile.unx	2010-11-25 11:25:10.000000000 +0100
+@@ -79,8 +79,7 @@
+ 	$(CC) $(CMD_FLAGS) -c $^ -o $@
+ 
+ $(CMD_NAME): $(LIB_NAME) $(CMD_OBJS)
+-	$(CC) $(CMD_FLAGS) $(CMD_OBJS) -o $@ $(LIB_NAME) $(CMD_LIBS)
+-	$(STRIP) $@
++	$(CC) $(CMD_FLAGS) $(LDFLAGS) $(CMD_OBJS) -o $@ $(LIB_NAME) $(CMD_LIBS)
+ 
+ install: $(CMD_NAME)
+ 	cp $(CMD_NAME) $(INSTALL_PREFIX)/bin/
+--- Makefile.unx.old	2010-11-25 11:31:27.000000000 +0100
++++ Makefile.unx	2010-11-25 11:31:31.000000000 +0100
+@@ -125,7 +125,6 @@
+ 
+ $(GUI_NAME): $(LIB_NAME) $(GUI_OBJS)
+ 	$(CXX) $(GUI_FLAGS) $(GUI_OBJS) -o $@ $(LIB_NAME) $(GUI_LIBS)
+-	$(STRIP) $@
+ 
+ 
+ # ----- DOCUMENTATION ---------------------------------------------
diff --git a/games-util/glbsp/glbsp-2.24.ebuild b/games-util/glbsp/glbsp-2.24.ebuild
new file mode 100644
index 000000000000..e6c982167ae0
--- /dev/null
+++ b/games-util/glbsp/glbsp-2.24.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs versionator
+
+MY_PV=$(delete_version_separator 1)
+DESCRIPTION="A node builder specially designed for OpenGL ports of the DOOM game engine"
+HOMEPAGE="http://glbsp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/glbsp/${PN}_src_${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="fltk"
+
+DEPEND="fltk? ( x11-libs/fltk:1 )"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${P}-source
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+	sed -i \
+		-e "/^CC=/s:=.*:=$(tc-getCC):" \
+		-e "/^CXX=/s:=.*:=$(tc-getCXX):" \
+		-e "/^AR=/s:ar:$(tc-getAR):" \
+		-e "/^RANLIB=/s:=.*:=$(tc-getRANLIB):" \
+		-e "s:-O2:${CFLAGS}:" \
+		-e "s:-O -g3:${CFLAGS}:" \
+		Makefile.unx \
+		nodeview/Makefile.unx || die
+}
+
+src_compile() {
+	emake -f Makefile.unx
+	if use fltk ; then
+		emake -f Makefile.unx glBSPX \
+			FLTK_FLAGS="$(fltk-config --cflags)" \
+			FLTK_LIBS="$(fltk-config --use-images --ldflags)"
+		emake -f Makefile.unx -C nodeview \
+			FLTK_CFLAGS="$(fltk-config --cflags)" \
+			FLTK_LIBS="$(fltk-config --use-images --ldflags)"
+	fi
+}
+
+src_install() {
+	dobin glbsp
+	dolib.a libglbsp.a
+	doman glbsp.1
+	dodoc AUTHORS.txt glbsp.txt
+	insinto "/usr/include"
+	doins "src/glbsp.h"
+
+	if use fltk ; then
+		newbin glBSPX glbspx
+		newicon gui/icon.xpm glbspx.xpm
+		make_desktop_entry glbspx glBSPX glbspx
+
+		dobin nodeview/nodeview
+		docinto nodeview
+		dodoc nodeview/{README,TODO}.txt
+	fi
+}
diff --git a/games-util/glbsp/metadata.xml b/games-util/glbsp/metadata.xml
new file mode 100644
index 000000000000..e71bd1594768
--- /dev/null
+++ b/games-util/glbsp/metadata.xml
@@ -0,0 +1,11 @@
+<?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">glbsp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-util/grfcodec-6.0.6 b/games-util/grfcodec-6.0.6
deleted file mode 100644
index baa2a3724026..000000000000
--- a/games-util/grfcodec-6.0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=media-libs/libpng:0 !games-util/nforenum dev-lang/perl dev-libs/boost
-DESCRIPTION=A suite of programs to modify openttd/Transport Tycoon Deluxe's GRF files
-EAPI=6
-HOMEPAGE=https://dev.openttdcoop.org/projects/grfcodec
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=media-libs/libpng:0
-SLOT=0
-SRC_URI=https://binaries.openttd.org/extra/grfcodec/6.0.6/grfcodec-6.0.6-source.tar.xz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=2f3a975db6563d28fbad9631a2622634
diff --git a/games-util/grfcodec/Manifest b/games-util/grfcodec/Manifest
new file mode 100644
index 000000000000..76ae1902c91f
--- /dev/null
+++ b/games-util/grfcodec/Manifest
@@ -0,0 +1,3 @@
+DIST grfcodec-6.0.6-source.tar.xz 166820 BLAKE2B ba81e31477fb15bb5273add4d993ee7de88cfd47fd8300743e97c4abd19b0daf736d78b5bafc82569ff110757131501c07d7365a4e7ffde8d3a7fcc2e277bada SHA512 543123c794bfdb5b6556f7a897bcd2f3bdd09be8ad6a4ff07b138e0cac62621a4801c732bb20099c1bb383ad5822fc4ade276d49acf2744c811edd10d7699480
+EBUILD grfcodec-6.0.6.ebuild 1066 BLAKE2B ca41f8822b55fba5dac610e2bb9efcd786b5ee9bda3084407953cbade5c450f383337ef11c354e44a4ebd7c42ef60ab55a614c94f204602c17c7d6bb7dcaaa08 SHA512 6ac4994f25b2cfe551e56d9d9d828797928ae3a205e440a743213a468cd697d15d7442af0313744a296fa6d1a4b37baf295f696b9434a4fa5dc8c9757c847921
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/grfcodec/grfcodec-6.0.6.ebuild b/games-util/grfcodec/grfcodec-6.0.6.ebuild
new file mode 100644
index 000000000000..ebfb9b894f6b
--- /dev/null
+++ b/games-util/grfcodec/grfcodec-6.0.6.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [ "${PV%9999}" != "${PV}" ] ; then
+	SCM=mercurial
+	EHG_REPO_URI="http://hg.openttdcoop.org/${PN}"
+fi
+
+inherit toolchain-funcs ${SCM}
+
+DESCRIPTION="A suite of programs to modify openttd/Transport Tycoon Deluxe's GRF files"
+HOMEPAGE="https://dev.openttdcoop.org/projects/grfcodec"
+[[ -z ${SCM} ]] && SRC_URI="https://binaries.openttd.org/extra/${PN}/${PV}/${P}-source.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/libpng:0"
+DEPEND="
+	${RDEPEND}
+	!games-util/nforenum
+	dev-lang/perl
+	dev-libs/boost
+"
+
+src_prepare() {
+	default
+
+	# Set up Makefile.local so that we respect CXXFLAGS/LDFLAGS
+	cat > Makefile.local <<-__EOF__
+		CXX=$(tc-getCXX)
+		BOOST_INCLUDE=/usr/include
+		CXXFLAGS=${CXXFLAGS}
+		LDOPT=${LDFLAGS}
+		UPX=
+		V=1
+		FLAGS=
+		EXE=
+	__EOF__
+	sed -i -e 's/-O2//g' Makefile || die
+}
+
+src_install() {
+	dobin grfcodec grfid grfstrip nforenum
+	doman docs/*.1
+	dodoc changelog.txt docs/*.txt
+}
diff --git a/games-util/grfcodec/metadata.xml b/games-util/grfcodec/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-util/grfcodec/metadata.xml
@@ -0,0 +1,8 @@
+<?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-util/gslist-0.8.11a-r1 b/games-util/gslist-0.8.11a-r1
deleted file mode 100644
index 3a04b4d4466f..000000000000
--- a/games-util/gslist-0.8.11a-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/geoip app-arch/unzip
-DESCRIPTION=A GameSpy server browser
-EAPI=6
-HOMEPAGE=http://aluigi.altervista.org/papers.htm#gslist
-IUSE=web
-KEYWORDS=~amd64 ~hppa ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/geoip
-SLOT=0
-SRC_URI=mirror://gentoo/gslist-0.8.11a.zip
-_md5_=6a3efca613eb4d37f26220266ea9dcdc
diff --git a/games-util/gslist/Manifest b/games-util/gslist/Manifest
new file mode 100644
index 000000000000..021c91406d8c
--- /dev/null
+++ b/games-util/gslist/Manifest
@@ -0,0 +1,4 @@
+AUX gslist-0.8.11a-build.patch 1178 BLAKE2B ab697e84bb08416e799eb9716bbfe87ef53d30957ab3eb27a79411920f62d9533773ddf17e5351c4d09a324645ad836e3be889fdfcde632fe926eb18491d16b0 SHA512 c938ce951c6042baa769019d274583610a9a5506c4ceeb2816ed372cae08bdfd5b228f3027064b6d92a5bf8beac88ad34f5fd8285ea0512baac7fcbbf6ae076c
+DIST gslist-0.8.11a.zip 2599227 BLAKE2B ff469f74d2cb5436adc0ad95d18fe7806eb726c3856b7e87e97233dc5fca3433a6aa12e94b38ba531ca5296c9c0ffca036cd2056f7dd3e1e611cd7f5e6b1c2da SHA512 082cda97bf82ba4763236ce142d65a90b3372a430436cdc9fdccd1101feb5a2741807dff5a00e81fc833048e81468473d90851d23574167e78166beef08d0734
+EBUILD gslist-0.8.11a-r1.ebuild 616 BLAKE2B be1442b3e2d52ef04719ab75315ffec0ba56894a77bd8ddb63e9e29dc304a3e784fefc76d001d1b15cc739692a1f15473ee0cb7efd714ee60066a7c5493d00dc SHA512 b8c3eddae6b24cc26fd655d45158f9b40c820c96499c4988fe41e617bdcbb6a7b703d072f61d55f150ff7bca1052d9b4a4d0fe920a24b97081285929b68b3251
+MISC metadata.xml 319 BLAKE2B 3de65996c84200d418de6cb2e8beac86afed640f3f3bb6d9d9e9faab5eac156ff6ae05dad539ed6ccf7bdbac3954b821ed03a8972222a5a0e027c4b30b4c6981 SHA512 346a94d5d5aac11f3fcbd7ceac55b80462999debf98aa95d17479944873a0c08e1256def22b0e8225ef57b70deb249db0d93fe76a85a8897bb8b9f92750ea43f
diff --git a/games-util/gslist/files/gslist-0.8.11a-build.patch b/games-util/gslist/files/gslist-0.8.11a-build.patch
new file mode 100644
index 000000000000..4ffbfd94e012
--- /dev/null
+++ b/games-util/gslist/files/gslist-0.8.11a-build.patch
@@ -0,0 +1,41 @@
+--- work.orig/Makefile
++++ work/Makefile
+@@ -1,26 +1,30 @@
+-CFLAGS	+= -O2 -s -fstack-protector-all
++CFLAGS	+= -Wall -D_GNU_SOURCE
+ PREFIX	= /usr/local
+ BINDIR	= $(PREFIX)/bin
+ SRC	= src/gslist.c src/enctype1_decoder.c src/enctype2_decoder.c src/enctype_shared.c src/mydownlib.c
+ #LIBS	= -lpthread /usr/lib/libGeoIP.a /usr/lib/i386-linux-gnu/libz.a
+ #SQLIBS	= /usr/lib/i386-linux-gnu/libmysqlclient.a /usr/lib/i386-linux-gnu/libm.a -ldl
+ LIBS	= -lpthread -lGeoIP -lz
+-SQLIBS	= -lmysqlclient
+ O	= $(SRC:.c=.o)
+ 
+-all:	gslist gslistsql
++ifneq ($(GSWEB),0)
++CFLAGS += -DGSWEB
++endif
+ 
+-gslist:	
+-	$(CC) $(SRC) $(CFLAGS) -o gslist $(LIBS) -DGSWEB
+-	$(CC) $(SRC) $(CFLAGS) -o gslistsql $(SQLIBS) $(LIBS) -DGSWEB -DSQL
++ifneq ($(SQL),0)
++CFLAGS += -DSQL
++LIBS   += -lmysqlclient
++endif
++
++gslist:	$(O)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o gslist $(O) $(LIBS)
+ 
+ clean:
+-	rm -f gslist gslistsql src/gslist.o src/enctype1_decoder.o src/enctype2_decoder.o src/enctype_shared.o src/enctypex_decoder.o src/mydownlib.o
++	rm -f gslist $(O)
+ 
+ install:
+ 	install -m 755 -d $(BINDIR)
+ 	install -m 755 gslist $(BINDIR)/gslist
+-	install -m 755 gslistsql $(BINDIR)/gslistsql
+ 
+ .PHONY:
+ 	clean install
diff --git a/games-util/gslist/gslist-0.8.11a-r1.ebuild b/games-util/gslist/gslist-0.8.11a-r1.ebuild
new file mode 100644
index 000000000000..cbe916e10a66
--- /dev/null
+++ b/games-util/gslist/gslist-0.8.11a-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A GameSpy server browser"
+HOMEPAGE="http://aluigi.altervista.org/papers.htm#gslist"
+SRC_URI="mirror://gentoo/${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="web"
+
+RDEPEND="dev-libs/geoip"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+)
+
+src_prepare() {
+	default
+	rm -f gslist gslistsql *.exe *.dll || die
+}
+
+src_compile() {
+	emake SQL=0 $(use web || echo GSWEB=0)
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc ${PN}.txt
+}
diff --git a/games-util/gslist/metadata.xml b/games-util/gslist/metadata.xml
new file mode 100644
index 000000000000..aea04961416e
--- /dev/null
+++ b/games-util/gslist/metadata.xml
@@ -0,0 +1,11 @@
+<?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="web">Enable the web interface</flag>
+	</use>
+</pkgmetadata>
diff --git a/games-util/gtkevemon-1.10 b/games-util/gtkevemon-1.10
deleted file mode 100644
index 018f3fe761f2..000000000000
--- a/games-util/gtkevemon-1.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-cpp/gtkmm:2.4 dev-libs/libxml2 dev-libs/openssl:0 virtual/pkgconfig
-DESCRIPTION=A standalone skill monitoring application for EVE Online
-EAPI=6
-HOMEPAGE=https://github.com/gtkevemon/gtkevemon
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-cpp/gtkmm:2.4 dev-libs/libxml2 dev-libs/openssl:0
-SLOT=0
-SRC_URI=https://github.com/gtkevemon/gtkevemon/archive/v1.10.tar.gz -> gtkevemon-1.10.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_=091ba41a662faaa90f798c4e356b7f6f
diff --git a/games-util/gtkevemon-9999 b/games-util/gtkevemon-9999
deleted file mode 100644
index 15116b1c9332..000000000000
--- a/games-util/gtkevemon-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DEPEND=dev-cpp/gtkmm:3.0 dev-libs/libxml2 net-misc/curl[ssl] virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=A standalone skill monitoring application for EVE Online
-EAPI=6
-HOMEPAGE=https://github.com/gtkevemon/gtkevemon
-LICENSE=GPL-3
-RDEPEND=dev-cpp/gtkmm:3.0 dev-libs/libxml2 net-misc/curl[ssl]
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d295573a67b31f1b7d3ddad61bce4dc7
diff --git a/games-util/gtkevemon/Manifest b/games-util/gtkevemon/Manifest
new file mode 100644
index 000000000000..5a8506c9b4da
--- /dev/null
+++ b/games-util/gtkevemon/Manifest
@@ -0,0 +1,4 @@
+DIST gtkevemon-1.10.tar.gz 240225 BLAKE2B cd2b64577e85d36e63ecd35c644c0a22da88caa3cd8587a703d4e4e95bfca6b4007fdb0a9e9bc4545e057e6ecf8b6f3c99e84ea7b91ab24fd4f603b91d9bc076 SHA512 c3fad5ba1947be527adf9c90bfad60eb505fd6b3bb3379f960748ccb529381b34b5c5c653516220d17998c95ce2b53105834f7d79053bc1e8ccc9094c8b974c9
+EBUILD gtkevemon-1.10.ebuild 955 BLAKE2B 136d44764e42698e9f6608f9be5ace24f969922c0b6dd401ef1ac673d43c9d2a1972948f3d6b2100bcfa52efe6cfc979a180c9899abddc5f0d554d279fb1c733 SHA512 bb86529e37acf59288555ccbf6f9eababa65b485b5d0db10e0e57c7e0f563a756bb7fce7dd38763cfd804ec7cc674cfc448fedd036077b154e425f56d3244590
+EBUILD gtkevemon-9999.ebuild 917 BLAKE2B 8b333889a59920ede2f3f1940f8945ee5e17c3c83f00a873ea0d41b260a72107a252c02b4b1d058a90602119edbc75b607810e37a557327a24b0d235d291ce22 SHA512 cf0a4cf8c347b1d4a552d7c0f9d6dc5b314fc565dd70f5adecd0e90957d60174a43493b937b2af440c91d00c8a59498db74536f33403d6b1c2bd12e2cb4f5243
+MISC metadata.xml 566 BLAKE2B 2595bd5070fc73f93e2ef0a618cfd4059572360f18108f9759c8320d5ba3c5f20b2b51094ef696993463cb8eea122b4149c17ecedcc8141e13a4b5be8041b12e SHA512 729d349d1f8a3ef31a3bb6413ecd9ca1069e57fe0e34d98e56fde84cbc2a9a8565a832ad27c07b0a05452fbbb63348ec48c369b02c1367aa2cb487fd1784d0ad
diff --git a/games-util/gtkevemon/gtkevemon-1.10.ebuild b/games-util/gtkevemon/gtkevemon-1.10.ebuild
new file mode 100644
index 000000000000..c753cae2122b
--- /dev/null
+++ b/games-util/gtkevemon/gtkevemon-1.10.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="A standalone skill monitoring application for EVE Online"
+HOMEPAGE="https://github.com/gtkevemon/gtkevemon"
+SRC_URI="https://github.com/gtkevemon/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-cpp/gtkmm:2.4
+	dev-libs/libxml2
+	dev-libs/openssl:0
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+src_prepare() {
+	default
+
+	sed -e 's:Categories=Game;$:Categories=Game;RolePlaying;GTK;:' \
+		-i "icon/${PN}.desktop" \
+		|| die "failed fix categories in icon/${PN}.desktop"
+
+	# Fixes a QA notice.
+	sed -i "/^Encoding/d" "icon/${PN}.desktop" \
+		|| die "failed to remove the Encoding from icon/${PN}.desktop"
+
+	append-cxxflags -std=c++11
+}
+
+src_install() {
+	dobin "src/${PN}"
+	doicon "icon/${PN}.svg"
+	domenu "icon/${PN}.desktop"
+	einstalldocs
+}
diff --git a/games-util/gtkevemon/gtkevemon-9999.ebuild b/games-util/gtkevemon/gtkevemon-9999.ebuild
new file mode 100644
index 000000000000..3a8c5bb264d8
--- /dev/null
+++ b/games-util/gtkevemon/gtkevemon-9999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic git-r3
+
+DESCRIPTION="A standalone skill monitoring application for EVE Online"
+HOMEPAGE="https://github.com/gtkevemon/gtkevemon"
+EGIT_REPO_URI="https://github.com/${PN}/${PN}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="
+	dev-cpp/gtkmm:3.0
+	dev-libs/libxml2
+	net-misc/curl[ssl]
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	sed -e 's:Categories=Game;$:Categories=Game;RolePlaying;GTK;:' \
+		-i "icon/${PN}.desktop" \
+		|| die "failed fix categories in icon/${PN}.desktop"
+
+	# Fixes a QA notice.
+	sed -i "/^Encoding/d" "icon/${PN}.desktop" \
+		|| die "failed to remove the Encoding from icon/${PN}.desktop"
+
+	append-cxxflags -std=c++11
+}
+
+src_install() {
+	dobin "src/${PN}"
+	doicon "icon/${PN}.svg"
+	domenu "icon/${PN}.desktop"
+	einstalldocs
+}
diff --git a/games-util/gtkevemon/metadata.xml b/games-util/gtkevemon/metadata.xml
new file mode 100644
index 000000000000..d9cd7a74ba33
--- /dev/null
+++ b/games-util/gtkevemon/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription lang="en">
+	GtkEveMon is a standalone skill monitoring application for EVE Online.
+	It allows monitoring characters' skills and skill training process without
+	starting EVE Online. It is intended as a lightweight, cross-platform
+	alternative to EveMon, a popular skill monitoring application for Windows.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">gtkevemon/gtkevemon</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-util/higan-purify-03 b/games-util/higan-purify-03
deleted file mode 100644
index 5bb7089e4d31..000000000000
--- a/games-util/higan-purify-03
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-games/higan-ananke x11-libs/gtk+:2 x11-libs/libX11 virtual/pkgconfig
-DESCRIPTION=Rom purifier for higan
-EAPI=5
-HOMEPAGE=http://byuu.org/higan/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-games/higan-ananke x11-libs/gtk+:2 x11-libs/libX11
-SLOT=0
-SRC_URI=https://higan.googlecode.com/files/purify_v03-source.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7d4cd29c6d29e56d105ff78dee7d5df7
diff --git a/games-util/higan-purify/Manifest b/games-util/higan-purify/Manifest
new file mode 100644
index 000000000000..4c87e06c40d0
--- /dev/null
+++ b/games-util/higan-purify/Manifest
@@ -0,0 +1,4 @@
+AUX higan-purify-03-QA.patch 1404 BLAKE2B 670d0897fb3d3fb565c36ec30c5dedefdb71bc13770e49a3532059356f3caf652df3a11e00c35e27724ea75e033a248124abca2fc60aa33140d2f858138e39a4 SHA512 31e1fdcd147e75fcaedd1778ef636edc97552fdf520468dd4723112f6557fde0d01a1f476c451e638ca05988543549fa1c76fd83ea70b7f0dbb03a61a4ff02b9
+DIST purify_v03-source.tar.xz 196924 BLAKE2B f4d22ccc34d1c345a2dee20c14bab2614b71b0df2660f3f0883df1b56b5e5fc7fc99872f73ebe674faca8bb455f1a90e5bf79ce9b893f980e99b94546bbcf400 SHA512 095b62013f5a33e720b87c48f32c41239d8cef4c6ddc2b6d119d15b3f8b92bc15d744afa0b2bc8d7a49ef53f8f3fa7f2247be490499a9b194863534f9c1a4b3d
+EBUILD higan-purify-03.ebuild 774 BLAKE2B 09397611fc72e84e516b87f98f7773795bc3273c59d52cc4b68cc6045b8a6e9bcd36af5791ab0cd3bc07701d5c087825ac2a2336c14f69f399e7911051eea093 SHA512 e90d83850caf9f0fa3485763b90652767d8a6eceb5ddcfcc7282a2d6362c24948c02c7434ffbb6f471d7ebb57bc25b1a9685fc58a964a1093e444dff96082598
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-util/higan-purify/files/higan-purify-03-QA.patch b/games-util/higan-purify/files/higan-purify-03-QA.patch
new file mode 100644
index 000000000000..e523ba4cad95
--- /dev/null
+++ b/games-util/higan-purify/files/higan-purify-03-QA.patch
@@ -0,0 +1,42 @@
+--- purify_v03-source/purify/Makefile
++++ purify_v03-source/purify/Makefile
+@@ -2,8 +2,8 @@
+ include phoenix/Makefile
+ 
+ path := /usr/local/bin
+-flags := -I. -O3 -fomit-frame-pointer
+-link := -s
++flags := -I. $(CXXFLAGS)
++link := $(LDFLAGS)
+ objects := obj/phoenix.o obj/purify.o
+ 
+ ifeq ($(platform),x)
+@@ -22,7 +22,7 @@
+ 
+ build: $(objects)
+ ifeq ($(platform),x)
+-	$(cpp) -pthread $(link) -o purify $(objects) $(phoenixlink)
++	$(cpp) $(flags) -pthread $(link) -o purify $(objects) $(phoenixlink)
+ else ifeq ($(platform),win)
+ 	windres phoenix/windows/phoenix.rc obj/phoenix-resource.o
+ 	$(cpp) -shared -o phoenix.dll obj/phoenix.o $(phoenixlink)
+--- purify_v03-source/purify/phoenix/Makefile
++++ purify_v03-source/purify/phoenix/Makefile
+@@ -4,13 +4,13 @@
+   endif
+ 
+   ifeq ($(phoenix),gtk)
+-    phoenixflags := -DPHOENIX_GTK `pkg-config --cflags gtk+-2.0`
+-    phoenixlink := `pkg-config --libs gtk+-2.0`
++    phoenixflags := -DPHOENIX_GTK `pkg-config --cflags gtk+-2.0 x11`
++    phoenixlink := `pkg-config --libs gtk+-2.0 x11` -ldl
+   endif
+ 
+   ifeq ($(phoenix),qt)
+-    phoenixflags := -DPHOENIX_QT `pkg-config --cflags QtCore QtGui`
+-    phoenixlink := `pkg-config --libs QtCore QtGui`
++    phoenixflags := -DPHOENIX_QT `pkg-config --cflags QtCore QtGui x11`
++    phoenixlink := `pkg-config --libs QtCore QtGui x11` -ldl
+   endif
+ else ifeq ($(platform),win)
+   phoenixflags := -DPHOENIX_WINDOWS
diff --git a/games-util/higan-purify/higan-purify-03.ebuild b/games-util/higan-purify/higan-purify-03.ebuild
new file mode 100644
index 000000000000..e9613fa1ec22
--- /dev/null
+++ b/games-util/higan-purify/higan-purify-03.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+MY_P=purify_v${PV}-source
+
+DESCRIPTION="Rom purifier for higan"
+HOMEPAGE="http://byuu.org/higan/"
+SRC_URI="https://higan.googlecode.com/files/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-games/higan-ananke
+	x11-libs/gtk+:2
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}"/${MY_P}/purify
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-QA.patch
+	sed -i \
+		-e "/handle/s#/usr/local/lib#/usr/$(get_libdir)#" \
+		nall/dl.hpp || die
+}
+
+src_compile() {
+	emake \
+		platform="x" \
+		compiler="$(tc-getCXX)" \
+		phoenix="gtk"
+}
+
+src_install() {
+	dobin purify
+}
diff --git a/games-util/higan-purify/metadata.xml b/games-util/higan-purify/metadata.xml
new file mode 100644
index 000000000000..26079e608bed
--- /dev/null
+++ b/games-util/higan-purify/metadata.xml
@@ -0,0 +1,8 @@
+<?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-util/joystick-1.6.0 b/games-util/joystick-1.6.0
deleted file mode 100644
index 647ac01125e0..000000000000
--- a/games-util/joystick-1.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sdl? ( media-libs/libsdl:0[video] ) !<x11-libs/tslib-1.0-r2
-DESCRIPTION=joystick testing utilities
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/linuxconsole/ http://atrey.karlin.mff.cuni.cz/~vojtech/input/
-IUSE=sdl udev
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=sdl? ( media-libs/libsdl:0[video] ) !<x11-libs/tslib-1.0-r2 udev? ( virtual/udev )
-SLOT=0
-SRC_URI=mirror://sourceforge/linuxconsole/files/linuxconsoletools-1.6.0.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=26c6cb9a74b236560794f61dfc280266
diff --git a/games-util/joystick/Manifest b/games-util/joystick/Manifest
new file mode 100644
index 000000000000..438275836543
--- /dev/null
+++ b/games-util/joystick/Manifest
@@ -0,0 +1,5 @@
+AUX joystick-1.4.8-udev.patch 1724 BLAKE2B 63fd913ee85bbcdb00ccf8150dcccca4f2f6c36ef274b04dffd78aaaf9906048368495855edaa8809f371b7f63320ad89b3c40f94242b8d1f4316ab04a4eece6 SHA512 8a00825c9fb293e174eace79b1ce08af9eb2c6e18450daa62ae67b7c6a49ebe6b2490de4ccc7c1177edb300ed361a0920773b14d90c1aae4a34062ca16ad76de
+AUX joystick-1.6.0-build.patch 831 BLAKE2B 942038f6997caa84cdbc8c05a6353dd448c1b70f9229f38084e2b8c80df2f8d3df3eb8a0da754a7ba56863aaed58375eec22267f08d304bd550d2237054f6e16 SHA512 071b15e16a1688e2d743dbf0bc44c784184ee93698b660394c83bed719d579952c9d73680e3e24754a41d5de69a65559b61255b0366c3437a193fc526c3d6064
+DIST linuxconsoletools-1.6.0.tar.bz2 50563 BLAKE2B 26f68f4a9a4af5b875bc7efcc70edd80978a560f62c415b4957ee851260a2f6e6227c5a3001fb009777eac7e19d0449a8335486290ae0aaa9467ad8e1e9a89fb SHA512 35ca923cceca729bcbab95dff18682abd0d87a297e70aa8707fbabccde018fef0775a99195af4bf9111ba33210a14c10d1a766f83112cd535930a1ae430c7c75
+EBUILD joystick-1.6.0.ebuild 887 BLAKE2B 4884fd349de63ed785b16f5f094463619560a4bfeb59ad5b9b9a4b24fd3d47eb00dd285ec2b4957e544828e846a953b5c5b77a8dad1a65564ad38a84a10e0982 SHA512 53c67ffa860135221e573741ca2352fefed4b8284022b906383bf63775ea62b751792218c3f9dd36448c20346683d6ee657d9a91dc7f748506c2827b2db0c3f5
+MISC metadata.xml 335 BLAKE2B e83ffecd1afda0861555f62d9bad50f99c8e1bebb296f303bbdb8624ea283eb04d30d76a74d9970f519e303e851991ae33b232f74c9d2fdacce16b59fccdf9f5 SHA512 6440a6652a98c7439b22df51f22089ddd867be3e07e6c04001aa15b1fc01fd84dc8d3244f106abe4ae89caf7561aa45fe2526f2f9e8e8844a5e44f9f8a51df41
diff --git a/games-util/joystick/files/joystick-1.4.8-udev.patch b/games-util/joystick/files/joystick-1.4.8-udev.patch
new file mode 100644
index 000000000000..c0032493ebf7
--- /dev/null
+++ b/games-util/joystick/files/joystick-1.4.8-udev.patch
@@ -0,0 +1,52 @@
+diff -ru linuxconsoletools-1.4.8.orig/utils/jscal-restore.in linuxconsoletools-1.4.8/utils/jscal-restore.in
+--- linuxconsoletools-1.4.8.orig/utils/jscal-restore.in	2011-12-15 10:49:01.000000000 -0500
++++ linuxconsoletools-1.4.8/utils/jscal-restore.in	2015-05-16 01:54:00.799168225 -0400
+@@ -6,8 +6,13 @@
+     exit 1
+ fi
+ 
+-if [ ! -x /sbin/udevadm ]; then
+-    echo Restoring joystick configuration requires udev! >&2
++for f in /sbin/udevadm /bin/udevadm ;
++do
++    [ -x $f ] && UDEVADM=$f
++done
++
++if [ -z "$UDEVADM" ] ; then
++    echo Storing joystick configuration requires udev! >&2
+     exit 1
+ fi
+ 
+@@ -30,7 +35,7 @@
+ # in the NAME value
+ IFS=$'\x0A'
+ 
+-for ATTRIBUTE in $( /sbin/udevadm info -a -n $1 | @@PREFIX@@/share/joystick/ident ); do
++for ATTRIBUTE in $( ${UDEVADM} info -a -n $1 | @@PREFIX@@/share/joystick/ident ); do
+     ID=$( echo "$ATTRIBUTE" | cut -f 1 -d = )
+     VALUE=$( echo "$ATTRIBUTE" | cut -f 2 -d \" )
+     case $ID in
+diff -ru linuxconsoletools-1.4.8.orig/utils/jscal-store.in linuxconsoletools-1.4.8/utils/jscal-store.in
+--- linuxconsoletools-1.4.8.orig/utils/jscal-store.in	2011-12-15 10:49:01.000000000 -0500
++++ linuxconsoletools-1.4.8/utils/jscal-store.in	2015-05-16 01:53:18.725607838 -0400
+@@ -11,14 +11,18 @@
+     echo "Stores the device's calibration for future use."
+     exit 1
+ fi
++for f in /sbin/udevadm /bin/udevadm ;
++do
++    [ -x $f ] && UDEVADM=$f
++done
+ 
+-if [ ! -x /sbin/udevadm ]; then
++if [ -z "$UDEVADM" ] ; then
+     echo Storing joystick configuration requires udev! >&2
+     exit 1
+ fi
+ 
+ ident=$(mktemp)
+-/sbin/udevadm info -a -n $1 | @@PREFIX@@/share/joystick/ident > $ident
++${UDEVADM} info -a -n $1 | @@PREFIX@@/share/joystick/ident > $ident
+ . $ident
+ rm $ident
+ 
diff --git a/games-util/joystick/files/joystick-1.6.0-build.patch b/games-util/joystick/files/joystick-1.6.0-build.patch
new file mode 100644
index 000000000000..fa60ec719917
--- /dev/null
+++ b/games-util/joystick/files/joystick-1.6.0-build.patch
@@ -0,0 +1,34 @@
+--- linuxconsoletools-1.6.0/docs/Makefile
++++ linuxconsoletools-1.6.0/docs/Makefile
+@@ -20,9 +20,13 @@
+ # 02110-1301 USA.
+ 
+ MANPAGES	= inputattach.1 jstest.1 jscal.1 fftest.1 \
+-		  ffmvforce.1 ffset.1 ffcfstress.1 jscal-store.1 \
++		  ffset.1 ffcfstress.1 jscal-store.1 \
+ 		  jscal-restore.1 evdev-joystick.1
+ 
++ifneq ($(USE_SDL),no)
++MANPAGES += ffmvforce.1
++endif
++
+ PREFIX          ?= /usr/local
+ 
+ install:
+--- linuxconsoletools-1.6.0/utils/Makefile
++++ linuxconsoletools-1.6.0/utils/Makefile
+@@ -27,9 +27,13 @@
+ 
+ CFLAGS		?= -g -O2 -Wall
+ 
+-PROGRAMS	= inputattach jstest jscal fftest ffmvforce ffset \
++PROGRAMS	= inputattach jstest jscal fftest ffset \
+ 		  ffcfstress jscal-restore jscal-store evdev-joystick
+ 
++ifneq ($(USE_SDL),no)
++PROGRAMS += ffmvforce
++endif
++
+ PREFIX          ?= /usr/local
+ 
+ compile: $(PROGRAMS)
diff --git a/games-util/joystick/joystick-1.6.0.ebuild b/games-util/joystick/joystick-1.6.0.ebuild
new file mode 100644
index 000000000000..ce8acc0a4ad6
--- /dev/null
+++ b/games-util/joystick/joystick-1.6.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils toolchain-funcs
+
+MY_P="linuxconsoletools-${PV}"
+DESCRIPTION="joystick testing utilities"
+HOMEPAGE="https://sourceforge.net/projects/linuxconsole/ http://atrey.karlin.mff.cuni.cz/~vojtech/input/"
+SRC_URI="mirror://sourceforge/linuxconsole/files/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="sdl udev"
+
+DEPEND="sdl? ( media-libs/libsdl:0[video] )
+	!<x11-libs/tslib-1.0-r2"
+RDEPEND="${DEPEND}
+	udev? ( virtual/udev )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.0-build.patch
+	"${FILESDIR}"/${PN}-1.4.8-udev.patch
+)
+
+src_prepare() {
+	default
+
+	export PREFIX=/usr
+	tc-export CC PKG_CONFIG
+	export USE_SDL=$(usex sdl)
+}
+
+src_install() {
+	default
+	if use !udev ; then
+		rm "${D}"/usr/bin/jscal-{re,}store || die
+	fi
+}
diff --git a/games-util/joystick/metadata.xml b/games-util/joystick/metadata.xml
new file mode 100644
index 000000000000..677407539cc4
--- /dev/null
+++ b/games-util/joystick/metadata.xml
@@ -0,0 +1,11 @@
+<?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">linuxconsole</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-util/lgogdownloader-3.3 b/games-util/lgogdownloader-3.3
deleted file mode 100644
index d464ea85fcd1..000000000000
--- a/games-util/lgogdownloader-3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-crypt/rhash-1.3.3-r2:0= dev-cpp/htmlcxx:0= dev-libs/boost:0= >=dev-libs/jsoncpp-1.7:0= dev-libs/tinyxml2:0= net-libs/liboauth:0= >=net-misc/curl-7.32:0=[ssl] sys-apps/help2man virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Unofficial GOG.com downloader for Linux
-EAPI=6
-HOMEPAGE=https://sites.google.com/site/gogdownloader/
-IUSE=+debug
-KEYWORDS=~amd64 ~x86
-LICENSE=WTFPL-2
-RDEPEND=>=app-crypt/rhash-1.3.3-r2:0= dev-cpp/htmlcxx:0= dev-libs/boost:0= >=dev-libs/jsoncpp-1.7:0= dev-libs/tinyxml2:0= net-libs/liboauth:0= >=net-misc/curl-7.32:0=[ssl]
-SLOT=0
-SRC_URI=https://sites.google.com/site/gogdownloader/lgogdownloader-3.3.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1fb96a651c6268bd7f0343444b113c6f
diff --git a/games-util/lgogdownloader-9999 b/games-util/lgogdownloader-9999
deleted file mode 100644
index 90f65d3fc04c..000000000000
--- a/games-util/lgogdownloader-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=app-crypt/rhash-1.3.3-r2:0= dev-cpp/htmlcxx:0= dev-libs/boost:0= >=dev-libs/jsoncpp-1.7:0= dev-libs/tinyxml2:0= net-libs/liboauth:0= >=net-misc/curl-7.32:0=[ssl] sys-apps/help2man virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Unofficial GOG.com downloader for Linux
-EAPI=6
-HOMEPAGE=https://sites.google.com/site/gogdownloader/
-IUSE=+debug
-LICENSE=WTFPL-2
-RDEPEND=>=app-crypt/rhash-1.3.3-r2:0= dev-cpp/htmlcxx:0= dev-libs/boost:0= >=dev-libs/jsoncpp-1.7:0= dev-libs/tinyxml2:0= net-libs/liboauth:0= >=net-misc/curl-7.32:0=[ssl]
-SLOT=0
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=01ee3567b780393911de683735f53d35
diff --git a/games-util/lgogdownloader/Manifest b/games-util/lgogdownloader/Manifest
new file mode 100644
index 000000000000..0e172b46e3b5
--- /dev/null
+++ b/games-util/lgogdownloader/Manifest
@@ -0,0 +1,4 @@
+DIST lgogdownloader-3.3.tar.gz 73873 BLAKE2B c2c4c56d6afcc4c103cc32a308be25252888f7668d7488d3aa2eec860f8e2694c62fe25a27e1f24132895d0a8683a226ca95667dac4e7837886b07cfd0821855 SHA512 7af67c440e88bcfbbd6f59b44b8cfd81fe9cee041715d4da968be3aedfe4301a5377ce61354a5cc093588d89300c88c862d9228672a2d79613419dce3619f4c9
+EBUILD lgogdownloader-3.3.ebuild 617 BLAKE2B fcc5b4667ea14cb9ed71edcec85a67778a4f8a26c4c2cbb0bd6db7d4236b1679605286d6cb4de5c7d8f640b98bf4934cefc11b4ef90f331e9c9ec9e8d4643ccc SHA512 1ba1653d7b228c0d30496209bc422d57cc08af72cb978e69f95e5caebf97ec080b8d2cecc99f491040d54c40c8b0cf507d60b3c70c7ef628e40d2ba98f2d0537
+EBUILD lgogdownloader-9999.ebuild 595 BLAKE2B 6952d20f49e8de4192580f817ed40ed75e9b4b4350ca4386d3ae833d7754ce64229dad443d65c8bbf16e97d5cce5aef9bdcb0e9b78f5e58c26d90f052ac82051 SHA512 96abd62dd1be6f345ea2aeae400c843eff0e68caa38bfed0e38b7fdd09957dfa170b988886a2144066c545e05845604d54af31d05f622ea1346c520f80f048ac
+MISC metadata.xml 1009 BLAKE2B 4a7828bf14d896ea37cc6091c2d019bb96e4c97e0ae3f2b48045a92aa9ec2a648058fe817b5cc0fc2bb98379365b9d94f9529ba5de1b3f5dca67dcb313f87cb9 SHA512 cc64f740c4b3ab4a5c4d87b60b2146b6b5a64869d19f6283428d365c7a6f79a6697b8bd63bd31c2cad63bb065d32ac751c643ff794adf966edfc8663debdd4af
diff --git a/games-util/lgogdownloader/lgogdownloader-3.3.ebuild b/games-util/lgogdownloader/lgogdownloader-3.3.ebuild
new file mode 100644
index 000000000000..0ac33eae5786
--- /dev/null
+++ b/games-util/lgogdownloader/lgogdownloader-3.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Unofficial GOG.com downloader for Linux"
+HOMEPAGE="https://sites.google.com/site/gogdownloader/"
+SRC_URI="https://sites.google.com/site/gogdownloader/${P}.tar.gz"
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+debug"
+
+RDEPEND=">=app-crypt/rhash-1.3.3-r2:0=
+	dev-cpp/htmlcxx:0=
+	dev-libs/boost:0=
+	>=dev-libs/jsoncpp-1.7:0=
+	dev-libs/tinyxml2:0=
+	net-libs/liboauth:0=
+	>=net-misc/curl-7.32:0=[ssl]"
+
+DEPEND="${RDEPEND}
+	sys-apps/help2man
+	virtual/pkgconfig"
diff --git a/games-util/lgogdownloader/lgogdownloader-9999.ebuild b/games-util/lgogdownloader/lgogdownloader-9999.ebuild
new file mode 100644
index 000000000000..478ab0eee166
--- /dev/null
+++ b/games-util/lgogdownloader/lgogdownloader-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils git-r3
+
+DESCRIPTION="Unofficial GOG.com downloader for Linux"
+HOMEPAGE="https://sites.google.com/site/gogdownloader/"
+EGIT_REPO_URI="https://github.com/Sude-/lgogdownloader.git"
+LICENSE="WTFPL-2"
+SLOT="0"
+IUSE="+debug"
+
+RDEPEND=">=app-crypt/rhash-1.3.3-r2:0=
+	dev-cpp/htmlcxx:0=
+	dev-libs/boost:0=
+	>=dev-libs/jsoncpp-1.7:0=
+	dev-libs/tinyxml2:0=
+	net-libs/liboauth:0=
+	>=net-misc/curl-7.32:0=[ssl]"
+
+DEPEND="${RDEPEND}
+	sys-apps/help2man
+	virtual/pkgconfig"
diff --git a/games-util/lgogdownloader/metadata.xml b/games-util/lgogdownloader/metadata.xml
new file mode 100644
index 000000000000..8a63172d961f
--- /dev/null
+++ b/games-util/lgogdownloader/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Sude-/lgogdownloader</remote-id>
+	</upstream>
+	<longdescription>
+		LGOGDownloader is open source downloader to GOG.com for Linux
+		users using the same API as the official GOGDownloader.
+
+		Features:
+		* List available games
+		* Resume downloads
+		* Batch downloading
+		* Repair downloaded files
+		* Read/create XML files used by the official GOG Downloader
+		* Download cover art
+		* Check for orphaned files
+		* Check status of files
+		* Download individual files by id number
+		* List/download updated files
+		* Blacklist unwanted files
+		* Perl regular expressions for filtering games
+	</longdescription>
+</pkgmetadata>
diff --git a/games-util/linux-wbfs-manager-0.1.12 b/games-util/linux-wbfs-manager-0.1.12
deleted file mode 100644
index 416fc8bd03a9..000000000000
--- a/games-util/linux-wbfs-manager-0.1.12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=dev-libs/glib:2 gnome-base/libglade:2.0 virtual/pkgconfig
-DESCRIPTION=WBFS manager for Linux using GTK+
-EAPI=5
-HOMEPAGE=https://code.google.com/p/linux-wbfs-manager/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 gnome-base/libglade:2.0
-SLOT=0
-SRC_URI=https://linux-wbfs-manager.googlecode.com/files/linux-wbfs-manager-0.1.12.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=f7882b5aee292f3f826a4cb53deef04e
diff --git a/games-util/linux-wbfs-manager-9999 b/games-util/linux-wbfs-manager-9999
deleted file mode 100644
index d6a80f87f3fe..000000000000
--- a/games-util/linux-wbfs-manager-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare unpack
-DEPEND=dev-libs/glib:2 gnome-base/libglade:2.0 virtual/pkgconfig || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
-DESCRIPTION=WBFS manager for Linux using GTK+
-EAPI=5
-HOMEPAGE=https://code.google.com/p/linux-wbfs-manager/
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 gnome-base/libglade:2.0
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	subversion	a5d5826a85609611f098c0553eb24cc1	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c1151a9144f151ada9dd19b56bb22ba8
diff --git a/games-util/linux-wbfs-manager/Manifest b/games-util/linux-wbfs-manager/Manifest
new file mode 100644
index 000000000000..5fc94351162e
--- /dev/null
+++ b/games-util/linux-wbfs-manager/Manifest
@@ -0,0 +1,4 @@
+DIST linux-wbfs-manager-0.1.12.tar.gz 34251 BLAKE2B 57a3e5c405318ab128455455e6e45fb58b397c6b3135d97b54642569b26fd9f388d65250723818795fc310704afb59db7a682dbcaaea9c26e113bf0a28998e5d SHA512 58ac4d110e27123d04261d618df8734a0471bcad63171025aa4766a73bcc4a9240fceec59b1ba91fff71230e98f57b5fdd12390d380dc0c41d08740b7076bf6f
+EBUILD linux-wbfs-manager-0.1.12.ebuild 916 BLAKE2B dd786f471afb037d1d4a5f50c311e30322995ad114d7b0c8b5cf16dfbbef1af9f7ad6b8e3434d53824f9f0a557e0af7597400631a8a6d46a0413ce8a0837faa2 SHA512 09e8aab18b18c8b8eb001c844ae589e44ee04c04a668b158dbd6da07891812170f4d4a8d3f945876bce3a9ad6e39859c324ef8a43f2068a5208a6d697036293f
+EBUILD linux-wbfs-manager-9999.ebuild 916 BLAKE2B 060cad1ce2e2e3b1982df08efdefe1d5fbff75b03ce4cb6d14d26040b1737d721f738fa3e1c019c7067e1dd3678ea07e9e88270578b236ac45f0ca57f18fc830 SHA512 a56bb18d7466c517aea67a668bc30b91b8d59773127699963ee5aefc24b706a74751ecfa75fb94b33787ba8979d04bab8980cb7d76c85a2b0652ed065a0b8496
+MISC metadata.xml 341 BLAKE2B 6dfa68b48d7d834af0a719e930d49fca895d7f929780e087882b9e5889ab492f02ad3f3ebaa990e4c995b80ef43e714fce299ff16181426138dcbe5fe1a6c211 SHA512 46913ec989d81928c2faf97ef1a4e57e19f412189b9acf6de875fea5a9615e808dde58ad29df401fa8d125dd1be232f76800dd2497c60a160db752a13f2ff8cd
diff --git a/games-util/linux-wbfs-manager/linux-wbfs-manager-0.1.12.ebuild b/games-util/linux-wbfs-manager/linux-wbfs-manager-0.1.12.ebuild
new file mode 100644
index 000000000000..ac70b1fc110d
--- /dev/null
+++ b/games-util/linux-wbfs-manager/linux-wbfs-manager-0.1.12.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+if [[ "${PV}" == "9999" ]]; then
+	ESVN_REPO_URI="https://linux-wbfs-manager.googlecode.com/svn/trunk/"
+	inherit toolchain-funcs subversion
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	inherit toolchain-funcs
+	SRC_URI="https://linux-wbfs-manager.googlecode.com/files/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi;
+
+DESCRIPTION="WBFS manager for Linux using GTK+"
+HOMEPAGE="https://code.google.com/p/linux-wbfs-manager/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+	gnome-base/libglade:2.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+if [[ ${PV} == "9999" ]] ; then
+	S=${WORKDIR}/${ECVS_MODULE}
+else
+	S=${WORKDIR}/${PN}
+fi
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		subversion_src_unpack
+	else
+		default
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin wbfs_gtk
+	dodoc README
+}
diff --git a/games-util/linux-wbfs-manager/linux-wbfs-manager-9999.ebuild b/games-util/linux-wbfs-manager/linux-wbfs-manager-9999.ebuild
new file mode 100644
index 000000000000..59c3678a99f2
--- /dev/null
+++ b/games-util/linux-wbfs-manager/linux-wbfs-manager-9999.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+if [[ "${PV}" == "9999" ]]; then
+	ESVN_REPO_URI="https://linux-wbfs-manager.googlecode.com/svn/trunk/"
+	inherit toolchain-funcs subversion
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	inherit toolchain-funcs
+	SRC_URI="https://linux-wbfs-manager.googlecode.com/files/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi;
+
+DESCRIPTION="WBFS manager for Linux using GTK+"
+HOMEPAGE="https://code.google.com/p/linux-wbfs-manager/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+	gnome-base/libglade:2.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+if [[ ${PV} == "9999" ]] ; then
+	S=${WORKDIR}/${ECVS_MODULE}
+else
+	S=${WORKDIR}/${PN}
+fi
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		subversion_src_unpack
+	else
+		default
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin wbfs_gtk
+	dodoc README
+}
diff --git a/games-util/linux-wbfs-manager/metadata.xml b/games-util/linux-wbfs-manager/metadata.xml
new file mode 100644
index 000000000000..42bfc468b26b
--- /dev/null
+++ b/games-util/linux-wbfs-manager/metadata.xml
@@ -0,0 +1,11 @@
+<?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="google-code">linux-wbfs-manager</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-util/loki_patch-20091105 b/games-util/loki_patch-20091105
deleted file mode 100644
index 4b70ec99ad7a..000000000000
--- a/games-util/loki_patch-20091105
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-util/xdelta:0 dev-libs/libxml2 dev-libs/glib:2 virtual/pkgconfig >=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=Loki Software binary patch tool
-EAPI=5
-HOMEPAGE=http://www.icculus.org/loki_setup/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-util/xdelta:0 dev-libs/libxml2 dev-libs/glib:2
-SLOT=0
-SRC_URI=mirror://gentoo/loki_patch-20091105.tar.bz2 mirror://gentoo/loki_setupdb-20091105.tar.bz2
-_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_=1d4db28fc08d1336e9c864d1efa57c4a
diff --git a/games-util/loki_patch/Manifest b/games-util/loki_patch/Manifest
new file mode 100644
index 000000000000..9e09480a90f5
--- /dev/null
+++ b/games-util/loki_patch/Manifest
@@ -0,0 +1,6 @@
+AUX loki_patch-20091105-build.patch 4617 BLAKE2B 2dd2804ee90c88e8cc055a26dcf75ade6fc96d7e194a25909b97df745b74d8a67e80190b60af824538e82458e67648f7fa9390456000d31cc071001481bde5e0 SHA512 eabc0db3f6594b99ef76d57e1fdd738c96e4ef45c0bb67127907fa6a19d19002e2a97acc2735e7353915047ecf626bacd6bcdc7bf42446cd42c6b10f79dc6ca7
+AUX loki_patch-20091105-patchdata.patch 257 BLAKE2B 0bab64cabdfc931e06f61b140a5a079267028c7e975a742344cb593b5144776152f2b88c12877de26fef23e1b8efe8db5448b123d889c19eaf61ccc229e640ab SHA512 e21da8ce772f38c1bc2acb52bedeb96042e5bb2168c76ec3efde995bfd4b113000a20b4c6efba92fc79f7ebc16486cc7871d628bf71494bf4bb8ce7dfd7dfed4
+DIST loki_patch-20091105.tar.bz2 331725 BLAKE2B a3fa2e1c594d3484830527276ebd24f6e1c56f924b815fd3e2a12f802bccfd556017084a094508c531badd568158eb68fa3d608c30a55110de24410088fc5275 SHA512 9db40b1746ecf5603c09be3ddf01bf92cfc6b3d1c35ac7153751e1871840175c538af98c22f458658bcbebac65ccddccc1aee92a88300a243b8e68bda13ca323
+DIST loki_setupdb-20091105.tar.bz2 60725 BLAKE2B d3bed3d6b9123093b307f9c735f14c630f8ebfd2b228d6268cf97e8016ec83fa18b3b390e84facd42afe5d3f707bfb63a48e21a6b002a7d0583fdbde907567dc SHA512 ba55b24a6e2b2b6268dec9df8ec0581d852461b5c07ca97a24ebee3e55fe5764dffbbcfdb6b18a80677f2fae1e7701df4fbca0f6af8ef8050c662f5a39daf25d
+EBUILD loki_patch-20091105.ebuild 874 BLAKE2B c67c080b6639c66bf20d26522b13bfdabfd169ac6696092e03a9aa44d222428b7aaf2cb94aa29835b4ee6e43b15ef53d40f128fbdd0cdd6eac215286528f4638 SHA512 4e6e08b74cb19c7dd3e20a5b7a35bae1d25140ed1e41af95af2d106534aef94a5b2a37cce2f3085ac3c23b0548cc216fdcc6fec6438604d27332c6ae41003543
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/loki_patch/files/loki_patch-20091105-build.patch b/games-util/loki_patch/files/loki_patch-20091105-build.patch
new file mode 100644
index 000000000000..8e2b5bbf1557
--- /dev/null
+++ b/games-util/loki_patch/files/loki_patch-20091105-build.patch
@@ -0,0 +1,179 @@
+--- loki_patch/configure.in
++++ loki_patch/configure.in
+@@ -1,4 +1,4 @@
+-AC_INIT(README)
++AC_INIT(loki_patch, 1.0.2)
+ 
+ dnl Define the release numbers here
+ 
+@@ -10,13 +10,14 @@
+ AC_CANONICAL_HOST
+ AC_CANONICAL_TARGET
+ 
++AM_INIT_AUTOMAKE(foreign no-dependencies)
+ AC_PROG_CC
+ AC_PROG_MAKE_SET
+ AC_PROG_INSTALL
+ 
+ AC_CHECK_HEADERS(unistd.h)
+ 
+-CFLAGS="-fsigned-char -funroll-loops -Wall -g -O2"
++CFLAGS="$CFLAGS -fsigned-char -Wall"
+ 
+ case "$target" in
+     *i?86*)
+@@ -32,17 +33,12 @@
+ OS=`uname -s`
+ 
+ dnl Look for the XML libraries
++PKG_CHECK_MODULES(XML, libxml-2.0)
++AC_SUBST(XML_LIBS)
+ 
+-AC_PATH_PROG(HAVEXML, xml-config, $PATH)
+-if test ! -z "$HAVEXML"; then
+-    XML_CFLAGS=`$HAVEXML --cflags`
+-    XML_PREFIX=`$HAVEXML --prefix`
+-
+-    CFLAGS="$CFLAGS $XML_CFLAGS"
+-    LIBS="$LIBS $XML_PREFIX/lib/libxml.a"
+-else
+-    AC_MSG_ERROR([*** xml-config not found. You need a working libxml installation.])
+-fi
++PKG_CHECK_MODULES(XDELTA, xdelta)
++AC_SUBST(XDELTA_CFLAGS)
++AC_SUBST(XDELTA_LIBS)
+ 
+ SETUPDB_VERSION=1.0.0
+ SETUPDB="`pwd`/../loki_setupdb-$SETUPDB_VERSION"
+@@ -57,14 +53,6 @@
+         SETUPDB=$with_setupdb
+ fi
+ 
+-dnl Check for correct setupdb installation
+-
+-if test -f $SETUPDB/$ARCH/libsetupdb.a; then
+-    AC_MSG_RESULT([SetupDB library found in $SETUPDB/$ARCH])
+-else
+-    AC_MSG_ERROR([*** Please compile setupdb first!])
+-fi
+-
+ CFLAGS="$CFLAGS -I$SETUPDB"
+ 
+ AC_SUBST(SETUPDB)
+--- loki_patch/loki_xdelta.c
++++ loki_patch/loki_xdelta.c
+@@ -49,7 +49,7 @@
+ 
+ #define LOKI_PATCH
+ 
+-#include "xdelta_inc/xdelta.h"
++#include <xdelta.h>
+ 
+ static HandleFuncTable xd_handle_table;
+ 
+--- loki_patch/Makefile.am
++++ loki_patch/Makefile.am
+@@ -0,0 +1,12 @@
++COMMONSRC = load_patch.c size_patch.c print_patch.c \
++	loki_xdelta.c mkdirhier.c log_output.c
++
++bin_PROGRAMS = make_patch loki_patch
++
++make_patch_SOURCES = $(COMMONSRC) make_patch.c tree_patch.c save_patch.c
++
++loki_patch_SOURCES = $(COMMONSRC) loki_patch.c apply_patch.c registry.c
++
++AM_CPPFLAGS = $(XDELTA_CFLAGS)
++
++LDADD = $(top_builddir)/../loki_setupdb/libsetupdb.a $(XDELTA_LIBS) $(XML_LIBS) -lz
+--- loki_setupdb/configure.in
++++ loki_setupdb/configure.in
+@@ -1,4 +1,4 @@
+-AC_INIT
++AC_INIT(setupdb, 1.6.5)
+ AC_CONFIG_HEADER(config.h)
+ 
+ dnl Define the release numbers here
+@@ -12,8 +12,7 @@
+ PACKAGE_VERSION="$SETUPDB_VERSION_MAJOR.$SETUPDB_VERSION_MINOR.$SETUPDB_VERSION_RELEASE"
+ PACKAGE_STRING="$PACKAGE_NAME v$PACKAGE_VERSION"
+ 
+-test "x$CFLAGS" = x && CFLAGS="-O2"
+-CFLAGS="$CFLAGS -fsigned-char -Wall -g -I."
++CFLAGS="$CFLAGS -fsigned-char -Wall"
+ REENTRANT="-D_REENTRANT"
+ 
+ if test -d /usr/codehost/lib; then
+@@ -33,9 +32,11 @@
+ AC_CANONICAL_HOST
+ AC_CANONICAL_TARGET
+ 
++AM_INIT_AUTOMAKE(foreign no-dependencies)
+ AC_PROG_CC
+ AC_PROG_MAKE_SET
+ AC_PATH_PROGS(AR, [ar gar])
++AC_PROG_RANLIB
+ 
+ AC_CHECK_HEADERS(unistd.h)
+ AC_CHECK_HEADERS(strings.h)
+@@ -128,7 +129,7 @@
+ 
+ AC_CHECK_FUNCS(getopt, , GETOPT_C="getopt.c")
+ AC_CHECK_FUNCS(getopt_long, , GETOPT_C="getopt.c")
+-AC_CHECK_LIB(gnugetopt, getopt_long, LIBS="$LIBS $BSTATIC -lgnugetopt"; GETOPT_C="")
++AC_CHECK_LIB(gnugetopt, getopt_long, LIBS="$LIBS -lgnugetopt"; GETOPT_C="")
+ 
+ AC_SUBST(ARCH)
+ AC_SUBST(STATIC)
+@@ -139,37 +140,8 @@
+ 
+ dnl Look for the XML libraries
+ 
+-XMLVER=""
+-AC_ARG_WITH(libxml2,
+-[  --with-libxml2          use libxml2 [default=libxml1]],
+-	,	with_libxml2=no)
+-if test x$with_libxml2 != xno; then
+-	XMLVER="2"
+-fi
+-
+-AC_PATH_PROG(HAVEXML, xml${XMLVER}-config, $PATH)
+-if test ! -z "$HAVEXML"; then
+-    XML_CFLAGS=`$HAVEXML --cflags`
+-    XML_PREFIX=`$HAVEXML --prefix`
+-
+-	if "$HAVEXML" --help|grep libtool-libs > /dev/null; then
+-		XML_LIBTOOL=`$HAVEXML --libtool-libs`
+-		if test -f "$XML_LIBTOOL"; then
+-			. "$XML_LIBTOOL"
+-			XML_LIBS="$dependency_libs"
+-		else
+-			XML_LIBS="-lm"
+-		fi
+-	elif "$HAVEXML" --libs | grep thread > /dev/null; then
+-		XML_LIBS="$PTHREAD -lm"
+-	fi
+-	EXTRA_LIBS="$EXTRA_LIBS $XML_LIBS"
+-
+-    CFLAGS="$CFLAGS $XML_CFLAGS"
+-    LIBS="$LIBS $XML_PREFIX/lib$LIBSUFFIX/libxml${XMLVER}.a $BSTATIC $ZLIB $BDYNAMIC $EXTRA_LIBS"
+-else
+-    AC_MSG_ERROR([*** xml-config not found. You need a working libxml installation.])
+-fi
++PKG_CHECK_MODULES(XML, libxml-2.0)
++AC_SUBST(XML_CFLAGS)
+ 
+ AC_ARG_WITH(vendor,
+ [  --with-vendor           with specified vendor prefix  [default=loki]], 
+--- loki_setupdb/Makefile.am
++++ loki_setupdb/Makefile.am
+@@ -0,0 +1,9 @@
++noinst_LIBRARIES = libsetupdb.a
++
++libsetupdb_a_SOURCES = \
++	arch.c brandelf.c convert.c md5.c register.c setupdb.c
++
++libsetupdb_a_CPPFLAGS = \
++	-DSETUPDB_VERSION_MAJOR=$(SETUPDB_VERSION_MAJOR) \
++	-DSETUPDB_VERSION_MINOR=$(SETUPDB_VERSION_MINOR) \
++	$(XML_CFLAGS)
diff --git a/games-util/loki_patch/files/loki_patch-20091105-patchdata.patch b/games-util/loki_patch/files/loki_patch-20091105-patchdata.patch
new file mode 100644
index 000000000000..74ec3dae7568
--- /dev/null
+++ b/games-util/loki_patch/files/loki_patch-20091105-patchdata.patch
@@ -0,0 +1,11 @@
+--- loki_patch/load_patch.c
++++ loki_patch/load_patch.c
+@@ -8,7 +8,7 @@
+ #include "load_patch.h"
+ #include "log_output.h"
+ 
+-#define BASE "patchdata"
++#define BASE "data"
+ 
+ 
+ int load_add_file(FILE *file, int *line_num, const char *dst, loki_patch *patch)
diff --git a/games-util/loki_patch/loki_patch-20091105.ebuild b/games-util/loki_patch/loki_patch-20091105.ebuild
new file mode 100644
index 000000000000..b3084027a98d
--- /dev/null
+++ b/games-util/loki_patch/loki_patch-20091105.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Loki Software binary patch tool"
+HOMEPAGE="http://www.icculus.org/loki_setup/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	mirror://gentoo/loki_setupdb-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-util/xdelta:0
+	dev-libs/libxml2
+	dev-libs/glib:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-patchdata.patch
+	cd loki_setupdb
+	eautoreconf
+	cd "${S}"/${PN}
+	eautoreconf
+}
+
+src_configure() {
+	cd loki_setupdb
+	econf
+	cd "${S}"/${PN}
+	econf
+}
+
+src_compile() {
+	emake -C loki_setupdb
+	emake -C loki_patch
+}
+
+src_install() {
+	cd ${PN}
+	dobin loki_patch make_patch
+	dodoc CHANGES NOTES README TODO
+}
diff --git a/games-util/loki_patch/metadata.xml b/games-util/loki_patch/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-util/loki_patch/metadata.xml
@@ -0,0 +1,8 @@
+<?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-util/lutris-0.4.14 b/games-util/lutris-0.4.14
deleted file mode 100644
index f559956c62da..000000000000
--- a/games-util/lutris-0.4.14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=python_targets_python3_4? ( dev-lang/python:3.4[sqlite,threads] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite,threads] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite,threads] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4
-DESCRIPTION=Lutris is an open source gaming platform for GNU/Linux.
-EAPI=6
-HOMEPAGE=https://lutris.net/
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/dbus-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-evdev[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-libs/libsoup x11-apps/xrandr x11-apps/xgamma python_targets_python3_4? ( dev-lang/python:3.4[sqlite,threads] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite,threads] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite,threads] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/lutris/lutris/archive/v0.4.14.tar.gz -> lutris-0.4.14.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e9e868639fcdce736e244929a0616209
diff --git a/games-util/lutris-9999 b/games-util/lutris-9999
deleted file mode 100644
index 6779fc9926ec..000000000000
--- a/games-util/lutris-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=python_targets_python3_4? ( dev-lang/python:3.4[sqlite,threads] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite,threads] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite,threads] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Lutris is an open source gaming platform for GNU/Linux.
-EAPI=6
-HOMEPAGE=https://lutris.net/
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-LICENSE=GPL-3
-RDEPEND=dev-python/dbus-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-evdev[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-libs/libsoup x11-apps/xrandr x11-apps/xgamma python_targets_python3_4? ( dev-lang/python:3.4[sqlite,threads] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite,threads] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite,threads] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e9e868639fcdce736e244929a0616209
diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
new file mode 100644
index 000000000000..3842086bdb15
--- /dev/null
+++ b/games-util/lutris/Manifest
@@ -0,0 +1,4 @@
+DIST lutris-0.4.14.tar.gz 1617493 BLAKE2B c97d0e31657252c4ae5c6718151f028d273831cdb9f21b748ada651686cf3aa51a618a007db87528d84f21dca292509399f9bb1f0c0444c57e369b13b9ae79a0 SHA512 d229d7f79b3395db22ad49abc02ca5e08db9465258be33fcefe743c0a099e1ca507b6b9c28f03d2a6857489f7f2e19fca38803f6876df88a96b060ed5f7f94bc
+EBUILD lutris-0.4.14.ebuild 1377 BLAKE2B 6228490d33bc2e502ed40995bf281813e5367300b7d189f68b287908bc4905001a4e6fb650f2d3c44aa763b1e4e28ba803d466ec8f344c62c8295133105812a7 SHA512 9894d39b9504ee331f7b171509b6cb7bafcec16e10613fe0742da169d82d3290df912bf8eecfa67cb24991d13a39f138f3dcdd59aa93123c6ed8cdf839b1be62
+EBUILD lutris-9999.ebuild 1377 BLAKE2B 6228490d33bc2e502ed40995bf281813e5367300b7d189f68b287908bc4905001a4e6fb650f2d3c44aa763b1e4e28ba803d466ec8f344c62c8295133105812a7 SHA512 9894d39b9504ee331f7b171509b6cb7bafcec16e10613fe0742da169d82d3290df912bf8eecfa67cb24991d13a39f138f3dcdd59aa93123c6ed8cdf839b1be62
+MISC metadata.xml 879 BLAKE2B 082e00a4612390060819b18444b1cb45bc2bf1506ff97306aaeb9adbf6aaa955da7babcff1e2a6841900f320406253834cebe2f2c796e86adea31c99e04b5955 SHA512 fadab7841251b491ebe8407645f10bb998ec26668f66f1ead21b11b9eead466648e49fe7f1054bc7d28bcf5a9bb2beddc0899e2047051c6c1e71f0b95408198d
diff --git a/games-util/lutris/lutris-0.4.14.ebuild b/games-util/lutris/lutris-0.4.14.ebuild
new file mode 100644
index 000000000000..960cafec846a
--- /dev/null
+++ b/games-util/lutris/lutris-0.4.14.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="sqlite,threads"
+
+inherit distutils-r1 gnome2-utils python-r1
+
+DESCRIPTION="Lutris is an open source gaming platform for GNU/Linux."
+HOMEPAGE="https://lutris.net/"
+
+if [[ "${PV}" == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/lutris/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/lutris/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/python-evdev[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	net-libs/libsoup
+	x11-apps/xrandr
+	x11-apps/xgamma"
+
+python_install() {
+	distutils-r1_python_install
+}
+
+src_prepare() {
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+src_install() {
+	# README.rst contains list of optional deps
+	DOCS=( AUTHORS README.rst INSTALL.rst )
+	distutils-r1_src_install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+
+	elog "For a list of optional dependencies (runners) see:"
+	elog "/usr/share/doc/${PF}/README.rst.bz2"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/games-util/lutris/lutris-9999.ebuild b/games-util/lutris/lutris-9999.ebuild
new file mode 100644
index 000000000000..960cafec846a
--- /dev/null
+++ b/games-util/lutris/lutris-9999.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="sqlite,threads"
+
+inherit distutils-r1 gnome2-utils python-r1
+
+DESCRIPTION="Lutris is an open source gaming platform for GNU/Linux."
+HOMEPAGE="https://lutris.net/"
+
+if [[ "${PV}" == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/lutris/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/lutris/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/python-evdev[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	net-libs/libsoup
+	x11-apps/xrandr
+	x11-apps/xgamma"
+
+python_install() {
+	distutils-r1_python_install
+}
+
+src_prepare() {
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+src_install() {
+	# README.rst contains list of optional deps
+	DOCS=( AUTHORS README.rst INSTALL.rst )
+	distutils-r1_src_install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+
+	elog "For a list of optional dependencies (runners) see:"
+	elog "/usr/share/doc/${PF}/README.rst.bz2"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/games-util/lutris/metadata.xml b/games-util/lutris/metadata.xml
new file mode 100644
index 000000000000..036f019d61d2
--- /dev/null
+++ b/games-util/lutris/metadata.xml
@@ -0,0 +1,26 @@
+<?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>
+	<maintainer type="person">
+		<email>fdsfgs@krutt.org</email>
+		<name>soredake</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		Lutris is a gaming platform for GNU/Linux. Its goal is to make
+		gaming on Linux as easy as possible by taking care of installing
+		and setting up the game for the user. The only thing you have to
+		do is play the game. It aims to support every game that is playable
+		on Linux.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">lutris/lutris</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-util/mcrcon-0.0.5-r1 b/games-util/mcrcon-0.0.5-r1
deleted file mode 100644
index 33a0d0fa50b2..000000000000
--- a/games-util/mcrcon-0.0.5-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Remote connection client for Minecraft servers
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/mcrcon/
-KEYWORDS=~amd64
-LICENSE=ZLIB
-SLOT=0
-SRC_URI=mirror://sourceforge/mcrcon/mcrcon-0.0.5-src.zip
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=1d4fdc7b809b4133c41a9c52957e5c50
diff --git a/games-util/mcrcon/Manifest b/games-util/mcrcon/Manifest
new file mode 100644
index 000000000000..a309b006c5ea
--- /dev/null
+++ b/games-util/mcrcon/Manifest
@@ -0,0 +1,3 @@
+DIST mcrcon-0.0.5-src.zip 9748 BLAKE2B 27f209a51e0131f00a1d84b859301a5e0440c9fb857c9112c98c34749c9ab1dda3065d7d748e7a6385e034d3d349a9394cf547a42d2bf5ae3376276695c60994 SHA512 590da8007d630a9ff5332b5fda9e2498e949b4085e16fd00a4b1f693251980bc2d91736ea8ca7c649ee34b28484d165c8b5f45b1830e9fb661bec3a10af080d2
+EBUILD mcrcon-0.0.5-r1.ebuild 564 BLAKE2B c927d344ac0b18430605b6d12c199c9d292bd0676c02051df3be2569490acf7c3065b893af226aee90d5bdaf29a616a38762daa8f5a0d4eebc3a1556e5cc83e6 SHA512 9dd2b75ed31a5f16855152e9a8e0c9d92d877e14c9c9963054503adf5ff11fbcc392dd067d89392c6ef8bdd694bccf6abdb763355362711f37399274f8665b09
+MISC metadata.xml 641 BLAKE2B c49d0cee907fab7f95d8161935dde49ba43d9fcc115f98f909b35f505ed593822bc9f3666f2efc339cffd7f7b3d01b6700bb893e22d9d4c8b45f9d0dffa12dcb SHA512 adb906c501126b769de78c11ebb7bc36555327696f9d68ecdf6d8a311b4ddc89fdc370640eea04591349087e9d386e5ed99e95b71bc1380fa04f9a0072387bf4
diff --git a/games-util/mcrcon/mcrcon-0.0.5-r1.ebuild b/games-util/mcrcon/mcrcon-0.0.5-r1.ebuild
new file mode 100644
index 000000000000..01c42e501eda
--- /dev/null
+++ b/games-util/mcrcon/mcrcon-0.0.5-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Remote connection client for Minecraft servers"
+HOMEPAGE="https://sourceforge.net/projects/mcrcon/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_compile() {
+	# Flags taken from COMPILING.txt.
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -std=gnu11 -pedantic -Wall -Wextra -o "${PN}" "${PN}.c" || die
+}
+
+src_install() {
+	default
+	dobin "${PN}"
+}
diff --git a/games-util/mcrcon/metadata.xml b/games-util/mcrcon/metadata.xml
new file mode 100644
index 000000000000..e7f8f4b0d06d
--- /dev/null
+++ b/games-util/mcrcon/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+	<longdescription>mcrcon is an IPv6 compliant Minecraft rcon client with Bukkit coloring support. It is well suited for remote administration and to be used as part of automated server maintenance scripts. Does not trigger the "IO: Broken pipe" or "IO: Connection reset" spam bug on the server side.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">mcrcon</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-util/metadata.xml b/games-util/metadata.xml
new file mode 100644
index 000000000000..e3106a742d7d
--- /dev/null
+++ b/games-util/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The games-util category contains various game-related utilities.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie games-util enthält verschiede Tools rund um Spiele.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría games-util contiene varias utilidades relacionadas con
+		juegos.
+	</longdescription>
+	<longdescription lang="ja">
+		games-utilカテゴリーにはゲームに関連した様々なユーティリティが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De games-util categorie bevat hulpmiddelen voor bepaalde spellen.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm games-util chứa các tiện ích linh tinh liên quan đến các trò chơi.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria games-util contiene varie utilità per i giochi.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria games-util contém vários utilitários relacionados a
+		jogos.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria games-util zawiera narządzia związane z grami.
+	</longdescription>
+</catmetadata>
+
diff --git a/games-util/nml-0.4.4-r1 b/games-util/nml-0.4.4-r1
deleted file mode 100644
index 79ce23f0baef..000000000000
--- a/games-util/nml-0.4.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pillow[zlib,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ply[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Compiler of NML files into grf/nfo files
-EAPI=6
-HOMEPAGE=https://dev.openttdcoop.org/projects/nml
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-python/pillow[zlib,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ply[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=http://bundles.openttdcoop.org/nml/releases/0.4.4/nml-0.4.4.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=abba9b2d8c5d56d05cd8fd3f28df5bc8
diff --git a/games-util/nml-0.4.5 b/games-util/nml-0.4.5
deleted file mode 100644
index 5a91a4e18d5c..000000000000
--- a/games-util/nml-0.4.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pillow[zlib,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ply[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Compiler of NML files into grf/nfo files
-EAPI=7
-HOMEPAGE=https://dev.openttdcoop.org/projects/nml
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-python/pillow[zlib,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ply[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=http://bundles.openttdcoop.org/nml/releases/0.4.5/nml-0.4.5.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=928d5d2092bede9f2bdf2902e16a5588
diff --git a/games-util/nml/Manifest b/games-util/nml/Manifest
new file mode 100644
index 000000000000..9bf7299e2e8a
--- /dev/null
+++ b/games-util/nml/Manifest
@@ -0,0 +1,6 @@
+AUX nml-0.4.4-pillow3.patch 288 BLAKE2B 5d1446821d75432002a36439c6e39fa7f644f9a63be0da178c33287893fe65637d6ce66aa55df916227636cb8e0228a08e363a0b682b02dc63823a671b50849c SHA512 cdb6113102fadbf3b3d9cab930b15cfd88d609c9bb09048a3fb247051169933a0796c10d0c29b9d6bf9320ddcf73a4681255d8e1465a7a98268029d3433ba524
+DIST nml-0.4.4.tar.gz 377998 BLAKE2B a65df2c371c1b1dda2469a968372f21f9f27e9739c8d8a9a0f582c126169921ee3ffc9745f6ef4ac21aebdeea35fd26385d3149e84d50381c4796b71b378571f SHA512 fd7b8d7abfc8b5ea694eedf00bbc4069a82de942178a58ec05e9d3efe7c8663103ffb6b98f7614ce165eb7cba42cb4c7589f77fb67dd95eb6293f62b3179c7b0
+DIST nml-0.4.5.tar.gz 378578 BLAKE2B 1283cdcabd4cbaf12dda926b89c88a3942e9e4469879812abe372facd2c41ff20af0df792bbdadf71d9d3ad8d72e98e293fd903c880e77d3e4ee8a1b73e36ca9 SHA512 64b2f46a1c2e37fce8f51231094e30334f368b0db39c6a3977a144a798d8034d1abbe7c14af3921eb81f4b7caa193e7e53ccb9e27acd113e0407926b109ca952
+EBUILD nml-0.4.4-r1.ebuild 699 BLAKE2B 73334bef1122002b0aecbe5834c4f09ef093774ef9cf09872bdf1a934d1d748d671e07fa70734e77a014c9d226daae95bc9180300ef0a2a92464129f801f8d60 SHA512 e2b0db49d56dc6e3df8ddf90cacd8e71b9a6d6231cb5e1789ece9d683183c49831f5f0b2a4d5f34706189e4d159732efc7a3002f03cfdd26874e856aba08512b
+EBUILD nml-0.4.5.ebuild 706 BLAKE2B b8f3ebffc7d7d04d83b7dbc1a3a2c9862fa610f34c3eb34099db526fcafee67487f76787a5e3bdbd5185194e00f7d3b8f1753a975893ace6b5d62870c33ccc7c SHA512 c177b8a6213cb3b39205819fa0fbd26e4af921cb48d71ee3a5ec6ec831700b56b34cc735de59c45729c4280c6fffc70462c423cd9e01e2fcd6f0dd6604799625
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/nml/files/nml-0.4.4-pillow3.patch b/games-util/nml/files/nml-0.4.4-pillow3.patch
new file mode 100644
index 000000000000..e55d989fbc1b
--- /dev/null
+++ b/games-util/nml/files/nml-0.4.4-pillow3.patch
@@ -0,0 +1,11 @@
+--- nml-0.4.4.orig/nml/lz77.py
++++ nml-0.4.4/nml/lz77.py
+@@ -25,7 +25,7 @@
+     @return: Compressed data.
+     @rtype:  C{bytearray}
+     """
+-    stream = data.tostring()
++    stream = data.tobytes()
+     position = 0
+     output = array.array('B')
+     literal_bytes = array.array('B')
diff --git a/games-util/nml/metadata.xml b/games-util/nml/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-util/nml/metadata.xml
@@ -0,0 +1,8 @@
+<?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-util/nml/nml-0.4.4-r1.ebuild b/games-util/nml/nml-0.4.4-r1.ebuild
new file mode 100644
index 000000000000..b50f0471e311
--- /dev/null
+++ b/games-util/nml/nml-0.4.4-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Compiler of NML files into grf/nfo files"
+HOMEPAGE="https://dev.openttdcoop.org/projects/nml"
+SRC_URI="http://bundles.openttdcoop.org/nml/releases/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="dev-python/pillow[zlib,${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( docs/{changelog,readme}.txt )
+PATCHES=( "${FILESDIR}"/${P}-pillow3.patch )
+
+src_install() {
+	distutils-r1_src_install
+	doman docs/nmlc.1
+}
diff --git a/games-util/nml/nml-0.4.5.ebuild b/games-util/nml/nml-0.4.5.ebuild
new file mode 100644
index 000000000000..ce56b6ea5532
--- /dev/null
+++ b/games-util/nml/nml-0.4.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Compiler of NML files into grf/nfo files"
+HOMEPAGE="https://dev.openttdcoop.org/projects/nml"
+SRC_URI="http://bundles.openttdcoop.org/nml/releases/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="dev-python/pillow[zlib,${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS=( docs/{changelog,readme}.txt )
+PATCHES=( "${FILESDIR}"/${PN}-0.4.4-pillow3.patch )
+
+src_install() {
+	distutils-r1_src_install
+	doman docs/nmlc.1
+}
diff --git a/games-util/pogo-manager-bin-0.1.6 b/games-util/pogo-manager-bin-0.1.6
deleted file mode 100644
index a1f0c57c0cb5..000000000000
--- a/games-util/pogo-manager-bin-0.1.6
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=app-arch/unzip
-DESCRIPTION=Pokemon Go manager
-EAPI=6
-HOMEPAGE=https://github.com/Wolfsblvt/BlossomsPokemonGoManager
-KEYWORDS=amd64 ~x86
-LICENSE=CC-BY-NC-SA-4.0
-RDEPEND=|| ( dev-java/oracle-jdk-bin:1.8[javafx] dev-java/oracle-jre-bin:1.8[javafx] )
-SLOT=0
-SRC_URI=https://github.com/Wolfsblvt/BlossomsPokemonGoManager/releases/download/v0.1.6/BPGM_v0.1.6.zip -> pogo-manager-bin-0.1.6.zip
-_md5_=a110d7c5dc2c6c4e1e926275b5d7feba
diff --git a/games-util/pogo-manager-bin-0.1.7 b/games-util/pogo-manager-bin-0.1.7
deleted file mode 100644
index 7b6c8cf52ab5..000000000000
--- a/games-util/pogo-manager-bin-0.1.7
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=app-arch/unzip
-DESCRIPTION=Pokemon Go manager
-EAPI=6
-HOMEPAGE=https://github.com/Wolfsblvt/BlossomsPokemonGoManager
-KEYWORDS=~amd64 ~x86
-LICENSE=CC-BY-NC-SA-4.0
-RDEPEND=|| ( dev-java/oracle-jdk-bin:1.8[javafx] dev-java/oracle-jre-bin:1.8[javafx] )
-SLOT=0
-SRC_URI=https://github.com/Wolfsblvt/BlossomsPokemonGoManager/releases/download/v0.1.7/BPGM_v0.1.7.zip -> pogo-manager-bin-0.1.7.zip
-_md5_=5ba5da3cc06312fc7cf7953a7bfe8eb8
diff --git a/games-util/pogo-manager-bin/Manifest b/games-util/pogo-manager-bin/Manifest
new file mode 100644
index 000000000000..d6b512db1be0
--- /dev/null
+++ b/games-util/pogo-manager-bin/Manifest
@@ -0,0 +1,6 @@
+AUX pogo-manager 485 BLAKE2B adfc003c723b021685f9d0f5d1dd8201a1bc433091992a651c9008e6249738df81f910229cafeb85199c4818336dff78d268a9a441541e3fb1a8aa9b7cd16043 SHA512 d95abdc10df5aefca0e84a4fc39d2da62a78d82cd076ad899c0b602f639f500a13ddd3f0c1477b6ef9cc8524859cd5d72aeb827d4f1cf0b805c6a247d45c8edf
+DIST pogo-manager-bin-0.1.6.zip 7703380 BLAKE2B f50c8a96a3b93a1c0036918a24ae8b7426659327648fb249db7460d83f053393c7e7d5723abb8553135bb46c4fdea2fcf07297aa77b870d0de9a4749596a71fe SHA512 d09e5f905fad659b5f380c25e8ccb7f9423430a1210ebb15e233f7f9436dff0307897ce372fdedf1b44ff48bd682b1f991a5fa3ac28a98af18d2a2bec72b08b0
+DIST pogo-manager-bin-0.1.7.zip 7978366 BLAKE2B a9e9b9460a50adb7964ba887a89c427b7344745c84d70711dbf372c942fb6829437eddb093fbef9b2c8b2231f3c06689d163c6ec0418d3ca9a7d8f105d35306b SHA512 6d43626d0b7edb756d0a36b8114782ea78bd87fe1f4bdcd78c8d724961ad1635042ab8e0e7f489c5c5cf8b09fa14788c701a14eb5bdce1cf21ed95c3e97fa90a
+EBUILD pogo-manager-bin-0.1.6.ebuild 813 BLAKE2B 77348ed0188581e2a4702bc22630376d97fe11feb42bb471d0c96d161830dca8072825bfcb0e063eaf76dd9d9966add92bfdf9c432e1d1ac6884c47a212de905 SHA512 02e77126376f2b4877c48dee79177b71df2b0f1a18b2d93aa2f88dc28dd2612a2ba40c0929a6ed8398668ba61b641ca4efc6486aa28c777f3dabade49658355d
+EBUILD pogo-manager-bin-0.1.7.ebuild 814 BLAKE2B 9d45605e1fbc2b3ad46362800f16a1615b2865169af60737450139017981b437c549dcfb06df5f93d6ab06680aeb530b2d78eadd9fb64351e32b53a5f9b5f3ef SHA512 2c530bc42be1263c008a71c980947ea3460f473525b1175f559b4c1e60140e94243913249edbe9a6722f6507bc7544406f252c89c5a692dc1dfb7806d371f88c
+MISC metadata.xml 490 BLAKE2B cd6b153e8bbdf8c7b75c67e7236a107044ec2d9bee6db08256262b45457673bf9d55671da6d4bdb707f0187860e812f871c1f7769708544fc32ff30d014876c3 SHA512 e2b41bf4dbebfa0f1f26f0856fe291dedf7553c059b9d2d2049dc97eb9a6e0655d631fe41efc52aa67dfad5d6338548ff4602f3c6695ffbc5eb0068ce5ed446c
diff --git a/games-util/pogo-manager-bin/files/pogo-manager b/games-util/pogo-manager-bin/files/pogo-manager
new file mode 100644
index 000000000000..9866fec91a84
--- /dev/null
+++ b/games-util/pogo-manager-bin/files/pogo-manager
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Config files are written to current directory, so make a config dir and pushd there
+
+if [[ ! -z "${XDG_CONFIG_DIR}" ]] ; then
+    config_dir="${XDG_CONFIG_DIR}/pogo-manager"
+elif [[ ! -z "${HOME}" ]] ; then
+    config_dir="${HOME}/.config/pogo-manager"
+else
+    config_dir="$(mktemp -d)"
+fi
+
+echo "Using ${config_dir} for configuration files"
+mkdir -p "${config_dir}"
+pushd "${config_dir}" > /dev/null
+java -Dfile.encoding=UTF-8 -jar /opt/pogo-manager/pogo-manager.jar
+
diff --git a/games-util/pogo-manager-bin/metadata.xml b/games-util/pogo-manager-bin/metadata.xml
new file mode 100644
index 000000000000..591d99816ca6
--- /dev/null
+++ b/games-util/pogo-manager-bin/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>wizardedit@gentoo.org</email>
+    <name>Austin English</name>
+  </maintainer>
+  <longdescription>
+ Utility to manage Pokemon Go accounts. Not sanctioned by Niantic, use at your own risk.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">Wolfsblvt/BlossomsPokemonGoManager</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/games-util/pogo-manager-bin/pogo-manager-bin-0.1.6.ebuild b/games-util/pogo-manager-bin/pogo-manager-bin-0.1.6.ebuild
new file mode 100644
index 000000000000..a58f94b84142
--- /dev/null
+++ b/games-util/pogo-manager-bin/pogo-manager-bin-0.1.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/-bin}"
+
+DESCRIPTION="Pokemon Go manager"
+HOMEPAGE="https://github.com/Wolfsblvt/BlossomsPokemonGoManager"
+SRC_URI="https://github.com/Wolfsblvt/BlossomsPokemonGoManager/releases/download/v${PV}/BPGM_v${PV}.zip -> ${P}.zip"
+
+LICENSE="CC-BY-NC-SA-4.0"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE=""
+
+RDEPEND="|| ( dev-java/oracle-jdk-bin:1.8[javafx] dev-java/oracle-jre-bin:1.8[javafx] )"
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}/BPGM_v${PV}"
+
+src_install()
+{
+	insinto /opt/${MY_PN}
+	newins BlossomsPogoManager.jar ${MY_PN}.jar
+
+	dobin "${FILESDIR}/pogo-manager"
+}
+
+pkg_postinst()
+{
+	ewarn "Use of this tool is not sanctioned by Niantic and could get you banned."
+	ewarn "You have been warned!"
+}
diff --git a/games-util/pogo-manager-bin/pogo-manager-bin-0.1.7.ebuild b/games-util/pogo-manager-bin/pogo-manager-bin-0.1.7.ebuild
new file mode 100644
index 000000000000..5d4eb27d04bc
--- /dev/null
+++ b/games-util/pogo-manager-bin/pogo-manager-bin-0.1.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/-bin}"
+
+DESCRIPTION="Pokemon Go manager"
+HOMEPAGE="https://github.com/Wolfsblvt/BlossomsPokemonGoManager"
+SRC_URI="https://github.com/Wolfsblvt/BlossomsPokemonGoManager/releases/download/v${PV}/BPGM_v${PV}.zip -> ${P}.zip"
+
+LICENSE="CC-BY-NC-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="|| ( dev-java/oracle-jdk-bin:1.8[javafx] dev-java/oracle-jre-bin:1.8[javafx] )"
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}/BPGM_v${PV}"
+
+src_install()
+{
+	insinto /opt/${MY_PN}
+	newins BlossomsPogoManager.jar ${MY_PN}.jar
+
+	dobin "${FILESDIR}/pogo-manager"
+}
+
+pkg_postinst()
+{
+	ewarn "Use of this tool is not sanctioned by Niantic and could get you banned."
+	ewarn "You have been warned!"
+}
diff --git a/games-util/pyfa-1.34.0 b/games-util/pyfa-1.34.0
deleted file mode 100644
index f1ac69bbaf10..000000000000
--- a/games-util/pyfa-1.34.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=app-arch/zip >=sys-apps/sed-4
-DESCRIPTION=Python Fitting Assistant - a ship fitting application for EVE Online
-EAPI=6
-HOMEPAGE=https://github.com/pyfa-org/Pyfa
-IUSE=+graph python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm
-RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-1.0.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/logbook-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] graph? ( dev-python/matplotlib[wxwidgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/pyfa-org/Pyfa/archive/v1.34.0.tar.gz -> pyfa-1.34.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=194ca9d03f8e46b6b06bcd7024fe45c1
diff --git a/games-util/pyfa-1.35.0 b/games-util/pyfa-1.35.0
deleted file mode 100644
index 4148b328a73c..000000000000
--- a/games-util/pyfa-1.35.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=app-arch/zip >=sys-apps/sed-4
-DESCRIPTION=Python Fitting Assistant - a ship fitting application for EVE Online
-EAPI=6
-HOMEPAGE=https://github.com/pyfa-org/Pyfa
-IUSE=+graph python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm
-RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-1.0.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/logbook-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] graph? ( dev-python/matplotlib[wxwidgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/pyfa-org/Pyfa/archive/v1.35.0.tar.gz -> pyfa-1.35.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a8bb210125c6b341cb4b0d5ce8dcfa2d
diff --git a/games-util/pyfa-1.35.1 b/games-util/pyfa-1.35.1
deleted file mode 100644
index 9bc58c4f3813..000000000000
--- a/games-util/pyfa-1.35.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=app-arch/zip >=sys-apps/sed-4
-DESCRIPTION=Python Fitting Assistant - a ship fitting application for EVE Online
-EAPI=6
-HOMEPAGE=https://github.com/pyfa-org/Pyfa
-IUSE=+graph python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm
-RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-1.0.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/logbook-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] graph? ( dev-python/matplotlib[wxwidgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/pyfa-org/Pyfa/archive/v1.35.1.tar.gz -> pyfa-1.35.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a8bb210125c6b341cb4b0d5ce8dcfa2d
diff --git a/games-util/pyfa-1.37.0 b/games-util/pyfa-1.37.0
deleted file mode 100644
index eb51fe5ffc4f..000000000000
--- a/games-util/pyfa-1.37.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=app-arch/zip >=sys-apps/sed-4
-DESCRIPTION=Python Fitting Assistant - a ship fitting application for EVE Online
-EAPI=6
-HOMEPAGE=https://github.com/pyfa-org/Pyfa
-IUSE=+graph python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+ all-rights-reserved
-RDEPEND=>=dev-python/logbook-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-1.0.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] graph? ( dev-python/matplotlib[wxwidgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=https://github.com/pyfa-org/Pyfa/archive/v1.37.0.tar.gz -> pyfa-1.37.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=03715b56af326c78713929b5609311a7
diff --git a/games-util/pyfa-9999 b/games-util/pyfa-9999
deleted file mode 100644
index 4b2d8664d6cd..000000000000
--- a/games-util/pyfa-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DEPEND=app-arch/zip >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Python Fitting Assistant - a ship fitting application for EVE Online
-EAPI=6
-HOMEPAGE=https://github.com/pyfa-org/Pyfa
-IUSE=+graph python_targets_python2_7
-LICENSE=GPL-3+ all-rights-reserved
-RDEPEND=>=dev-python/logbook-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-1.0.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] graph? ( dev-python/matplotlib[wxwidgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=mirror bindist
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=03715b56af326c78713929b5609311a7
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
new file mode 100644
index 000000000000..ec7bc4df56c3
--- /dev/null
+++ b/games-util/pyfa/Manifest
@@ -0,0 +1,14 @@
+AUX configforced-1.15.1.py 153 BLAKE2B 135edf54e69c985693bcdde747eba5e46f7ed1390a77e1a1d40c0a624f3605c3ec8dad2f3526cbd8f406ed39fc67d3b027b7e7e462bbfa48c5649c71f0692da6 SHA512 632576b9fbff3e93c26b6c2d4be74298aa8657affe82d2c5d571a645d733a7b96d5db6b89b819d3aec9ca68e4bef11e368f7c1cbac416e9bfed88a1025a46bfe
+AUX pyfa-1.33.1-import-pyfa.patch 685 BLAKE2B a3d45d5438203233993ca3d8edd5061ccced36e550ef47ca8c9dfae9343c2cb7c4c952a961d5f7847c21bda27aefe30d6fd38b0875c3ccc1bda8313e519c471d SHA512 a7a6d18183c3494aa4e0436c7f527312be36a298f8fc31cfac7df3d60157c1ef501f725c0c79f1ade9b053d711e14ede9a2892b824530e1cf431590c6b56395e
+AUX pyfa-1.33.1-staticdata.patch 1571 BLAKE2B ffa07ba329d3cbb5f198755fe814f431144fb30667fcfbc1102a0456c49601af37bc9ce141d80db8b961b018726acb78f38339793dee4ed654b70fd411a66bd8 SHA512 cd2c56f3805af70cc3fe294c21af5b32eea614292b8eeb856d2f36f2d7e46ce7a2f33f24115ac8af1cc2d77d39b2f7f397b495734f0ace954c61efb63b609128
+AUX pyfa.desktop 155 BLAKE2B bccfc81c4bc7dd9099ac4bd11fdb0d5f8d72b53b5dc8a700147e7e5996b14aac9e4b46e2884a473ecc8d8b1f49305e66c46cbc7e6c5e43e93e5a3fa71c5efa08 SHA512 d62a44e4e724057581a360cc1eb10aa4c7a0c50cb1d95137e58ba14db17644c852da2582be8d508c50b7359e7f99dc893d78d15cb11c46967a9b7896ff667781
+DIST pyfa-1.34.0.tar.gz 8629709 BLAKE2B 5b16296b675383a446bb21133c9e83726a92beb221babbf8fbe4b19f0f7e95bb19fd6050a5c2e3d5e602df4bbb83debfeefd6ec7efdbff35a47934ef9b29979f SHA512 4642efd4de5be4add3c3f994d7be9dbeeb231fe86229f7944d52f265527c7a79698d3da5ccac3018e02c6000b0da888ad0e64382e12f74b7dd7b3398e7bb2d48
+DIST pyfa-1.35.0.tar.gz 8743938 BLAKE2B 623a70ea8d28c41f94b5c54c3b8b57ddc6b6604f0eccaa1d9716f8b47295bfca12e2db068d3283448b2a6719a3ef73c74d42a98550a1b062e93e6d1091a45797 SHA512 28b3294e8c1d611402d4123d184d6ddf57886a51264fc25529ca3e0cd8af6d41dbe28b15c4714e591f940427651249761db8d2353006b169d358974bc691f121
+DIST pyfa-1.35.1.tar.gz 8746324 BLAKE2B f224f78c97f15d37e2276512541985bfd2ae80c031233261837cd142eddc16a853688a4f1f1f8684736f757d60fd57c41fb14987f336274b2284bd1de26239b3 SHA512 6da5e2d3351157f35c32c7b210d8bfb86a9dc2ea3a3df02449950c498ffabecff3a48fe38086dce75ec5a2cc2549dd28b474015edc0ea01c56a2ff58d1ba3f69
+DIST pyfa-1.37.0.tar.gz 8795428 BLAKE2B 33aa0159b41fe2f228be13788f4e91933205a1883af229ffa97af0816dbce307fa8ce9ebc53b335a99decb84f9a28e83b977daf3c600df1cdd0336ba2c413ba3 SHA512 21094a1c374a60447e38261762ee13cd212f6af5f8d757c8b626774fb5a10d10e99267da1311d3164664b62169edd2772519a7b4ebd7414db2493f5121df5c8c
+EBUILD pyfa-1.34.0.ebuild 2697 BLAKE2B 71befdff7b877943da1c58af9905f9318539956c703f0d6fccf195138842b9e4fc7a57f04dd3de1d6be01d2bd2efc28cfb659612b723a3bf422ca72e51224358 SHA512 5184f4207c8c0d02c52b5265fff0f393f6f871c2b8b1ba0d29835a252d57305bdcf5957053e705b49b2e2a6ec5db8c7f953f3b884ff848ef5a7643d10c3ddb28
+EBUILD pyfa-1.35.0.ebuild 2693 BLAKE2B cfad57e838b2f6fb1f5071a750bba9a6eca9da1d7c8a5306017d1f9486c14948ba6a84cc2be706d360e134da7ac81b51f914d4342769043d884dce4c5b091985 SHA512 46d5c45fc04385cca35eea00c12d6ac0356ebf2e4bb721334b89c21a556f9d45c37fa29d61546062055beca041a6af63431fbee3fa701a18d722d50a5db2bce6
+EBUILD pyfa-1.35.1.ebuild 2693 BLAKE2B cfad57e838b2f6fb1f5071a750bba9a6eca9da1d7c8a5306017d1f9486c14948ba6a84cc2be706d360e134da7ac81b51f914d4342769043d884dce4c5b091985 SHA512 46d5c45fc04385cca35eea00c12d6ac0356ebf2e4bb721334b89c21a556f9d45c37fa29d61546062055beca041a6af63431fbee3fa701a18d722d50a5db2bce6
+EBUILD pyfa-1.37.0.ebuild 2623 BLAKE2B dfdab3bb7422a9006d515d9896ab5820c91a398a6e6c18734acdbbe4771ed796f4c961fa4e20d40df8b97153ed3c6749e225521f9a733999e07fe28368fdbf04 SHA512 bbf89fb71da7084075a26f058d82bacb5216c3f42f23645ce6dbd56edbf676ee3194034216bdf0baf862ec822d49911c4c53d4eacfcdc35cf29610e21911b7cc
+EBUILD pyfa-9999.ebuild 2623 BLAKE2B dfdab3bb7422a9006d515d9896ab5820c91a398a6e6c18734acdbbe4771ed796f4c961fa4e20d40df8b97153ed3c6749e225521f9a733999e07fe28368fdbf04 SHA512 bbf89fb71da7084075a26f058d82bacb5216c3f42f23645ce6dbd56edbf676ee3194034216bdf0baf862ec822d49911c4c53d4eacfcdc35cf29610e21911b7cc
+MISC metadata.xml 817 BLAKE2B 3756e4c4cd95064bfdfb74ffccbc1162b457e620cd4b99f1c4c04943443a83cec1a5642056f219dfc090c37a230dfadc07dacd0e6f2d7a9380804e951c1d8c86 SHA512 3323fe99b3a0768fddc07ae1ca23e099e8097717c382ec9a9cd2f63b293f6caf8d9164140548f2a4b2754e925d1e1302ba1a56c0320eb343f5a7ff0206d88811
diff --git a/games-util/pyfa/files/configforced-1.15.1.py b/games-util/pyfa/files/configforced-1.15.1.py
new file mode 100644
index 000000000000..51fcb958cedc
--- /dev/null
+++ b/games-util/pyfa/files/configforced-1.15.1.py
@@ -0,0 +1,4 @@
+# Gentoo-specific settings
+pyfaPath = u'%%SITEDIR%%/pyfa'
+gameDB = u'%%EPREFIX%%/usr/share/pyfa/eve.db'
+imgsZIP = u'%%EPREFIX%%/usr/share/pyfa/imgs.zip'
diff --git a/games-util/pyfa/files/pyfa-1.33.1-import-pyfa.patch b/games-util/pyfa/files/pyfa-1.33.1-import-pyfa.patch
new file mode 100644
index 000000000000..0c71ce69f720
--- /dev/null
+++ b/games-util/pyfa/files/pyfa-1.33.1-import-pyfa.patch
@@ -0,0 +1,28 @@
+From c35467378232b1b21cca304f5dba37c687e51bca Mon Sep 17 00:00:00 2001
+From: Andreas Zuber <zuber@puzzle.ch>
+Date: Mon, 30 Oct 2017 09:52:32 +0100
+Subject: [PATCH 2/3] import pyfa
+
+Append $(python_get_sitedir)/pyfa to import path
+
+Ensures that pyfa's import statements continue to work for systemwide
+installation.
+---
+ pyfa.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/pyfa.py b/pyfa.py
+index 4faa1edd..9cfa5e23 100755
+--- a/pyfa.py
++++ b/pyfa.py
+@@ -23,6 +23,7 @@ import os
+ import platform
+ import re
+ import sys
++sys.path.append(os.path.join("%%SITEDIR%%", "pyfa"))
+ import traceback
+ from optparse import AmbiguousOptionError, BadOptionError, OptionParser
+ 
+-- 
+2.14.3
+
diff --git a/games-util/pyfa/files/pyfa-1.33.1-staticdata.patch b/games-util/pyfa/files/pyfa-1.33.1-staticdata.patch
new file mode 100644
index 000000000000..76a705e2c832
--- /dev/null
+++ b/games-util/pyfa/files/pyfa-1.33.1-staticdata.patch
@@ -0,0 +1,59 @@
+From 54f0cd42c6f022e010c63ba7b1f123f78001b490 Mon Sep 17 00:00:00 2001
+From: Andreas Zuber <zuber@puzzle.ch>
+Date: Mon, 30 Oct 2017 09:53:31 +0100
+Subject: [PATCH 3/3] staticdata
+
+make gameDB and imgs.zip paths settable from configforced
+---
+ config.py           | 7 +++++++
+ gui/bitmapLoader.py | 2 +-
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/config.py b/config.py
+index b15c30a3..a5a07acb 100644
+--- a/config.py
++++ b/config.py
+@@ -30,6 +30,7 @@ savePath = None
+ saveDB = None
+ gameDB = None
+ logPath = None
++imgsZIP = None
+ 
+ 
+ def isFrozen():
+@@ -61,6 +62,7 @@ def defPaths(customSavePath):
+     global savePath
+     global saveDB
+     global gameDB
++    global imgsZIP
+     global saveInRoot
+ 
+     pyfalog.debug("Configuring Pyfa")
+@@ -100,6 +102,11 @@ def defPaths(customSavePath):
+     if not gameDB:
+         gameDB = os.path.join(pyfaPath, "eve.db")
+ 
++    imgsZIP = getattr(configforced, "imgsZIP", imgsZIP)
++    if not imgsZIP:
++        imgsZIP = os.path.join(pyfaPath, "imgs.zip")
++
++
+     # DON'T MODIFY ANYTHING BELOW
+     import eos.config
+ 
+diff --git a/gui/bitmapLoader.py b/gui/bitmapLoader.py
+index eb53b1f1..86036001 100644
+--- a/gui/bitmapLoader.py
++++ b/gui/bitmapLoader.py
+@@ -37,7 +37,7 @@ except ImportError:
+ 
+ class BitmapLoader(object):
+     try:
+-        archive = zipfile.ZipFile(os.path.join(config.pyfaPath, 'imgs.zip'), 'r')
++        archive = zipfile.ZipFile(config.imgsZIP, 'r')
+         logging.info("Using zipped image files.")
+     except IOError:
+         logging.info("Using local image files.")
+-- 
+2.14.3
+
diff --git a/games-util/pyfa/files/pyfa.desktop b/games-util/pyfa/files/pyfa.desktop
new file mode 100644
index 000000000000..07f3f0ee22a7
--- /dev/null
+++ b/games-util/pyfa/files/pyfa.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Pyfa
+Comment=Ship fitting application for EVE Online
+Icon=pyfa
+Terminal=false
+Type=Application
+Categories=Game;RolePlaying;
+Exec=pyfa
diff --git a/games-util/pyfa/metadata.xml b/games-util/pyfa/metadata.xml
new file mode 100644
index 000000000000..c556f4ff0717
--- /dev/null
+++ b/games-util/pyfa/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>a.zuber@gmx.ch</email>
+    <name>Andreas Zuber</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription lang="en">
+Pyfa is the Python Fitting Assistant, a standalone application for creating
+fittings for the EVE Online SciFi MMORPG. It provides many advanced features
+such as graphs and full calculations of any possible combination of modules,
+fits, etc.
+</longdescription>
+  <use>
+    <flag name="graph">Enable support for graphs</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">pyfa-org/Pyfa</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/games-util/pyfa/pyfa-1.34.0.ebuild b/games-util/pyfa/pyfa-1.34.0.ebuild
new file mode 100644
index 000000000000..e5a519fb0a62
--- /dev/null
+++ b/games-util/pyfa/pyfa-1.34.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,threads"
+
+inherit eutils gnome2-utils python-r1
+
+DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
+HOMEPAGE="https://github.com/pyfa-org/Pyfa"
+
+LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm"
+SLOT="0"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git"
+	inherit git-r3
+	KEYWORDS="amd64 x86"
+else
+	SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> pyfa-${PV}.tar.gz"
+	KEYWORDS="amd64 x86"
+fi
+IUSE="+graph"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.0.5[${PYTHON_USEDEP}]
+	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+	>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	graph? (
+		dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}] )
+	${PYTHON_DEPS}"
+DEPEND="app-arch/zip"
+
+[[ ${PV} = 9999 ]] || S=${WORKDIR}/Pyfa-${PV}
+
+src_prepare() {
+	# get rid of CRLF line endings introduced in 1.1.10 so patches work
+	edos2unix config.py pyfa.py gui/bitmapLoader.py service/settings.py
+
+	# load gameDB and images from separate staticdata directory
+	eapply "${FILESDIR}/${PN}-1.33.1-staticdata.patch"
+
+	# fix import path in the main script for systemwide installation
+	eapply "${FILESDIR}/${PN}-1.33.1-import-pyfa.patch"
+
+	eapply_user
+
+	touch __init__.py
+
+	pyfa_make_configforced() {
+		mkdir -p "${BUILD_DIR}" || die
+		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
+			-e "s:%%EPREFIX%%:${EPREFIX}:" \
+			"${FILESDIR}/configforced-1.15.1.py" > "${BUILD_DIR}/configforced.py"
+		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
+			pyfa.py > "${BUILD_DIR}/pyfa"
+	}
+	python_foreach_impl pyfa_make_configforced
+}
+
+src_install() {
+	pyfa_py_install() {
+		local packagedir=$(python_get_sitedir)/${PN}
+		insinto "${packagedir}"
+		doins -r eos gui service utils config*.py __init__.py
+		[[ -e info.py ]] && doins info.py # only in zip releases
+		doins "${BUILD_DIR}/configforced.py"
+		python_doscript "${BUILD_DIR}/pyfa"
+		python_optimize
+	}
+	python_foreach_impl pyfa_py_install
+
+	insinto /usr/share/${PN}
+	doins eve.db
+
+	einfo "Compressing images ..."
+	pushd imgs > /dev/null || die
+	zip -r imgs.zip * || die "zip failed"
+	doins imgs.zip
+	popd > /dev/null || die
+
+	dodoc README.md
+	doicon -s 32 imgs/gui/pyfa.png
+	newicon -s 64 imgs/gui/pyfa64.png pyfa.png
+	domenu "${FILESDIR}/${PN}.desktop"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-util/pyfa/pyfa-1.35.0.ebuild b/games-util/pyfa/pyfa-1.35.0.ebuild
new file mode 100644
index 000000000000..566b23ecc2d1
--- /dev/null
+++ b/games-util/pyfa/pyfa-1.35.0.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,threads"
+
+inherit eutils gnome2-utils python-r1
+
+DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
+HOMEPAGE="https://github.com/pyfa-org/Pyfa"
+
+LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm"
+SLOT="0"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git"
+	inherit git-r3
+	KEYWORDS="x86"
+else
+	SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> pyfa-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+IUSE="+graph"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.0.5[${PYTHON_USEDEP}]
+	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+	>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	graph? (
+		dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}] )
+	${PYTHON_DEPS}"
+DEPEND="app-arch/zip"
+
+[[ ${PV} = 9999 ]] || S=${WORKDIR}/Pyfa-${PV}
+
+src_prepare() {
+	# get rid of CRLF line endings introduced in 1.1.10 so patches work
+	edos2unix config.py pyfa.py gui/bitmapLoader.py service/settings.py
+
+	# load gameDB and images from separate staticdata directory
+	eapply "${FILESDIR}/${PN}-1.33.1-staticdata.patch"
+
+	# fix import path in the main script for systemwide installation
+	eapply "${FILESDIR}/${PN}-1.33.1-import-pyfa.patch"
+
+	eapply_user
+
+	touch __init__.py
+
+	pyfa_make_configforced() {
+		mkdir -p "${BUILD_DIR}" || die
+		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
+			-e "s:%%EPREFIX%%:${EPREFIX}:" \
+			"${FILESDIR}/configforced-1.15.1.py" > "${BUILD_DIR}/configforced.py"
+		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
+			pyfa.py > "${BUILD_DIR}/pyfa"
+	}
+	python_foreach_impl pyfa_make_configforced
+}
+
+src_install() {
+	pyfa_py_install() {
+		local packagedir=$(python_get_sitedir)/${PN}
+		insinto "${packagedir}"
+		doins -r eos gui service utils config*.py __init__.py
+		[[ -e info.py ]] && doins info.py # only in zip releases
+		doins "${BUILD_DIR}/configforced.py"
+		python_doscript "${BUILD_DIR}/pyfa"
+		python_optimize
+	}
+	python_foreach_impl pyfa_py_install
+
+	insinto /usr/share/${PN}
+	doins eve.db
+
+	einfo "Compressing images ..."
+	pushd imgs > /dev/null || die
+	zip -r imgs.zip * || die "zip failed"
+	doins imgs.zip
+	popd > /dev/null || die
+
+	dodoc README.md
+	doicon -s 32 imgs/gui/pyfa.png
+	newicon -s 64 imgs/gui/pyfa64.png pyfa.png
+	domenu "${FILESDIR}/${PN}.desktop"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-util/pyfa/pyfa-1.35.1.ebuild b/games-util/pyfa/pyfa-1.35.1.ebuild
new file mode 100644
index 000000000000..566b23ecc2d1
--- /dev/null
+++ b/games-util/pyfa/pyfa-1.35.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,threads"
+
+inherit eutils gnome2-utils python-r1
+
+DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
+HOMEPAGE="https://github.com/pyfa-org/Pyfa"
+
+LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm"
+SLOT="0"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git"
+	inherit git-r3
+	KEYWORDS="x86"
+else
+	SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> pyfa-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+IUSE="+graph"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.0.5[${PYTHON_USEDEP}]
+	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+	>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	graph? (
+		dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}] )
+	${PYTHON_DEPS}"
+DEPEND="app-arch/zip"
+
+[[ ${PV} = 9999 ]] || S=${WORKDIR}/Pyfa-${PV}
+
+src_prepare() {
+	# get rid of CRLF line endings introduced in 1.1.10 so patches work
+	edos2unix config.py pyfa.py gui/bitmapLoader.py service/settings.py
+
+	# load gameDB and images from separate staticdata directory
+	eapply "${FILESDIR}/${PN}-1.33.1-staticdata.patch"
+
+	# fix import path in the main script for systemwide installation
+	eapply "${FILESDIR}/${PN}-1.33.1-import-pyfa.patch"
+
+	eapply_user
+
+	touch __init__.py
+
+	pyfa_make_configforced() {
+		mkdir -p "${BUILD_DIR}" || die
+		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
+			-e "s:%%EPREFIX%%:${EPREFIX}:" \
+			"${FILESDIR}/configforced-1.15.1.py" > "${BUILD_DIR}/configforced.py"
+		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
+			pyfa.py > "${BUILD_DIR}/pyfa"
+	}
+	python_foreach_impl pyfa_make_configforced
+}
+
+src_install() {
+	pyfa_py_install() {
+		local packagedir=$(python_get_sitedir)/${PN}
+		insinto "${packagedir}"
+		doins -r eos gui service utils config*.py __init__.py
+		[[ -e info.py ]] && doins info.py # only in zip releases
+		doins "${BUILD_DIR}/configforced.py"
+		python_doscript "${BUILD_DIR}/pyfa"
+		python_optimize
+	}
+	python_foreach_impl pyfa_py_install
+
+	insinto /usr/share/${PN}
+	doins eve.db
+
+	einfo "Compressing images ..."
+	pushd imgs > /dev/null || die
+	zip -r imgs.zip * || die "zip failed"
+	doins imgs.zip
+	popd > /dev/null || die
+
+	dodoc README.md
+	doicon -s 32 imgs/gui/pyfa.png
+	newicon -s 64 imgs/gui/pyfa64.png pyfa.png
+	domenu "${FILESDIR}/${PN}.desktop"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-util/pyfa/pyfa-1.37.0.ebuild b/games-util/pyfa/pyfa-1.37.0.ebuild
new file mode 100644
index 000000000000..32200ccbee19
--- /dev/null
+++ b/games-util/pyfa/pyfa-1.37.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,threads"
+
+inherit desktop eutils gnome2-utils python-r1
+
+DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
+HOMEPAGE="https://github.com/pyfa-org/Pyfa"
+
+RESTRICT="mirror bindist"
+LICENSE="GPL-3+ all-rights-reserved"
+SLOT="0"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+IUSE="+graph"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.0.5[${PYTHON_USEDEP}]
+	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+	graph? (
+		dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}] )
+	${PYTHON_DEPS}"
+DEPEND="app-arch/zip"
+
+[[ ${PV} = 9999 ]] || S=${WORKDIR}/Pyfa-${PV}
+
+src_prepare() {
+	# get rid of CRLF line endings introduced in 1.1.10 so patches work
+	edos2unix config.py pyfa.py gui/bitmapLoader.py service/settings.py
+
+	# load gameDB and images from separate staticdata directory
+	eapply "${FILESDIR}/${PN}-1.33.1-staticdata.patch"
+
+	# fix import path in the main script for systemwide installation
+	eapply "${FILESDIR}/${PN}-1.33.1-import-pyfa.patch"
+
+	eapply_user
+
+	# make python recognize pyfa as a package
+	touch __init__.py || die
+
+	pyfa_make_configforced() {
+		mkdir -p "${BUILD_DIR}" || die
+		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
+			-e "s:%%EPREFIX%%:${EPREFIX}:" \
+			"${FILESDIR}/configforced-1.15.1.py" > "${BUILD_DIR}/configforced.py" || die
+		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
+			pyfa.py > "${BUILD_DIR}/pyfa" || die
+	}
+	python_foreach_impl pyfa_make_configforced
+}
+
+src_install() {
+	pyfa_py_install() {
+		python_moduleinto ${PN}
+		python_domodule eos gui service utils config*.py __init__.py
+		python_domodule "${BUILD_DIR}/configforced.py"
+		python_doscript "${BUILD_DIR}/pyfa"
+	}
+	python_foreach_impl pyfa_py_install
+
+	insinto /usr/share/${PN}
+	doins eve.db
+
+	einfo "Compressing images ..."
+	pushd imgs > /dev/null || die
+	zip -r imgs.zip * || die "zip failed"
+	doins imgs.zip
+	popd > /dev/null || die
+
+	dodoc README.md
+	doicon -s 32 imgs/gui/pyfa.png
+	newicon -s 64 imgs/gui/pyfa64.png pyfa.png
+	domenu "${FILESDIR}/${PN}.desktop"
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-util/pyfa/pyfa-9999.ebuild b/games-util/pyfa/pyfa-9999.ebuild
new file mode 100644
index 000000000000..32200ccbee19
--- /dev/null
+++ b/games-util/pyfa/pyfa-9999.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,threads"
+
+inherit desktop eutils gnome2-utils python-r1
+
+DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
+HOMEPAGE="https://github.com/pyfa-org/Pyfa"
+
+RESTRICT="mirror bindist"
+LICENSE="GPL-3+ all-rights-reserved"
+SLOT="0"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+IUSE="+graph"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.0.5[${PYTHON_USEDEP}]
+	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+	graph? (
+		dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}] )
+	${PYTHON_DEPS}"
+DEPEND="app-arch/zip"
+
+[[ ${PV} = 9999 ]] || S=${WORKDIR}/Pyfa-${PV}
+
+src_prepare() {
+	# get rid of CRLF line endings introduced in 1.1.10 so patches work
+	edos2unix config.py pyfa.py gui/bitmapLoader.py service/settings.py
+
+	# load gameDB and images from separate staticdata directory
+	eapply "${FILESDIR}/${PN}-1.33.1-staticdata.patch"
+
+	# fix import path in the main script for systemwide installation
+	eapply "${FILESDIR}/${PN}-1.33.1-import-pyfa.patch"
+
+	eapply_user
+
+	# make python recognize pyfa as a package
+	touch __init__.py || die
+
+	pyfa_make_configforced() {
+		mkdir -p "${BUILD_DIR}" || die
+		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
+			-e "s:%%EPREFIX%%:${EPREFIX}:" \
+			"${FILESDIR}/configforced-1.15.1.py" > "${BUILD_DIR}/configforced.py" || die
+		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
+			pyfa.py > "${BUILD_DIR}/pyfa" || die
+	}
+	python_foreach_impl pyfa_make_configforced
+}
+
+src_install() {
+	pyfa_py_install() {
+		python_moduleinto ${PN}
+		python_domodule eos gui service utils config*.py __init__.py
+		python_domodule "${BUILD_DIR}/configforced.py"
+		python_doscript "${BUILD_DIR}/pyfa"
+	}
+	python_foreach_impl pyfa_py_install
+
+	insinto /usr/share/${PN}
+	doins eve.db
+
+	einfo "Compressing images ..."
+	pushd imgs > /dev/null || die
+	zip -r imgs.zip * || die "zip failed"
+	doins imgs.zip
+	popd > /dev/null || die
+
+	dodoc README.md
+	doicon -s 32 imgs/gui/pyfa.png
+	newicon -s 64 imgs/gui/pyfa64.png pyfa.png
+	domenu "${FILESDIR}/${PN}.desktop"
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-util/qjoypad-4.3.0 b/games-util/qjoypad-4.3.0
deleted file mode 100644
index 1bd7f2b350e1..000000000000
--- a/games-util/qjoypad-4.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev x11-libs/libxcb x11-libs/libXtst dev-qt/linguist-tools:5 x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Translate gamepad/joystick input into key strokes/mouse actions in X
-EAPI=6
-HOMEPAGE=https://github.com/panzi/qjoypad
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev x11-libs/libxcb x11-libs/libXtst
-SLOT=0
-SRC_URI=https://github.com/panzi/qjoypad/archive/v4.3.0.tar.gz -> qjoypad-4.3.0.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0b892b0941b4e19ece0b2c5e1d459abf
diff --git a/games-util/qjoypad/Manifest b/games-util/qjoypad/Manifest
new file mode 100644
index 000000000000..d2257015f60f
--- /dev/null
+++ b/games-util/qjoypad/Manifest
@@ -0,0 +1,3 @@
+DIST qjoypad-4.3.0.tar.gz 89134 BLAKE2B f035ac024176e352f2c0f88f0677cb4f30e643f64fd2f1214808c0273b0db8cf0a8b133e216b39fddf0ed9717c3e18955357e459ff30c494176ea7cf979b6943 SHA512 99febfc67fff149c476fffeed47eddd9e626e448afcb179eadc8dbe071da42ac692d153f3f43419c4280265527f5e84ede72cb4d59ba574819f7755e3d090e51
+EBUILD qjoypad-4.3.0.ebuild 789 BLAKE2B 23bf48307ca8cace22732d7139b08830f148d9e807df593cba2fb6799fbb9d8a22ccf8583ab647415e938f709abeaf586988754a250cf500dc3d390b12b8f660 SHA512 2dab1f02f39c7175e8776b8a3c2b1c7601fc578ba50380333cac5ff8f5ca7b76790eddc10e6035da18ffa31d603e85dbc330d80e419a6c69059d554f8757abda
+MISC metadata.xml 330 BLAKE2B 60b6d79e8bd61ce2911a3ca77273e844d36cad02c50e88d7c0cb67fd30181f237a0c763ae53c79fe29d4f03f4c4e5d7fd2122af6156c3ee28902c2821099faf4 SHA512 007937b334543dcc52d271b9dd594d167b9f003af545c346c81aab34cdfdf5e3f13a7dca30d67044d41d092539e7f9c589e6cd0a6c026b32ac2d7e7b321f2bb3
diff --git a/games-util/qjoypad/metadata.xml b/games-util/qjoypad/metadata.xml
new file mode 100644
index 000000000000..38b576bdaefb
--- /dev/null
+++ b/games-util/qjoypad/metadata.xml
@@ -0,0 +1,11 @@
+<?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">qjoypad</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-util/qjoypad/qjoypad-4.3.0.ebuild b/games-util/qjoypad/qjoypad-4.3.0.ebuild
new file mode 100644
index 000000000000..a1572020293d
--- /dev/null
+++ b/games-util/qjoypad/qjoypad-4.3.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils desktop
+
+DESCRIPTION="Translate gamepad/joystick input into key strokes/mouse actions in X"
+HOMEPAGE="https://github.com/panzi/qjoypad"
+SRC_URI="https://github.com/panzi/qjoypad/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	virtual/libudev
+	x11-libs/libxcb
+	x11-libs/libXtst
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	x11-base/xorg-proto
+"
+
+src_install() {
+	cmake-utils_src_install
+
+	local i
+	cd icons || die
+	for i in *.png; do
+		newicon ${i} ${i/gamepad/qjoypad}
+	done
+	make_desktop_entry ${PN} QJoypad ${PN}
+}
diff --git a/games-util/qstat-2.11 b/games-util/qstat-2.11
deleted file mode 100644
index 6699e397d68d..000000000000
--- a/games-util/qstat-2.11
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=!sys-cluster/torque
-DESCRIPTION=Server statics collector supporting many FPS games
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/qstat/
-IUSE=debug
-KEYWORDS=~alpha amd64 ~arm hppa ppc64 x86
-LICENSE=Artistic
-SLOT=0
-SRC_URI=mirror://sourceforge/qstat/qstat-2.11.tar.gz
-_md5_=53a1c2a1724bfdc9d7615c91aadcbaf5
diff --git a/games-util/qstat-2.14 b/games-util/qstat-2.14
deleted file mode 100644
index 19d9fe670914..000000000000
--- a/games-util/qstat-2.14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=!sys-cluster/torque >=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=Server statics collector supporting many FPS games
-EAPI=6
-HOMEPAGE=https://github.com/multiplay/qstat
-IUSE=debug
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
-LICENSE=Artistic
-SLOT=0
-SRC_URI=https://github.com/multiplay/qstat/archive/v2.14.tar.gz -> qstat-2.14.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=3baad9967bebd6146acbd5a38191f58d
diff --git a/games-util/qstat/Manifest b/games-util/qstat/Manifest
new file mode 100644
index 000000000000..a4dfc2ac60f9
--- /dev/null
+++ b/games-util/qstat/Manifest
@@ -0,0 +1,5 @@
+DIST qstat-2.11.tar.gz 258335 BLAKE2B f12d0f69c8a73f9eeb273c46aefe2008b8c724b132e02d2fa156c2456f537d2162ae7db6acd0007c7db8bc87dafcfb41355466008c74ce3e912023a7c8cb42cc SHA512 e3ff732c6fc45300eb2f32b3f3e8e1e5f8ee32234535e8d2ca19cf95cf6d4a6de5b6f1e48a5c64315d60a8b388521106b2de9d307f718f6150ad2cf40ba75a22
+DIST qstat-2.14.tar.gz 210440 BLAKE2B 2a33287a69fe63c59a1cb136e84ea29cccd27f4468cb4b38b4e9ce49f28a558dc67793eaa7ead7addd828730e084a15f9684ccba7753852ce1c2795c7c94cb78 SHA512 f2054d74399fe1773a19ca43629e10364fdd87e551459719685c11f38245a05906631b456848b1a3764b4e6843baf654af6a9b174c7b16908b6bcb97ac64c6d6
+EBUILD qstat-2.11.ebuild 677 BLAKE2B d5997ad9bf5dcb6e9e5d689080f2056c310b8924e636e4e1b61d8c7a5362c4dd46301e34ffd11500e01753692af86e897facc2185ad9713ee0fcd7605ea33b03 SHA512 14bd978d242400b4929997011f8c4bb55171504f132400d71d2b4723569385779f0b6d6017675b67a90ffe8418d80ba0a4605c7a71de5b4a3325bc66cc601b95
+EBUILD qstat-2.14.ebuild 775 BLAKE2B d410af9edf50b7a31d5be7d1306db8e9fab011a3cba172b849f842822ed944feda75691335281a038b49b88d8884636d7c092d543993291c6569474b11696dcb SHA512 5b82f8c8182b1c01f9e46fb83fc7ad87a22b34d8c1cb18cea2f8c010202fcec274d9742ecb97eae7b82800eb5ae91fff299c38303854e067c1869ae20fa65a62
+MISC metadata.xml 328 BLAKE2B 05e29df4e66acb89893251aec455d3f05f38344bd12414e74ac46d23573afcd8c7e4d7b2e03d217c443a32e31beaea3d122cd474e317e3490c1d6bbdb7de4c4d SHA512 1f3cbc63b69d59880ff6fe131bf838f69bfd259a93882ef9b38c1d101d4048c2894cf99725d3ce683f9f05da035567d6e4bdafa9d4349844f7b8af98c13f999f
diff --git a/games-util/qstat/metadata.xml b/games-util/qstat/metadata.xml
new file mode 100644
index 000000000000..a8c2e30da965
--- /dev/null
+++ b/games-util/qstat/metadata.xml
@@ -0,0 +1,11 @@
+<?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">qstat</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-util/qstat/qstat-2.11.ebuild b/games-util/qstat/qstat-2.11.ebuild
new file mode 100644
index 000000000000..3ec2d6de4ffc
--- /dev/null
+++ b/games-util/qstat/qstat-2.11.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+DESCRIPTION="Server statics collector supporting many FPS games"
+HOMEPAGE="https://sourceforge.net/projects/qstat/"
+SRC_URI="mirror://sourceforge/qstat/${P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm hppa ppc64 x86"
+IUSE="debug"
+
+DEPEND="!sys-cluster/torque"
+
+src_prepare() {
+	# bug #530952
+	sed -i -e 's/strndup/l_strndup/g' qstat.c || die
+}
+
+src_configure() {
+	econf $(use_enable debug)
+}
+
+src_install() {
+	DOCS="CHANGES.txt COMPILE.txt template/README.txt" default
+	dosym qstat /usr/bin/quakestat
+	dohtml template/*.html qstatdoc.html
+}
diff --git a/games-util/qstat/qstat-2.14.ebuild b/games-util/qstat/qstat-2.14.ebuild
new file mode 100644
index 000000000000..3dbdb38a119f
--- /dev/null
+++ b/games-util/qstat/qstat-2.14.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Server statics collector supporting many FPS games"
+HOMEPAGE="https://github.com/multiplay/qstat"
+SRC_URI="https://github.com/multiplay/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+IUSE="debug"
+
+DEPEND="!sys-cluster/torque"
+
+DOCS=( CHANGES.txt COMPILE.txt template/README.txt )
+
+src_prepare() {
+	default
+	eautoreconf
+
+	# bug #530952
+	sed -i -e 's/strndup/l_strndup/g' qstat.c || die
+}
+
+src_configure() {
+	econf $(use_enable debug)
+}
+
+src_install() {
+	default
+	dosym qstat /usr/bin/quakestat
+	docinto html
+	dodoc template/*.html qstatdoc.html
+}
diff --git a/games-util/springlobby-0.264 b/games-util/springlobby-0.264
deleted file mode 100644
index 0ac0138425ec..000000000000
--- a/games-util/springlobby-0.264
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-libs/boost-1.35:= dev-libs/openssl:= sound? ( media-libs/alure media-libs/openal ) net-misc/curl sys-libs/zlib[minizip] x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/wxGTK:3.0[X] libnotify? ( x11-libs/libnotify ) nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=The official lobby client for SpringRTS community games
-EAPI=6
-HOMEPAGE=https://springlobby.info
-IUSE=debug +libnotify +nls +sound
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/boost-1.35:= dev-libs/openssl:= sound? ( media-libs/alure media-libs/openal ) net-misc/curl sys-libs/zlib[minizip] x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/wxGTK:3.0[X] libnotify? ( x11-libs/libnotify )
-SLOT=0
-SRC_URI=https://www.springlobby.info/tarballs/springlobby-0.264.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	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dbf64a0356decefa8d87a09443c82a15
diff --git a/games-util/springlobby/Manifest b/games-util/springlobby/Manifest
new file mode 100644
index 000000000000..6336cd6381b3
--- /dev/null
+++ b/games-util/springlobby/Manifest
@@ -0,0 +1,3 @@
+DIST springlobby-0.264.tar.bz2 2626180 BLAKE2B 01ff51703c3c10c1aaeb342d2644012a6037b1271ba7e36ab7663cde7646d1c9c6bd823fe65c91a8a9e754bbcf1000ce486eeab2d1641c64fad08773c491f9a6 SHA512 f8024a98be7d6ea755c4380494415813084aadb6dcf72ed0aaeba0ddf9fbaf992ccd5455713c807c0d6feb7db606068be62d4bb2cfcb4697f0406a2ec4f404eb
+EBUILD springlobby-0.264.ebuild 1071 BLAKE2B 0e04cf3827794b354dabf9708ffe96f4de7b73bc06340429b048c794ba65d4647a3368d911eed2f277c754431a68949e6a6cb8833f6d5f64a3947d058d5c137c SHA512 88c5161c566ad511db04ea36253fa46facc06731611addc385ed8c8fd906a4456f33ad3996086aae39ce8f66ad907324c602d5d1189226375be62e64cdc80794
+MISC metadata.xml 1168 BLAKE2B 52a394c332bed809d549cf76a750a35cb0c0bcb6af1cf2276d81958abafa6272e58d59d07762929ef05ccece16d5465d5c353dd71974b4ec2657ae99e3d607a5 SHA512 901e3865f60e798625d59085e38e191a256819e5aa0778210190ebc0a08f183b263c3391409079c499a2e2cb6740503371642f0c13eec1e59a8699060c00b59c
diff --git a/games-util/springlobby/metadata.xml b/games-util/springlobby/metadata.xml
new file mode 100644
index 000000000000..eabc7ba13bca
--- /dev/null
+++ b/games-util/springlobby/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription lang="en">
+The official lobby client for SpringRTS community games: Balanced Annihilation; Journeywar; Metal Factions; Spring:1944 World War II; Star Wars: Imperial Winter; Tech Annihilation; The Cursed; Evolution RTS; ...
+	</longdescription>
+	<longdescription lang="fr">
+Le client officiel du lobby pour les jeux de la communauté SpringRTS : Balanced Annihilation; Journeywar; Metal Factions; Spring:1944 World War II; Star Wars: Imperial Winter; Tech Annihilation; The Cursed; Evolution RTS; ...
+	</longdescription>
+	<maintainer type="person">
+		<email>totocoq@yahoo.fr</email>
+		<name>Thomas Coquelin</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>fedja@protonmail.ch</email>
+		<name>Fedja Beader</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">springlobby/springlobby</remote-id>
+		<bugs-to>https://github.com/springlobby/springlobby/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/games-util/springlobby/springlobby-0.264.ebuild b/games-util/springlobby/springlobby-0.264.ebuild
new file mode 100644
index 000000000000..510738cb07bd
--- /dev/null
+++ b/games-util/springlobby/springlobby-0.264.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+inherit cmake-utils gnome2-utils wxwidgets
+
+DESCRIPTION="The official lobby client for SpringRTS community games"
+HOMEPAGE="https://springlobby.info"
+SRC_URI="https://www.springlobby.info/tarballs/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +libnotify +nls +sound"
+
+RDEPEND="
+	>=dev-libs/boost-1.35:=
+	dev-libs/openssl:=
+	sound? ( media-libs/alure
+		media-libs/openal
+	)
+	net-misc/curl
+	sys-libs/zlib[minizip]
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXext
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	libnotify? ( x11-libs/libnotify )
+"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+src_configure() {
+	setup-wxwidgets
+	local mycmakeargs=(
+		-DOPTION_NOTIFY=$(usex libnotify)
+		-DOPTION_SOUND=$(usex sound)
+		-DOPTION_TRANSLATION_SUPPORT=$(usex nls)
+		-DAUX_VERSION="(Gentoo,${ARCH})"
+		)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-util/ucon64-2.0.0 b/games-util/ucon64-2.0.0
deleted file mode 100644
index 8ff17852a1f0..000000000000
--- a/games-util/ucon64-2.0.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DESCRIPTION=The backup tool and wonderful emulator's Swiss Army knife program
-EAPI=5
-HOMEPAGE=http://ucon64.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/ucon64/ucon64-2.0.0-src.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_=d6a2da07e2641a4b5587084c818832f1
diff --git a/games-util/ucon64/Manifest b/games-util/ucon64/Manifest
new file mode 100644
index 000000000000..c33e021261c1
--- /dev/null
+++ b/games-util/ucon64/Manifest
@@ -0,0 +1,5 @@
+AUX ucon64-2.0.0-ovflfix.patch 681 BLAKE2B 7244c12a6e2cae4fe5bc2e8dd0325aa04098b638eaf11b7040dbcad342080a522241f7b3d76b522eb632fef7d0a3bc6d020d1d0669e177b779a9c32e494e3189 SHA512 050ad442ce4e2dfa45ef2cbe3245e623d965e922528a4c64c2652de07934d255d0581ceb536f0883c8f3291a30f9f1807d4078a14f9b29178495dab75a277402
+AUX ucon64-2.0.0-zlib.patch 1274 BLAKE2B 8e53d1c559f75a6b0a4e40a510ed4eccd6ff7d1b5b3ae8f81061503ea7aadc1ec36d35fc670f1afed6e85fb5daf601d49650f1e2e2de5e2942a8f359e7dc2f89 SHA512 708034434a809f65c7cc05fcbae474a8dd5d473ae11458a4bb8510fd553da50691911c1e9fc8ee8457989192ad2b350ab6667214946d5d1f89bd64af8df7272f
+DIST ucon64-2.0.0-src.tar.gz 1188488 BLAKE2B 846ea6142eb50abc8165c9abb3cc05245f891b78d786798758e393032cc59c1f3cccc0fe0e70e256e308f709870bc1cc2754df30a8fababea30eda84fd1b2b64 SHA512 d021fe6db9530405773e1e209bdfafe41a2bd997f275ca7fb387f9b3d8639f4581c2761cbdce859a1831d6eba9dab4d5df1019605698c6cb6a4695ab091b001c
+EBUILD ucon64-2.0.0.ebuild 1428 BLAKE2B 4a7df9af94c6b1802f77d7ea947447ddc08eb17a134992a36c60cd516fd9dc5e5b727f22c09092305a8049442795a9dcb9793b7fb806148c4f384daa83f9f03b SHA512 7ade0622278b5fab6b6fd6a7319ac6d29329c376c55efbc902c151c11720793e352359d5c78029681e5ae4fa063921935f3a39d6cda3181ea36162a46646bc83
+MISC metadata.xml 329 BLAKE2B 7e77481b48419ef3da77a1b758a5e49c3f6686bdec3c14f81fe4f5051aec4b63433b970b6bb8ea5fc3ca4f98893a372cf3fb32c0e8bc3098379729cfd6672995 SHA512 eeaeb79bd3f8931262b87f4956705aea7408f5afd8879e6b8c5d5436a851be22a2e9a9e22ccd5250ea270db0c2876633fbf3d160df47cff9be490e203619ed7f
diff --git a/games-util/ucon64/files/ucon64-2.0.0-ovflfix.patch b/games-util/ucon64/files/ucon64-2.0.0-ovflfix.patch
new file mode 100644
index 000000000000..0a1668f2d09f
--- /dev/null
+++ b/games-util/ucon64/files/ucon64-2.0.0-ovflfix.patch
@@ -0,0 +1,20 @@
+--- backup/lynxit.c.old	2010-11-04 09:07:18.000000000 +0100
++++ backup/lynxit.c	2010-11-04 09:08:17.000000000 +0100
+@@ -561,7 +561,7 @@
+       return FALSE;
+     }
+ 
+-  if (strcmp (header.magic, "LYNX") != 0)
++  if (memcmp (header.magic, "LYNX", sizeof(header.magic)) != 0)
+     {
+       MESSAGE (("ERROR    : %s is not a lynx image\n", filename));
+       fclose (fp);
+@@ -682,7 +682,7 @@
+ #endif
+ 
+   memset (&header, 0, sizeof (st_lnx_header_t));
+-  strcpy (header.magic, MAGIC_STRING);
++  memcpy (header.magic, MAGIC_STRING, sizeof(header.magic));
+   strcpy (header.cartname, cartname);
+   strcpy (header.manufname, manufname);
+   header.page_size_bank0 = cart_analyse (BANK0);
diff --git a/games-util/ucon64/files/ucon64-2.0.0-zlib.patch b/games-util/ucon64/files/ucon64-2.0.0-zlib.patch
new file mode 100644
index 000000000000..7a122713d232
--- /dev/null
+++ b/games-util/ucon64/files/ucon64-2.0.0-zlib.patch
@@ -0,0 +1,45 @@
+--- misc/unzip.h.old	2011-09-23 19:53:09.708884325 +0200
++++ misc/unzip.h	2011-09-23 19:54:00.012878355 +0200
+@@ -49,6 +49,10 @@
+ #include "zlib.h"
+ #endif
+ 
++#ifndef OF
++#define OF(x) x
++#endif
++
+ #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
+ /* like the STRICT of WIN32, we define a pointer that cannot be converted
+     from (void*) without cast */
+--- libdiscmage/unzip.h.old	2011-09-23 19:59:47.319837133 +0200
++++ libdiscmage/unzip.h	2011-09-23 20:00:07.230834769 +0200
+@@ -48,6 +48,9 @@
+ #ifndef _ZLIB_H
+ #include "zlib.h"
+ #endif
++#ifndef OF
++#define OF(x) x
++#endif
+ 
+ #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
+ /* like the STRICT of WIN32, we define a pointer that cannot be converted
+--- libdiscmage/misc_z.c.old	2012-03-19 08:39:41.975022496 +0100
++++ libdiscmage/misc_z.c	2012-03-19 08:40:13.109803301 +0100
+@@ -27,6 +27,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <sys/stat.h>
++#define Z_SOLO
+ #include <zlib.h>
+ #include "misc_z.h"
+ #include "misc.h"
+--- misc/archive.c.old	2012-03-19 08:41:06.478999810 +0100
++++ misc/archive.c	2012-03-19 08:41:24.134741668 +0100
+@@ -27,6 +27,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <sys/stat.h>
++#define Z_SOLO
+ #include <zlib.h>
+ #ifdef  HAVE_BYTESWAP_H
+ #include <byteswap.h>
diff --git a/games-util/ucon64/metadata.xml b/games-util/ucon64/metadata.xml
new file mode 100644
index 000000000000..04401fa31ab8
--- /dev/null
+++ b/games-util/ucon64/metadata.xml
@@ -0,0 +1,11 @@
+<?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">ucon64</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-util/ucon64/ucon64-2.0.0.ebuild b/games-util/ucon64/ucon64-2.0.0.ebuild
new file mode 100644
index 000000000000..694c0f57261b
--- /dev/null
+++ b/games-util/ucon64/ucon64-2.0.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="The backup tool and wonderful emulator's Swiss Army knife program"
+HOMEPAGE="http://ucon64.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ucon64/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+S=${WORKDIR}/${P}-src/src
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ovflfix.patch \
+		"${FILESDIR}"/${P}-zlib.patch
+	sed -i \
+		-e "/^CFLAGS/s/-O3/${CFLAGS}/" \
+		-e "/^LDFLAGS/s/-s$/${LDFLAGS}/" \
+		{,libdiscmage/}Makefile.in || die
+}
+
+src_configure() {
+	local myconf
+
+	if [[ ! -e /usr/include/sys/io.h ]] ; then
+		ewarn "Disabling support for parallel port"
+		myconf="${myconf} --disable-parallel"
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	dobin ucon64
+	dolib.so libdiscmage/discmage.so
+	cd ..
+	dohtml -x src -r -A png,jpg *
+}
+
+pkg_postinst() {
+	echo
+	elog "In order to use ${PN}, please create the directory ~/.ucon64/dat"
+	elog "The command to do that is:"
+	elog "    mkdir -p ~/.ucon64/dat"
+	elog "Then, you can copy your DAT file collection to ~/.ucon64/dat"
+	elog
+	elog "To enable Discmage support, cp /usr/lib/discmage.so to ~/.ucon64"
+	elog "The command to do that is:"
+	elog "    cp /usr/lib/discmage.so ~/.ucon64/"
+	elog
+	elog "Be sure to check ~/.ucon64rc for some options after"
+	elog "you've run uCON64 for the first time"
+}
diff --git a/games-util/uglygs-0_rc11-r1 b/games-util/uglygs-0_rc11-r1
deleted file mode 100644
index 99520cb90cdc..000000000000
--- a/games-util/uglygs-0_rc11-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=net-analyzer/rrdtool[graph] dev-lang/perl
-DESCRIPTION=Quickly searches the network for game servers
-EAPI=6
-HOMEPAGE=http://uglygs.uglypunk.com/
-KEYWORDS=~amd64 ~alpha ~hppa ~x86
-LICENSE=GPL-2
-RDEPEND=net-analyzer/rrdtool[graph] dev-lang/perl
-SLOT=0
-SRC_URI=ftp://ftp.uglypunk.com/uglygs/current/uglygs-rc11.tar.gz
-_md5_=1e54e366634cdab26ff210fcff85abba
diff --git a/games-util/uglygs/Manifest b/games-util/uglygs/Manifest
new file mode 100644
index 000000000000..2b29c17cd775
--- /dev/null
+++ b/games-util/uglygs/Manifest
@@ -0,0 +1,6 @@
+AUX 0_rc11-uglygs.conf.patch 2217 BLAKE2B 545fde785e66039180b3deed5fd79e8d4b87c82231da03d6fb047fc72b4f2be3e7534855c77888e8c57a15ee71e35d289fe369e55ea28ed01ac87398d3aef42e SHA512 f7a465d28c042637af1ea45d6f04d809384c0d06d582270cc914cea1bcfed476798c65abf1e18ad5743cff33914bd4f8755cddbb727da6346cb0942d43401756
+AUX 0_rc11-uglygs.pl.patch 7048 BLAKE2B ddff45fb72140f68fd5096dfce9930b6fa4a11fa13584841d84bf9600858e60cbf2e56d910fdeb1605ace6afdd290eb7d1dd135f6541cb501ba496259a240da2 SHA512 98fc61108bc660be487419485a0bcd01b6d9cc8ab8986807a349d6da3cbcf97707b6c9561c88ab268e53ad503ae0fae50e36021943737298a628c88b74d5c36c
+DATA servers.cfg 0 BLAKE2B 786a02f742015903c6c6fd852552d272912f4740e15847618a86e217f71f5419d25e1031afee585313896444934eb04b903a685b1448b755d56f701afe9be2ce SHA512 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e
+DIST uglygs-rc11.tar.gz 9066873 BLAKE2B 91cc02ecfd6ccb98ac765e5702e13fffc231cce9938fc01950eb7691bc3bef03dee51489cacf3526939ebccfafe06a7cbbb97c653a27a0d9dff19e67b73ab4e0 SHA512 2a57eb7a4562525c00c69a7874d32fa52d5f12cb2926dffcf4bc8ad74e5847a962c464426b476412bff369963ee40120c3dfc9c0b506606f8a4668bca88d1970
+EBUILD uglygs-0_rc11-r1.ebuild 1252 BLAKE2B a1074d3984b3c086215d8f6384e9138115b5ba33fc0e8efa9170c91658af607543fc57bb32ddc228d1c3c150e56f4acc9619b6b785fdf90c98b679cb69ec212a SHA512 9d91148ecc0e5bed6474db3c9d6a25c982b41c5eb4e07249d4359db5acc1e7f80c716c5734d7fbf9f264960aaaff7231414bd2cb84afa73ef976de6562d4dd37
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/uglygs/files/0_rc11-uglygs.conf.patch b/games-util/uglygs/files/0_rc11-uglygs.conf.patch
new file mode 100644
index 000000000000..f85c6a3c3198
--- /dev/null
+++ b/games-util/uglygs/files/0_rc11-uglygs.conf.patch
@@ -0,0 +1,31 @@
+--- a/uglygs.conf.orig	2003-06-30 11:16:57.000000000 -0400
++++ b/uglygs.conf	2003-06-30 11:22:50.000000000 -0400
+@@ -12,22 +12,23 @@
+ $runmode = "loop";                                              # Run mode, Run as a loop or as a cron Executable
+ 
+ $configfile = "servers.cfg";                                    # The Result file to be passed to other programs
+-$qstat = "qstat/qstat";                                         # The modified qstat file
++$qstat = "GENTOO_DIR/qstat";                                         # The modified qstat file
+ $cat = "/bin/cat";                                              # The cat file location
+-$data = "./data";                                               # Data Directory
+-$tmp = "./tmp";                                                 # Temp Directory
++$data = "GENTOO_DIR/data";                                               # Data Directory
++$tmp = "GENTOO_DIR/tmp";                                                 # Temp Directory
+ $template = "default";						# Template Directory
++$templates = "GENTOO_DIR/templates";				# Template base directory
+ $staticcfgfile = "$data/servers.static";                        # A Static output file to append to final output 
+ 
+ $refresh = "180";						# # If loop is on what is your update rate in sec 
+ 		
+ $serverquery = "n";                                             # Do u want Server Query output y or n
+-$serverqueryfile = "/var/www/html/servers.cfg";                 # The output file for server query 
++$serverqueryfile = "/home/httpd/htdocs/servers.cfg";                 # The output file for server query 
+ 
+ $html = "n";							# Do you want HTML output 
+ $htmlgame="l";							# Game List Sort Order p=by-ping, g=by-game, i=by-IP-address, h=by-hostname, n=by-#-players, l=by-list-order
+ $htmlplayer="F";						# Player List Sort Order P=by-ping, F=by-frags, T=by-team
+-$htmldir = "/var/www/html/uglygs";				# The html output Directory
++$htmldir = "/home/httpd/htdocs/uglygs";				# The html output Directory
+ $htmlfile = "servers";						# The html output file
+ $htmlext = "html";						# THe file Ext eg. html, php, pl, asp
+ $htmlalias = "/uglygs";                                         # The html Directory Alias
diff --git a/games-util/uglygs/files/0_rc11-uglygs.pl.patch b/games-util/uglygs/files/0_rc11-uglygs.pl.patch
new file mode 100644
index 000000000000..61758e621a9a
--- /dev/null
+++ b/games-util/uglygs/files/0_rc11-uglygs.pl.patch
@@ -0,0 +1,131 @@
+--- a/uglygs.pl.orig	2003-06-30 11:37:59.000000000 -0400
++++ b/uglygs.pl	2003-06-30 11:38:30.000000000 -0400
+@@ -8,7 +8,8 @@
+ ##########                                      Contact uglygs@uglypunk.com                                    ##########
+ #########################################################################################################################
+ #########################################################################################################################
+-require 'uglygs.conf';
++$qstatcfg = 'GENTOO_DIR/qstat.cfg';
++require 'GENTOO_DIR/uglygs.conf';
+ 
+ $VERSION = "rc10";
+ 
+@@ -23,7 +24,7 @@
+ if (!-f $qstat) { die "Sorry the Qstat file doesn't exist, you may no have compiled it yet"};
+ if (!-d  $data) { die "Sorry the data directory doesn't exist, it should be located here:  $data"};
+ if (!-d  $tmp)  { die "Sorry the temp directory doesn't exist, it should be located here:  $tmp"};
+-if (!-d  "./templates/$template") { die "Sorry the templates/template directory doesnt exist, it should be located here:  templates/$template"};
++if (!-d  "$templates/$template") { die "Sorry the templates/template directory doesnt exist, it should be located here:  $templates/$template"};
+ 
+ if ($html eq "y"){
+         if (!-f $rrdtool) { die "Sorry the rrdtool file doesn't exist, Please install RRDTOOL"};
+@@ -88,7 +89,7 @@
+ $timemonth = $time - 2592000;
+ $timeyear = $time - 31536000;
+ system(`rm $tmp/*.tmp`);
+-require "templates/$template/graphs.conf";
++require "$templates/$template/graphs.conf";
+ 
+ 
+ ################################# Seach everything VERY MESSY #########################
+@@ -96,7 +97,7 @@
+ if ($doscan eq "y"){
+ 
+ 
+- 	open(QSTAT, "|$qstat -cfg qstat/qstat.cfg -maxsim 60 -timeout 8 -Ts ./templates/qstat $qstatcom $addports >> $tmp/serversannounce.tmp" );
++ 	open(QSTAT, "|$qstat -cfg $qstatcfg -maxsim 60 -timeout 8 -Ts $templates/qstat $qstatcom $addports >> $tmp/serversannounce.tmp" );
+  	close(QSTAT);
+ 
+ 	if (-s "$tmp/serversannounce.tmp"){
+@@ -121,7 +122,7 @@
+   $defport = $tabledata[2];
+   $defport =~ s/\n//;
+   if ($tabledata[0] eq "Q3S") {
+-    open (QSTAT, "$qstat -cfg qstat/qstat.cfg -nh -R -q3s $tabledata[1]:$defport|");
++    open (QSTAT, "$qstat -cfg $qstatcfg -nh -R -q3s $tabledata[1]:$defport|");
+     @qstatoutput = <QSTAT>;
+     $qstatoutput = $qstatoutput[1];
+     if ($qstatoutput =~m/version=Wolf /) {
+@@ -172,7 +173,7 @@
+ 
+ ############################# SERVER QUERY PROCESSING ###############################
+ 
+-system( "$qstat -cfg qstat/qstat.cfg -maxsim 60 -timeout 8 -Ts ./templates/sqdata -of $tmp/sqservers.tmp -f $configfile" );
++system( "$qstat -cfg $qstatcfg -maxsim 60 -timeout 8 -Ts $templates/sqdata -of $tmp/sqservers.tmp -f $configfile" );
+     
+ open (PROCESS, "< $tmp/sqservers.tmp");
+ @name = <PROCESS>;
+@@ -194,7 +195,7 @@
+                 $defport = $tabledata[2];
+                 $defport =~ s/\n//;
+                 if ($tabledata[0] eq "GPS") {
+-                        open (QSTAT, "$qstat -cfg qstat/qstat.cfg -nh -R -gps $tabledata[1]:$defport|");
++                        open (QSTAT, "$qstat -cfg $qstatcfg -nh -R -gps $tabledata[1]:$defport|");
+                         @qstatoutput = <QSTAT>;
+                         $qstatoutput = $qstatoutput[1];
+ 
+@@ -206,7 +207,7 @@
+                         close(QSTAT);
+ 
+                 } elsif ($tabledata[0] eq "RWS") {
+-                        open (QSTAT, "$qstat -cfg qstat/qstat.cfg -nh -R -rws $tabledata[1]:$defport|");
++                        open (QSTAT, "$qstat -cfg $qstatcfg -nh -R -rws $tabledata[1]:$defport|");
+                         @qstatoutput = <QSTAT>;
+                         $qstatoutput = $qstatoutput[1];
+                                 if ($qstatoutput =~m/protocol=17,/) {
+@@ -218,7 +219,7 @@
+ 
+                         
+                  } elsif ($tabledata[0] eq "RGS") {
+-                         open (QSTAT, "$qstat -cfg qstat/qstat.cfg -nh -R -rgs $tabledata[1]:$defport|");
++                         open (QSTAT, "$qstat -cfg $qstatcfg -nh -R -rgs $tabledata[1]:$defport|");
+                          @qstatoutput = <QSTAT>;
+                          $qstatoutput = $qstatoutput[1];
+ 
+@@ -231,7 +232,7 @@
+                         close(QSTAT);
+ 
+                  } elsif ($tabledata[0] eq "SMS") {
+-                         open (QSTAT, "$qstat -cfg qstat/qstat.cfg -nh -R -sms $tabledata[1]:$defport|");
++                         open (QSTAT, "$qstat -cfg $qstatcfg -nh -R -sms $tabledata[1]:$defport|");
+                          @qstatoutput = <QSTAT>;
+                          $qstatoutput = $qstatoutput[1];
+ 
+@@ -247,7 +248,7 @@
+ 
+ 
+                  } elsif ($tabledata[0] eq "GOS") {
+-                         open (QSTAT, "$qstat -cfg qstat/qstat.cfg -nh -R -gos $tabledata[1]:$defport|");
++                         open (QSTAT, "$qstat -cfg $qstatcfg -nh -R -gos $tabledata[1]:$defport|");
+                          @qstatoutput = <QSTAT>;
+                          $qstatoutput = $qstatoutput[1];
+ 
+@@ -261,7 +262,7 @@
+ 
+ 
+                  } elsif ($tabledata[0] eq "SF2S") {
+-                         open (QSTAT, "$qstat -cfg qstat/qstat.cfg -nh -R -sf2s $tabledata[1]:$defport|");
++                         open (QSTAT, "$qstat -cfg $qstatcfg -nh -R -sf2s $tabledata[1]:$defport|");
+                          @qstatoutput = <QSTAT>;
+                          $qstatoutput = $qstatoutput[1];
+                                 if ($qstatoutput =~m/version=SOF2MP V1.02t/) {
+@@ -301,7 +302,7 @@
+ 
+ 
+ if ($html eq "y"){
+-  open(TOTALOUT, "$qstat -cfg qstat/qstat.cfg -R -sort $htmlgame  -maxsim 60 -timeout 4 -Th ./templates/$template/header.html -Tt ./templates/$template/footer.html -Ts ./templates/$template/data.html -f $configfile 2> /dev/null |");
++  open(TOTALOUT, "$qstat -cfg $qstatcfg -R -sort $htmlgame  -maxsim 60 -timeout 4 -Th $templates/$template/header.html -Tt $templates/$template/footer.html -Ts $templates/$template/data.html -f $configfile 2> /dev/null |");
+   while( $totalline = <TOTALOUT> ){
+     my @totaldata = split(/ /,$totalline);
+      if ($totaldata[0] eq "<!--" and $totaldata[1] eq "gamedetails"){
+@@ -372,7 +373,7 @@
+     $graph = "$tabledata[0]$tabledata[1]$port";
+ 
+       
+-    open(QSTAT, "$qstat -cfg qstat/qstat.cfg -R -P -sort $htmlplayer -maxsim 60 -timeout 4 -Th ./templates/$template/gameheader.html -Tt ./templates/$template/gamefooter.html -Ts ./templates/$template/gamedata.html -Tp ./templates/$template/gameplayer.html -$gametype $tabledata[1]:$port | "); 
++    open(QSTAT, "$qstat -cfg $qstatcfg -R -P -sort $htmlplayer -maxsim 60 -timeout 4 -Th $templates/$template/gameheader.html -Tt $templates/$template/gamefooter.html -Ts $templates/$template/gamedata.html -Tp $templates/$template/gameplayer.html -$gametype $tabledata[1]:$port | "); 
+      while($serverline = <QSTAT>){
+      my @data = split(/ /,$serverline);
+      if ($data[0] eq "<!--" and $data[1] eq "gamedetails"){
+--- a/uglygs.pl.orig	2003-06-30 13:56:01.000000000 -0400
++++ b/uglygs.pl	2003-06-30 13:59:17.000000000 -0400
diff --git a/games-util/uglygs/metadata.xml b/games-util/uglygs/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-util/uglygs/metadata.xml
@@ -0,0 +1,8 @@
+<?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-util/uglygs/servers.cfg b/games-util/uglygs/servers.cfg
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/games-util/uglygs/servers.cfg
diff --git a/games-util/uglygs/uglygs-0_rc11-r1.ebuild b/games-util/uglygs/uglygs-0_rc11-r1.ebuild
new file mode 100644
index 000000000000..a431e691ff30
--- /dev/null
+++ b/games-util/uglygs/uglygs-0_rc11-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${P/0_/}"
+DESCRIPTION="Quickly searches the network for game servers"
+HOMEPAGE="http://uglygs.uglypunk.com/"
+SRC_URI="ftp://ftp.uglypunk.com/uglygs/current/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~alpha ~hppa ~x86"
+IUSE=""
+
+DEPEND="net-analyzer/rrdtool[graph]
+	dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}"/${PV}-uglygs.conf.patch
+	sed -i \
+		-e "s:GENTOO_DIR:/usr/$(get_libdir)/${PN}:" uglygs.conf || die
+	eapply "${FILESDIR}"/${PV}-uglygs.pl.patch
+	sed -i \
+		-e "s:GENTOO_DIR:/etc:" uglygs.pl || die
+	sed -i \
+		-e "s/strndup/${PN}_strndup/" qstat/qstat.c || die
+}
+
+src_compile() {
+	emake -C qstat CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	insinto /etc
+	doins uglygs.conf qstat/qstat.cfg
+
+	dobin uglygs.pl
+
+	insinto /usr/"$(get_libdir)"/${PN}
+	doins -r data templates tmp
+	insinto /usr/"$(get_libdir)"/${PN}/images
+	doins -r images/{avp2,bds,default.gif,hls,j2s,mhs,q3s,rws,sf2s,uns,vcs}
+	dosym bds /usr/"$(get_libdir)"/${PN}/images/bdl
+	keepdir /usr/"$(get_libdir)"/${PN}/tmp
+
+	exeinto /usr/"$(get_libdir)"/${PN}
+	doexe qstat/qstat
+
+	einstalldocs
+}
diff --git a/games-util/umodpack-0.5_beta16-r2 b/games-util/umodpack-0.5_beta16-r2
deleted file mode 100644
index 71395183ca7b..000000000000
--- a/games-util/umodpack-0.5_beta16-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-IO-Compress dev-perl/Archive-Zip dev-perl/Tie-IxHash tk? ( dev-perl/Tk ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=portable and useful [un]packer for Unreal Tournament's Umod files
-EAPI=5
-HOMEPAGE=http://www.oldunreal.com/wiki/index.php?title=UmodPack
-IUSE=tk
-KEYWORDS=~amd64 ~x86
-LICENSE=Artistic
-RDEPEND=virtual/perl-IO-Compress dev-perl/Archive-Zip dev-perl/Tie-IxHash tk? ( dev-perl/Tk ) dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://gentoo/umodpack-0.5b16-allinone.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a2f88f616f2119e7f9628923865cd537
diff --git a/games-util/umodpack/Manifest b/games-util/umodpack/Manifest
new file mode 100644
index 000000000000..88f4fb7cc9ba
--- /dev/null
+++ b/games-util/umodpack/Manifest
@@ -0,0 +1,3 @@
+DIST umodpack-0.5b16-allinone.tar.gz 3605080 BLAKE2B 718208835f318c85305f266a23f9fa5c2966031924d4d4e3a5cdee649afaee64ed5ac753e630ef6783a49581b932a44d8b0dafa3e97603eb1706190f3c7e10d5 SHA512 3678507c7aec30043f50f5519935e2d5eb7471b5e0692ba8b27c506bdd7a067fdb055e6731a6bffb04bb3008020c889f3486624a1466a77e0eab3e5139003ff0
+EBUILD umodpack-0.5_beta16-r2.ebuild 968 BLAKE2B 23eaa1f37092fd58f7b01f8f3c9549f7b5e80ec20be6910cc91e803896fc8b7bfd95372c3c6da02473ae27df2c973f72c35879d7f2dfb88b34acfdddf8a5e1fa SHA512 e97de8824e672d0a6812868133cee06b3452a35f595b88a0f9fea06f2fd7a96b0d557a7081cda9d16283855d1cc76b33eb6607a6dabb664989b7817950943b41
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/umodpack/metadata.xml b/games-util/umodpack/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-util/umodpack/metadata.xml
@@ -0,0 +1,8 @@
+<?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-util/umodpack/umodpack-0.5_beta16-r2.ebuild b/games-util/umodpack/umodpack-0.5_beta16-r2.ebuild
new file mode 100644
index 000000000000..772fe6487292
--- /dev/null
+++ b/games-util/umodpack/umodpack-0.5_beta16-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit perl-module toolchain-funcs
+
+MY_P=${P/_beta/b}
+DESCRIPTION="portable and useful [un]packer for Unreal Tournament's Umod files"
+HOMEPAGE="http://www.oldunreal.com/wiki/index.php?title=UmodPack"
+SRC_URI="mirror://gentoo/${MY_P}-allinone.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tk"
+
+DEPEND="virtual/perl-IO-Compress
+	dev-perl/Archive-Zip
+	dev-perl/Tie-IxHash
+	tk? ( dev-perl/Tk )"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${MY_P}
+SRC_TEST="do parallel"
+
+src_prepare() {
+	# remove the stupid perl modules since we already installed em
+	rm -rf {Archive-Zip,Compress-Zlib,Tie-IxHash,Tk}* || die
+}
+
+src_compile() {
+	perl-module_src_compile
+
+	cd umr-0.3 || die
+	emake DEBUG=0 CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
+}
+
+src_install() {
+	mydoc="Changes"
+	perl-module_src_install
+	dobin umod umr-0.3/umr
+	if use tk ; then
+		dobin xumod
+	fi
+}
diff --git a/games-util/uz2unpack-0.1 b/games-util/uz2unpack-0.1
deleted file mode 100644
index d7c42481369f..000000000000
--- a/games-util/uz2unpack-0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=sys-libs/zlib
-DESCRIPTION=UZ2 Decompressor for UT2003/UT2004
-EAPI=5
-HOMEPAGE=http://icculus.org/cgi-bin/ezmlm/ezmlm-cgi?42:mss:1013:200406:kikgppboefcimdbadcdo
-KEYWORDS=~amd64 ~x86
-LICENSE=public-domain
-RDEPEND=sys-libs/zlib
-SLOT=0
-SRC_URI=mirror://gentoo/uz2unpack-0.1.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=ab1940ad956cc8031a99d6a8a8403e5c
diff --git a/games-util/uz2unpack/Manifest b/games-util/uz2unpack/Manifest
new file mode 100644
index 000000000000..13d57f9bc312
--- /dev/null
+++ b/games-util/uz2unpack/Manifest
@@ -0,0 +1,3 @@
+DIST uz2unpack-0.1.tar.bz2 1483 BLAKE2B b349aa9d04719364227da8c9074845527eff938805c27ab484e485d4ff8f8203320ed8e5772408b325dc10ea8662a37710cd8d62d51c498074f97b064b4ee800 SHA512 b3876a54dfd4729399dc768f9e096aa9eed3af9d7a0a5ad68777159244a7f3f4a7ff113d2da00ca9dba60c731e8abc3b88888aab3c0aa2b934decfee9312654b
+EBUILD uz2unpack-0.1.ebuild 528 BLAKE2B efb2e4309c7dbd4722da7e42072c677930955016c344a7274cc3b28bac19f86693f46c4d21cdcee2a588a819fa50a1dfddeae0b12bcfd0fe24736f8a6f52e5ca SHA512 35dabf8ab3202717a33bb89a37d3dc4e8b60bdb23c901c1b0c6de18357b602cc8d9f574ac96fbed404f9a48fad0928a57a3d9827d01059a87176930ca1c1f221
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/uz2unpack/metadata.xml b/games-util/uz2unpack/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-util/uz2unpack/metadata.xml
@@ -0,0 +1,8 @@
+<?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-util/uz2unpack/uz2unpack-0.1.ebuild b/games-util/uz2unpack/uz2unpack-0.1.ebuild
new file mode 100644
index 000000000000..494df27d5a68
--- /dev/null
+++ b/games-util/uz2unpack/uz2unpack-0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="UZ2 Decompressor for UT2003/UT2004"
+HOMEPAGE="http://icculus.org/cgi-bin/ezmlm/ezmlm-cgi?42:mss:1013:200406:kikgppboefcimdbadcdo"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-libs/zlib"
+RDEPEND=${DEPEND}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LDLIBS=-lz ${PN}
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc README
+}
diff --git a/games-util/vispatch-1.4.6 b/games-util/vispatch-1.4.6
deleted file mode 100644
index 63ed0be642cd..000000000000
--- a/games-util/vispatch-1.4.6
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=WaterVIS utility for glquake
-EAPI=5
-HOMEPAGE=http://vispatch.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/vispatch/vispatch-1.4.6.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=55ccd06383796f9ec209b646b7670a5c
diff --git a/games-util/vispatch/Manifest b/games-util/vispatch/Manifest
new file mode 100644
index 000000000000..299d4ef76a7f
--- /dev/null
+++ b/games-util/vispatch/Manifest
@@ -0,0 +1,3 @@
+DIST vispatch-1.4.6.tgz 227850 BLAKE2B 5d403807d4c276e555c15da2e808fa408a54b766ac3db27f4159676689ebcfd8fedf4c43a3d8a7d39d80c29c20588d1805476ea61f4e88322b3d27f3e103b6ae SHA512 0034660c1ba238360cc5b71e846d2117f76af2340fcee2a0a25b42d1e200ec7231796b45d89335bf7e303379d9f5c03f4f0a9b22a1a54da356ac9a41b24abcc1
+EBUILD vispatch-1.4.6.ebuild 510 BLAKE2B 8fcd7553d01e818740ecdd08ddcc5f19cbe2df73ee952fb31a918f87870e776b974b8ed6b35440cb8f2bd5d8d869935f1561aba4673153864bcfa81202b3bf52 SHA512 aa22d38e18ee768b5d45ef68451d4426a6f04aafd28e2d2ceae9a08606ad5fceee4a8d2af7e8be2b5b39a18d5fe343e7fc4d8bf635ec2d629f19791b3d836ce6
+MISC metadata.xml 331 BLAKE2B ed3374770026f8ec9617349d81d1b7d6a1caaf942be3a98ee22b5385d4edf086834e0311b06a04cdfa0749443393049f50be9c5389cf81a0c155598588100b14 SHA512 a6016f990397a930eeb6fb10b1676ee26a299b3900f5937729783c80927912ee8522b4cd6641f2a71855cd75bdd92b4d0c72ad498c48f2bc5791dca1b6b4dac1
diff --git a/games-util/vispatch/metadata.xml b/games-util/vispatch/metadata.xml
new file mode 100644
index 000000000000..f12f3872db6d
--- /dev/null
+++ b/games-util/vispatch/metadata.xml
@@ -0,0 +1,11 @@
+<?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">vispatch</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-util/vispatch/vispatch-1.4.6.ebuild b/games-util/vispatch/vispatch-1.4.6.ebuild
new file mode 100644
index 000000000000..1bb5067893ac
--- /dev/null
+++ b/games-util/vispatch/vispatch-1.4.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="WaterVIS utility for glquake"
+HOMEPAGE="http://vispatch.sourceforge.net/"
+SRC_URI="mirror://sourceforge/vispatch/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/${P}/source
+
+src_prepare() {
+	sed -i \
+		-e '/^CFLAGS/d' \
+		-e '/^LDFLAGS/d' \
+		makefile || die
+	tc-export CC
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc ${PN}.txt
+}
diff --git a/games-util/wiiload-0.5 b/games-util/wiiload-0.5
deleted file mode 100644
index db0b77c08e85..000000000000
--- a/games-util/wiiload-0.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=load homebrew apps over the network to your Wii
-EAPI=5
-HOMEPAGE=http://wiibrew.org/wiki/Wiiload
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/wiiload-0.5.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=3330f5df4d242a5d98c9e47158dbb412
diff --git a/games-util/wiiload/Manifest b/games-util/wiiload/Manifest
new file mode 100644
index 000000000000..789d7042388b
--- /dev/null
+++ b/games-util/wiiload/Manifest
@@ -0,0 +1,3 @@
+DIST wiiload-0.5.tar.gz 5291 BLAKE2B e8e8e23569ee625648e222e2b1cf919f4304941303af19b33925a9647706dd9683fe93cb3a101c4bdd52525b19533f7bf357864c337e84053a45196a74287c15 SHA512 2c13490e5034078fef658ca3f9743be04fd6c870e485aae7be21a80967f2d1f1075fee016bf7945b20004bc5d96d0b3244f8a997c4410299f1f6afca002360e4
+EBUILD wiiload-0.5.ebuild 463 BLAKE2B 5ef313d5ec0b454f701c0bc7116e3d391ed94d7ae82a8b270a28ca5f93f6d57aaa9c9bbf06944fcb293bbe242499ec77645c88facc048c249c14649c67dfacd2 SHA512 34543b71e5d80d4c8000f406e8229ec207e9bee7590c8500143d668b906af5d6f60af9d38aeb7352aea56dc24ea8943f0e112199aa67b2c44d93440cfa391b17
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/wiiload/metadata.xml b/games-util/wiiload/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-util/wiiload/metadata.xml
@@ -0,0 +1,8 @@
+<?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-util/wiiload/wiiload-0.5.ebuild b/games-util/wiiload/wiiload-0.5.ebuild
new file mode 100644
index 000000000000..43aa072d0fb7
--- /dev/null
+++ b/games-util/wiiload/wiiload-0.5.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="load homebrew apps over the network to your Wii"
+HOMEPAGE="http://wiibrew.org/wiki/Wiiload"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}" || die
+}
+
+src_install() {
+	dobin wiiload
+}
diff --git a/games-util/wit-2.40a b/games-util/wit-2.40a
deleted file mode 100644
index aabd0f5665c7..000000000000
--- a/games-util/wit-2.40a
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile
-DEPEND=app-arch/bzip2 fuse? ( sys-fs/fuse ) zlib? ( sys-libs/zlib )
-DESCRIPTION=command line tools to manipulate Wii/GameCube ISO images and WBFS containers
-EAPI=6
-HOMEPAGE=https://wit.wiimm.de/
-IUSE=+fuse +zlib
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 fuse? ( sys-fs/fuse ) zlib? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~radhermit/distfiles/wit-2.40a.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=33d2d1cc1c4e43ac7fa4080d63bb0ef1
diff --git a/games-util/wit/Manifest b/games-util/wit/Manifest
new file mode 100644
index 000000000000..ab96e982359c
--- /dev/null
+++ b/games-util/wit/Manifest
@@ -0,0 +1,6 @@
+AUX wit-2.30a-makefile.patch 3579 BLAKE2B 1aa87c7323c67fb9b35a99cce4eb54332b64e7662410552a9762f8740b23f5674b4cea17145aa302e2ad23875bbb822651670f4010e32826c5f25e797b99ccdd SHA512 e3c98f47e10fe8771dabea091032625448d85adde125a93cc786a49def4f165e164eb71dc7612aee3eea47a9e11dfc0577c223c79eeae5d6832be44b055eed7b
+AUX wit-2.30a-no-exec-stack.patch 232 BLAKE2B 2af2bfe707d22b95f40f2f0e5675fef3e5a153615c327c1638e55651f1fa4cf61b2b868ff86ac899c64f1526f1093e044f32ca853ad0c11c5f505924ee8f1d4d SHA512 958f1fbeda1f29ad704d2eeb3c2a1281f71957fbbb07a7258e6e69af1552e13d135ed61864ef92b9a1334b91990f79366b5b235a8865c424414e46a9305762b0
+AUX wit-2.40a-sizeof-pointer-memaccess.patch 466 BLAKE2B 08c0ac490c63c4d8808ffb06470f96fa6d4f20ddad37662de2cd1c5c535a02b3fb50cbfa65d05b70c3b616522bcaceb37f8ee516abeb5727dc931948ad1bb6d6 SHA512 674052e924d81ab7a893e3ff5367e446e9498f3dbf0900fb7ff33a7c5dafda3c234d60238b1a30aa4865ff0d8f01ea9d3b882b567ac6886f2d875c797c398e3b
+DIST wit-2.40a.tar.xz 723448 BLAKE2B 3201000b86684b781e4dfbd738af22fbf87884110740a3b194028262deaf0617b44bcc4095fa60ee22e510e41cdd336f6bbcdeac076f49eda0d374cef2f457d7 SHA512 f119ed9dffbb42ba9037444aaa992adaa812c176d1e412f9df6c5b59efff51a24cca0141700939efec7845ac1d42cc9a30100e19ef39adee0306872181b28b5b
+EBUILD wit-2.40a.ebuild 817 BLAKE2B 5fbe8482f85e44b56dac474f5717d12c7b4d4d5da66fd5f9e6561b434408002585402daea229682b5c821d1e175faa1ea49450369b6867dc62c8c72ec2fb1c84 SHA512 5a7d6d6bb3c43e221c8b1ae606a66e5dab400067a234671ba64e7fcb8701de7f69898d9e937dcf22024c6a27579f4b37dac95f20194945258d4e74f27e89c756
+MISC metadata.xml 324 BLAKE2B ac8ddc6d26589b3d1421ae81c7ee04982b7604b91e89c3b39b83253d41ceeb298ff2ba402097438eb49c1fc48e6d673d60172b8c9a1108a53b8381bc5210cecc SHA512 e95891f8df24d69c9a567049fc3bb6888372eb69845cfccd62056fcde57d882f5344934dd3354e79b6b05ebefdd3c1c2183ea1cc4f473633c57becf0fb08a469
diff --git a/games-util/wit/files/wit-2.30a-makefile.patch b/games-util/wit/files/wit-2.30a-makefile.patch
new file mode 100644
index 000000000000..d705487cd8ba
--- /dev/null
+++ b/games-util/wit/files/wit-2.30a-makefile.patch
@@ -0,0 +1,120 @@
+--- wit-2.30a/Makefile
++++ wit-2.30a/Makefile
+@@ -190,8 +190,8 @@
+ endif
+ 
+ # lib summary
+-LIB_LIST	+= libbz2 lzma
+-LIB_OBJECTS	+= $(LIBBZ2_OBJ) $(LZMA_OBJ)
++LIB_LIST	+= lzma
++LIB_OBJECTS	+= $(LZMA_OBJ)
+ RM_FILES	+= $(foreach l,$(LIB_LIST),src/$(l)/*.{d,o})
+ 
+ 
+@@ -273,10 +274,8 @@
+ DEFINES1	+= -D_LZMA_PROB32=1	# LZMA option
+ DEFINES		=  $(strip $(DEFINES1) $(MODE) $(XDEF))
+ 
+-CFLAGS		+= -fomit-frame-pointer -fno-strict-aliasing -funroll-loops
+ CFLAGS		+= -Wall -Wno-parentheses -Wno-unused-function
+-#CFLAGS		+= -O3 -Isrc/libwbfs -Isrc/lzma -Isrc -I$(UI) -I. -Iwork
+-CFLAGS		+= -O3 -Isrc/libwbfs -Isrc -I$(UI) -I. -Iwork
++CFLAGS		+= -Isrc/libwbfs -Isrc -I$(UI) -I. -Iwork
+ ifeq ($(SYSTEM),mac)
+  CFLAGS		+= -I/usr/local/include
+ endif
+@@ -291,7 +290,7 @@
+ ifeq ($(HAVE_ZLIB),1)
+  LIBS		+= -lz
+ endif
+-LIBS		+= $(XLIBS)
++LIBS		+= $(XLIBS) -lbz2
+ 
+ DISTRIB_RM	= ./wit-v$(VERSION)-r
+ DISTRIB_BASE	= wit-v$(VERSION)-r$(REVISION_NEXT)
+@@ -344,71 +343,60 @@
+ # general rules
+ 
+ $(ALL_TOOLS_X): %: %.o $(ALL_OBJECTS) $(TOBJ_ALL) Makefile | $(HELPER_TOOLS)
+-	@printf "$(LOGFORMAT)" tool "$@" "$(MODE) $(TOPT_$@) $(TOBJ_$@)"
+-	@$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \
++	$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \
+ 		$(ALL_OBJECTS) $(TOBJ_$@) $(LIBS) $(TOPT_$@) -o $@
+-	@if test -f $@.exe; then $(STRIP) $@.exe; else $(STRIP) $@; fi
+ 
+-	@mkdir -p bin/$(SYSTEM) bin/$(SYSTEM)/debug
+-	@if test -s $(MODE_FILE) && grep -Fq -e -DDEBUG $(MODE_FILE); \
++	mkdir -p bin/$(SYSTEM) bin/$(SYSTEM)/debug
++	if test -s $(MODE_FILE) && grep -Fq -e -DDEBUG $(MODE_FILE); \
+ 		then cp -p $@ bin/$(SYSTEM)/debug/; \
+ 		else cp -p $@ bin/; cp -p $@ bin/$(SYSTEM)/; fi
+ 
+ #--------------------------
+ 
+ $(HELPER_TOOLS): %: %.o $(ALL_OBJECTS) $(UI_TABS) Makefile
+-	@printf "$(LOGFORMAT)" helper "$@ $(TOBJ_$@)" "$(MODE)"
+-	@$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \
++	$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \
+ 		$(ALL_OBJECTS) $(TOBJ_$@) $(LIBS) -o $@
+ 
+ #--------------------------
+ 
+ $(WDF_LINKS): wdf
+-	@printf "$(LOGFORMAT)" "link" "wdf -> $@" ""
+-	@ln -f wdf "$@"
++	ln -f wdf "$@"
+ 
+ #--------------------------
+ 
+ $(UI_OBJECTS): %.o: %.c ui-%.c ui-%.h version.h Makefile
+-	@printf "$(LOGFORMAT)" +object "$@" "$(MODE)"
+-	@$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
++	$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
+ 
+ #--------------------------
+ 
+ $(C_OBJECTS): %.o: %.c version.h Makefile $(TEXT_FILES)
+-	@printf "$(LOGFORMAT)" object "$@" "$(MODE)"
+-	@$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
++	$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
+ 
+ #--------------------------
+ 
+ $(ASM_OBJECTS): %.o: %.S Makefile
+-	@printf "$(LOGFORMAT)" asm "$@" "$(MODE)"
+-	@$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
++	$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
+ 
+ #--------------------------
+ 
+ $(SETUP_FILES): templates.sed $(SETUP_DIR)/$@
+-	@printf "$(LOGFORMAT)" create "$@" ""
+-	@chmod 775 $(GEN_TEMPLATE)
+-	@$(GEN_TEMPLATE) $@
++	chmod 775 $(GEN_TEMPLATE)
++	$(GEN_TEMPLATE) $@
+ 
+ #--------------------------
+ 
+ $(TEXT_FILES): $(GEN_TEXT_FILE) $(TEXT_DIR)/$@
+-	@printf "$(LOGFORMAT)" text "$@" ""
+-	@chmod 775 $(GEN_TEXT_FILE)
+-	@$(GEN_TEXT_FILE) $(TEXT_DIR) $@
++	chmod 775 $(GEN_TEXT_FILE)
++	$(GEN_TEXT_FILE) $(TEXT_DIR) $@
+ 
+ #--------------------------
+ 
+ $(UI_FILES): gen-ui.c tab-ui.c ui.h $(UI_TABS) | gen-ui
+-	@printf "$(LOGFORMAT)" run gen-ui ""
+-	@./gen-ui
++	./gen-ui
+ 
+ .PHONY : ui
+ ui : gen-ui
+-	@printf "$(LOGFORMAT)" run gen-ui ""
+-	@./gen-ui
++	./gen-ui
+ 
+ #
+ ###############################################################################
diff --git a/games-util/wit/files/wit-2.30a-no-exec-stack.patch b/games-util/wit/files/wit-2.30a-no-exec-stack.patch
new file mode 100644
index 000000000000..db91b45cfcb1
--- /dev/null
+++ b/games-util/wit/files/wit-2.30a-no-exec-stack.patch
@@ -0,0 +1,9 @@
+--- wit-2.30a/src/crypto/ssl-asm.S
++++ wit-2.30a/src/crypto/ssl-asm.S
+@@ -37,3 +37,6 @@
+ #define WIT_INCLUDE_SSL_ASM
+ #include "ssl-asm.h"
+ 
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
diff --git a/games-util/wit/files/wit-2.40a-sizeof-pointer-memaccess.patch b/games-util/wit/files/wit-2.40a-sizeof-pointer-memaccess.patch
new file mode 100644
index 000000000000..a6083103b857
--- /dev/null
+++ b/games-util/wit/files/wit-2.40a-sizeof-pointer-memaccess.patch
@@ -0,0 +1,20 @@
+--- wit-2.40a/src/wfuse.c
++++ wit-2.40a/src/wfuse.c
+@@ -340,7 +340,7 @@
+ 	    }
+ 	    ResetWBFS(df->wbfs);
+ 	    FREE(df->wbfs);
+-	    memset(df,0,sizeof(df));
++	    memset(df,0,sizeof(*df));
+ 	    n_dfile--;
+ 	}
+ 
+@@ -352,7 +352,7 @@
+ 
+     if (found_df)
+     {
+-	memset(found_df,0,sizeof(found_df));
++	memset(found_df,0,sizeof(*found_df));
+ 	WBFS_t * wbfs = MALLOC(sizeof(*wbfs));
+ 	InitializeWBFS(wbfs);
+ 	enumError err = OpenWBFS(wbfs,source_file,false,true,0);
diff --git a/games-util/wit/metadata.xml b/games-util/wit/metadata.xml
new file mode 100644
index 000000000000..baf90ff6dc62
--- /dev/null
+++ b/games-util/wit/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<use>
+		<flag name="fuse">Enable image mount support via fuse</flag>
+	</use>
+</pkgmetadata>
diff --git a/games-util/wit/wit-2.40a.ebuild b/games-util/wit/wit-2.40a.ebuild
new file mode 100644
index 000000000000..cb5a55fdabdc
--- /dev/null
+++ b/games-util/wit/wit-2.40a.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="command line tools to manipulate Wii/GameCube ISO images and WBFS containers"
+HOMEPAGE="https://wit.wiimm.de/"
+SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+fuse +zlib"
+
+RDEPEND="
+	app-arch/bzip2
+	fuse? ( sys-fs/fuse )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+
+DOCS="doc/*.txt"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.30a-makefile.patch
+	"${FILESDIR}"/${PN}-2.30a-no-exec-stack.patch
+	"${FILESDIR}"/${P}-sizeof-pointer-memaccess.patch
+)
+
+src_compile() {
+	export NO_FUSE=$(usex fuse 0 1)
+	export NO_ZLIB=$(usex zlib 0 1)
+
+	emake INSTALL_PATH="${D}"/usr CC="$(tc-getCC)"
+	emake doc
+}
diff --git a/games-util/wxchtdecoder-1.5a-r1 b/games-util/wxchtdecoder-1.5a-r1
deleted file mode 100644
index c7b39e00f647..000000000000
--- a/games-util/wxchtdecoder-1.5a-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/wxGTK:3.0[X]
-DESCRIPTION=A program to decode .CHT files in Snes9x and ZSNES to plain text
-EAPI=5
-HOMEPAGE=http://games.technoplaza.net/chtdecoder/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/wxGTK:3.0[X]
-SLOT=0
-SRC_URI=mirror://gentoo/wxchtdecoder-1.5a.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	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=738b87742a61037f1ff2350466d04c16
diff --git a/games-util/wxchtdecoder/Manifest b/games-util/wxchtdecoder/Manifest
new file mode 100644
index 000000000000..f6431906ebc3
--- /dev/null
+++ b/games-util/wxchtdecoder/Manifest
@@ -0,0 +1,4 @@
+AUX wxchtdecoder-1.5a-wxgtk.patch 1379 BLAKE2B 7a2c528a3a360148c78dae47beff3af43c97c1cb96108af80ba38ddb217e84d2e28539e4d3550b5b0d95119c3c6c7d332a2aeef9c059dded918627ac4c867869 SHA512 96fc2236b7f99f5cc3df1672174c332cb568ad0899a209a7e022bd24617b31854338435db4fbef1523f5d67ae466f2de3da29ac417ae8ad948f4e90326727a3b
+DIST wxchtdecoder-1.5a.tar.bz2 84088 BLAKE2B 1bff9a352a80d3f89b9963540e4a1a0ea79bffa8220c1c1a940068180a294a5518edd6fda13083d0d5fe3baa5f64813b6c925257e23d306a0de625817839c908 SHA512 edb606d1b88cedcb725a1dca2c82f4a81ebff5a1b8786a4127505e021b1fc8cc351363d05963a68c7d555f895b3b762fbd34dfc3f26640759619daecce1097df
+EBUILD wxchtdecoder-1.5a-r1.ebuild 636 BLAKE2B 96ea412aac88b5964aa6b6bc4f2d943d1934d59e9492afb44b11d8afbafb71823a9a97e77f1753bca3563470dbdf93bf591d7967c4ed3e7c02e09848efc2c0f4 SHA512 68f202580b719571d81f2ccc6374e13366e2846e9740a725f922a005608ff651b7f221b00c24ab344c8847314636d455a5a46010c7ebaa8bf97cda871a699540
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/wxchtdecoder/files/wxchtdecoder-1.5a-wxgtk.patch b/games-util/wxchtdecoder/files/wxchtdecoder-1.5a-wxgtk.patch
new file mode 100644
index 000000000000..1eb61febe1bb
--- /dev/null
+++ b/games-util/wxchtdecoder/files/wxchtdecoder-1.5a-wxgtk.patch
@@ -0,0 +1,37 @@
+--- wxchtdecoder-1.5a.orig/source/chtdecoder.cc
++++ wxchtdecoder-1.5a/source/chtdecoder.cc
+@@ -64,26 +64,26 @@
+ const wxSize *CHTDecoder::APP_SIZE = new wxSize(640, 480);
+ 
+ namespace {
+-    const wxCmdLineEntryDesc CMDLINE_DESC[] = {
++    wxCmdLineEntryDesc CMDLINE_DESC[] = {
+         { 
+-            wxCMD_LINE_SWITCH, wxT("h"), wxT("help"),
+-            wxT("display usage information"), wxCMD_LINE_VAL_STRING,
++            wxCMD_LINE_SWITCH, "h", "help",
++            "display usage information", wxCMD_LINE_VAL_STRING,
+             wxCMD_LINE_OPTION_HELP
+         },
+           
+         { 
+-            wxCMD_LINE_SWITCH, wxT("v"), wxT("version"),
+-            wxT("display version information"), wxCMD_LINE_VAL_STRING,
++            wxCMD_LINE_SWITCH, "v", "version",
++            "display version information", wxCMD_LINE_VAL_STRING,
+             wxCMD_LINE_OPTION_HELP 
+         },
+           
+         {
+-            wxCMD_LINE_SWITCH, wxT("f"), wxT("force-open"),
+-            wxT("force opening of possibly invalid .CHT files")
++            wxCMD_LINE_SWITCH, "f", "force-open",
++            "force opening of possibly invalid .CHT files"
+         },
+         
+         {
+-            wxCMD_LINE_PARAM, 0, 0, wxT(".CHT file(s)"),
++            wxCMD_LINE_PARAM, 0, 0, ".CHT file(s)",
+             wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE
+         },
+         
diff --git a/games-util/wxchtdecoder/metadata.xml b/games-util/wxchtdecoder/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-util/wxchtdecoder/metadata.xml
@@ -0,0 +1,8 @@
+<?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-util/wxchtdecoder/wxchtdecoder-1.5a-r1.ebuild b/games-util/wxchtdecoder/wxchtdecoder-1.5a-r1.ebuild
new file mode 100644
index 000000000000..0a8fbabae6b4
--- /dev/null
+++ b/games-util/wxchtdecoder/wxchtdecoder-1.5a-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+WX_GTK_VER="3.0"
+inherit eutils wxwidgets
+
+DESCRIPTION="A program to decode .CHT files in Snes9x and ZSNES to plain text"
+HOMEPAGE="http://games.technoplaza.net/chtdecoder/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X]"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-wxgtk.patch
+}
+
+src_configure() {
+	econf --with-wx-config=${WX_CONFIG}
+}
+
+src_install() {
+	dobin source/wxchtdecoder
+	dodoc docs/wxchtdecoder.txt
+}
diff --git a/games-util/xboxdrv-0.8.8 b/games-util/xboxdrv-0.8.8
deleted file mode 100644
index 634763eeeb28..000000000000
--- a/games-util/xboxdrv-0.8.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND=dev-libs/boost:= dev-libs/dbus-glib:= virtual/libudev:= sys-apps/dbus:= dev-libs/glib:2= virtual/libusb:1= x11-libs/libX11:= virtual/pkgconfig dev-util/scons[python_targets_python2_7] virtual/pkgconfig virtual/pkgconfig
-DESCRIPTION=Userspace Xbox 360 Controller driver
-EAPI=6
-HOMEPAGE=https://pingus.seul.org/~grumbel/xboxdrv/
-IUSE=kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/boost:= dev-libs/dbus-glib:= virtual/libudev:= sys-apps/dbus:= dev-libs/glib:2= virtual/libusb:1= x11-libs/libX11:=
-SLOT=0
-SRC_URI=https://pingus.seul.org/~grumbel/xboxdrv/xboxdrv-linux-0.8.8.tar.bz2
-_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
-_md5_=c2be9b9c1b542286c8364c727528863b
diff --git a/games-util/xboxdrv/Manifest b/games-util/xboxdrv/Manifest
new file mode 100644
index 000000000000..e28e31338358
--- /dev/null
+++ b/games-util/xboxdrv/Manifest
@@ -0,0 +1,11 @@
+AUX github-144.patch 491 BLAKE2B d644c7af466ee4c0e661292509b614f6a36f69a2bdf2919a4fd26baf07571655f52681eb9787adaefb1f853fd31c71e8156a0df5e65d9e92e72ae531aa93c768 SHA512 058eb9515a74742d6aef1de3acc76b8731947fe4a3aa1179243d0b14cab5f978aef98d9b140371dd03a5165f96e167b1dc7297378545f266e887ea0b3188c79e
+AUX org.seul.Xboxdrv.conf 247 BLAKE2B 0829d1e65203f56efc0442c798070cf8c9f6b53792b5eb4fd8cc0671068d5d66d281b2c53c5cdb06474b635c2c9c5076d3a64364afdffc87a0c1bf052015f9ff SHA512 1416e80d326481e224ce3381a8feeacf304107f945d787183c74118aae955e191cc89269e8de44d6ce4efc2502def6957b690e9bad70072fcf0bbd47c8ab12cc
+AUX xboxdrv-0.8.8-fix-c++14.patch 337 BLAKE2B 5fc250da71e11432c215fa42751be07a5eef37036a4a406601619f8b07554d9b349ba66196b84090e23d807687379b64710218d8b0b6c63036e189c2331a14c0 SHA512 97b504a0acf7fd52ef0f4accacd89e9211136809c7559bd8958d2b235d732df2659fb5b794512e2ff3aaf33f22d97e2f4b42187eab9406a36e7b6cb9fd651832
+AUX xboxdrv-0.8.8-scons.patch 584 BLAKE2B cbe8d12773b2f5c6051291fda2c8df23811d12c5440d7dd7f50777bdc01f474f971713ec513a245787a2b113e32cb03b202bf28619e96315fa2992edc21083cb SHA512 25b7b1e57f7ad9b48ad566c81b97b9354a353535564462e8c4b550190c920718165044508d28b3d5fee6155bb41752afbd8038fab59239c58e1aee82d62c5910
+AUX xboxdrv.confd 211 BLAKE2B 7a79059b29edbfbde33fe3daf9c89346246ac4323d7053ea4b26b6dd1fff07d731f8f7faa6a79f152f76eb1722606655f1d8d1026a3a83b0520e1909915039db SHA512 4c8a784a18979746a45653244e451fe1ba9e7cbb14301cc18f58e474e51f7569177364c5a96cbe0275db2b359424febd27c040ede5820148aadb80e90ebf8178
+AUX xboxdrv.initd 446 BLAKE2B f78cf4af5cca703efc0a480c2ba34b0189d2b86a64aa89533e59a4d325ca03592bc911a9c85ff1fe5801ef2ade537dcfcc7266052a77f64ff05dad5f43630167 SHA512 e87d4b4b4313cb4ae983aef4ab7fa799f6b466e0f504eb15905b82f5b8bca2f0ff6f3d9a7d9963c048b6189e2a4c4b862a3f39d4201c2f5f02234362ad7b3af1
+AUX xboxdrv.service 371 BLAKE2B afd5f5397f4ae15af69d8e12865201fe159691ba2a36c00fe207304afe5126814fafd0394e7618e9f4d27611bd2c0dd7371717c7a07a57d27c3a4ab8e6e40140 SHA512 80e7657edae9c771740628ef5f9752b79d50288ead33afe97e71ffc6e7d7c24343eeb213668cdc823b28742976e2e56f4defdcd823716897f3262be1fc7832e9
+AUX xboxdrv.udev-rules 225 BLAKE2B 0f027c332b58d7ec3c289d23192355dae8d44f50c7cbf9de42a2023a2db6c29943fc7eecc85a0e802f5925ffdfc145584909140df8c030a120fe3da79c91641e SHA512 eb9e535bb18077e4c61db8fa5020a779b856a6df29eb4daa72a2ab9675720f809a981b0e4706fbbc6bf5a368cc162c7151cd6ae10399d091f10d2f75b1c48a3e
+DIST xboxdrv-linux-0.8.8.tar.bz2 267919 BLAKE2B b6f09fc929ba561f0c18a777ca94f6972f366d29709d5fdcb168988311ca53eb813761df0f87d148795aa14d2d89b200e8123502c0b255ebe20e5f9caa18f8f1 SHA512 2978b33d23636431ee0cc393ea32d3d26ebe9f2b914f0bf8bc0e096f98202726768142e653bc5765ac55084b105ff3a6214bdf6e745fdd8aa167260c54c10494
+EBUILD xboxdrv-0.8.8.ebuild 1405 BLAKE2B 5636721b89c91b62ac51695148920a0cd1641e5a8f847225a627dc71009a7480fbb02fa884ca590a1f375aca820fe3d3266c814afd1723717cf0b486b8eeffc2 SHA512 f91abd7d9370f4d2e6c79ed38da4eb93592e672dbe0ed2eac377da6fb927ed83e8ffb6eecff29a45926258950ea4da52f53bf619deb9ebedbb383495ca9b5e1a
+MISC metadata.xml 252 BLAKE2B 1b951d2e730631865ae5f379b19ed9de2c8adf2f2786da3f75d0871d967374198ddd9106433f388bdc7050c37063fb28cda4320ae7bdc9a03854838693d9f952 SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638
diff --git a/games-util/xboxdrv/files/github-144.patch b/games-util/xboxdrv/files/github-144.patch
new file mode 100644
index 000000000000..5782e1a8cd52
--- /dev/null
+++ b/games-util/xboxdrv/files/github-144.patch
@@ -0,0 +1,15 @@
+diff -Naur xboxdrv-linux-0.8.5.orig/src/usb_gsource.cpp xboxdrv-linux-0.8.5/src/usb_gsource.cpp
+--- xboxdrv-linux-0.8.5.orig/src/usb_gsource.cpp	2013-04-07 18:27:49.000000000 +0100
++++ xboxdrv-linux-0.8.5/src/usb_gsource.cpp	2016-07-02 12:35:41.692355904 +0100
+@@ -174,7 +174,10 @@
+ gboolean
+ USBGSource::on_source()
+ {
+-  libusb_handle_events(NULL);
++  struct timeval to;
++  to.tv_sec = 0;
++  to.tv_usec = 0;
++  libusb_handle_events_timeout_completed(NULL, &to, NULL);
+   return TRUE;
+ }
+ 
diff --git a/games-util/xboxdrv/files/org.seul.Xboxdrv.conf b/games-util/xboxdrv/files/org.seul.Xboxdrv.conf
new file mode 100644
index 000000000000..fc685d6e8e83
--- /dev/null
+++ b/games-util/xboxdrv/files/org.seul.Xboxdrv.conf
@@ -0,0 +1,7 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <policy context="default">
+    <allow own="org.seul.Xboxdrv"/>
+  </policy>
+</busconfig>
diff --git a/games-util/xboxdrv/files/xboxdrv-0.8.8-fix-c++14.patch b/games-util/xboxdrv/files/xboxdrv-0.8.8-fix-c++14.patch
new file mode 100644
index 000000000000..80a8d8f550e1
--- /dev/null
+++ b/games-util/xboxdrv/files/xboxdrv-0.8.8-fix-c++14.patch
@@ -0,0 +1,16 @@
+Cast boost::shared_ptr explicitly for C++14.
+See also: https://bugs.gentoo.org/show_bug.cgi?id=594674
+
+--- a/src/controller_slot.cpp
++++ b/src/controller_slot.cpp
+@@ -67,9 +67,9 @@ ControllerSlot::disconnect()
+ }
+ 
+ bool
+ ControllerSlot::is_connected() const
+ {
+-  return m_thread;
++  return static_cast<bool>(m_thread);
+ }
+ 
+ /* EOF */
diff --git a/games-util/xboxdrv/files/xboxdrv-0.8.8-scons.patch b/games-util/xboxdrv/files/xboxdrv-0.8.8-scons.patch
new file mode 100644
index 000000000000..d6df8d99e32e
--- /dev/null
+++ b/games-util/xboxdrv/files/xboxdrv-0.8.8-scons.patch
@@ -0,0 +1,13 @@
+https://dev.gentoo.org/~vapier/scons-blows.txt
+
+diff -Naur xboxdrv-linux-0.8.8.orig/SConstruct xboxdrv-linux-0.8.8/SConstruct
+--- xboxdrv-linux-0.8.8.orig/SConstruct	2015-11-09 10:19:35.000000000 +0000
++++ xboxdrv-linux-0.8.8/SConstruct	2016-07-02 16:13:52.560961836 +0100
+@@ -84,6 +84,7 @@
+ opts.Add('CXXFLAGS', 'C++ Compiler flags')
+ opts.Add('LINKFLAGS', 'Linker Compiler flags')
+ opts.Add('AR', 'Library archiver')
++opts.Add('RANLIB', 'Archive indexer')
+ opts.Add('CC', 'C Compiler')
+ opts.Add('CXX', 'C++ Compiler')
+ opts.Add('BUILD', 'Build type: release, custom, development')
diff --git a/games-util/xboxdrv/files/xboxdrv.confd b/games-util/xboxdrv/files/xboxdrv.confd
new file mode 100644
index 000000000000..99363c95dafb
--- /dev/null
+++ b/games-util/xboxdrv/files/xboxdrv.confd
@@ -0,0 +1,5 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+XBOXDRV_OPTS=""
+#XBOXDRV_OPTS="${XBOXDRV_OPTS} --next-controller --config /etc/xboxdrv/controller.ini"
diff --git a/games-util/xboxdrv/files/xboxdrv.initd b/games-util/xboxdrv/files/xboxdrv.initd
new file mode 100644
index 000000000000..8602c7e12531
--- /dev/null
+++ b/games-util/xboxdrv/files/xboxdrv.initd
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PIDFILE="/var/run/${SVCNAME}.pid"
+
+start() {
+	ebegin "Starting xboxdrv"
+	start-stop-daemon --start --pidfile "${PIDFILE}" --exec /usr/bin/xboxdrv -- \
+		--daemon --detach --pid-file "${PIDFILE}" ${XBOXDRV_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping xboxdrv"
+	start-stop-daemon --stop --pidfile "${PIDFILE}"
+	eend $?
+}
diff --git a/games-util/xboxdrv/files/xboxdrv.service b/games-util/xboxdrv/files/xboxdrv.service
new file mode 100644
index 000000000000..b0d372696e0a
--- /dev/null
+++ b/games-util/xboxdrv/files/xboxdrv.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Userspace Xbox 360 Controller driver
+BindsTo=sys-subsystem-usb-xbox-controller0.device
+After=sys-subsystem-usb-xbox-controller0.device
+
+[Service]
+BusName=org.seul.Xboxdrv
+ExecStart=/usr/bin/xboxdrv --silent --daemon
+KillSignal=SIGINT
+# xboxdrv can not stop gracefully if controller gets unplugged
+TimeoutStopSec=2
+
+[Install]
+WantedBy=multi-user.target
diff --git a/games-util/xboxdrv/files/xboxdrv.udev-rules b/games-util/xboxdrv/files/xboxdrv.udev-rules
new file mode 100644
index 000000000000..c571b2b5ab02
--- /dev/null
+++ b/games-util/xboxdrv/files/xboxdrv.udev-rules
@@ -0,0 +1,5 @@
+SUBSYSTEM=="usb", ACTION=="add",\
+	ENV{ID_MODEL_FROM_DATABASE}=="Xbox*Controller|Xbox*Controller S",\
+	TAG+="systemd",\
+	ENV{SYSTEMD_ALIAS}="/sys/subsystem/usb/xbox/controller$number",\
+	ENV{SYSTEMD_WANTS}+="xboxdrv.service"
diff --git a/games-util/xboxdrv/metadata.xml b/games-util/xboxdrv/metadata.xml
new file mode 100644
index 000000000000..3c186688e265
--- /dev/null
+++ b/games-util/xboxdrv/metadata.xml
@@ -0,0 +1,8 @@
+<?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-util/xboxdrv/xboxdrv-0.8.8.ebuild b/games-util/xboxdrv/xboxdrv-0.8.8.ebuild
new file mode 100644
index 000000000000..a9324ad2dffe
--- /dev/null
+++ b/games-util/xboxdrv/xboxdrv-0.8.8.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit linux-info scons-utils toolchain-funcs systemd udev
+
+MY_P=${PN}-linux-${PV}
+DESCRIPTION="Userspace Xbox 360 Controller driver"
+HOMEPAGE="https://pingus.seul.org/~grumbel/xboxdrv/"
+SRC_URI="https://pingus.seul.org/~grumbel/xboxdrv/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/boost:=
+	dev-libs/dbus-glib:=
+	virtual/libudev:=
+	sys-apps/dbus:=
+	dev-libs/glib:2=
+	virtual/libusb:1=
+	x11-libs/libX11:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-scons.patch
+	"${FILESDIR}"/github-144.patch
+	"${FILESDIR}"/${P}-fix-c++14.patch
+)
+
+CONFIG_CHECK="~INPUT_EVDEV ~INPUT_JOYDEV ~INPUT_UINPUT ~!JOYSTICK_XPAD"
+
+src_compile() {
+	escons \
+		BUILD=custom \
+		CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR)" \
+		RANLIB="$(tc-getRANLIB)" \
+		CXXFLAGS="-Wall ${CXXFLAGS}" \
+		LINKFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin xboxdrv
+	doman doc/xboxdrv.1
+	dodoc AUTHORS NEWS PROTOCOL README.md TODO
+
+	newinitd "${FILESDIR}"/xboxdrv.initd xboxdrv
+	newconfd "${FILESDIR}"/xboxdrv.confd xboxdrv
+
+	insinto /etc/dbus-1/system.d/
+	doins "${FILESDIR}/org.seul.Xboxdrv.conf"
+
+	udev_newrules "${FILESDIR}"/xboxdrv.udev-rules 99-xbox-controller.rules
+	systemd_dounit "${FILESDIR}"/xboxdrv.service
+}
+
+pkg_postinst() {
+	udev_reload
+}
diff --git a/games-util/xboxgw-1.082 b/games-util/xboxgw-1.082
deleted file mode 100644
index ca1cedd53767..000000000000
--- a/games-util/xboxgw-1.082
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Tunnels XBox system link games over the net
-EAPI=5
-HOMEPAGE=http://www.xboxgw.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=freedist
-SLOT=0
-SRC_URI=http://www.xboxgw.com/rel/dist2.1/tarballs/i386/xboxgw-1.08-2.tgz http://www.xboxgw.com/rel/dist2.1/tarballs/i386/hmlibs-1.07-2.i386.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=82f8df5447af0e8360f1a3fd82b4da29
diff --git a/games-util/xboxgw/Manifest b/games-util/xboxgw/Manifest
new file mode 100644
index 000000000000..4ab83a1e0ee4
--- /dev/null
+++ b/games-util/xboxgw/Manifest
@@ -0,0 +1,4 @@
+DIST hmlibs-1.07-2.i386.tgz 120364 BLAKE2B 3c2ffa9968ac3c39962314b41f19dc3071a0921f68f35ac1b20908fb496398e4957b7112f81a9658fb4ebb69f637039dfce0a180039ee787df850cfb9153eb04 SHA512 2624c44bee7985586288f3c3e2c27e30fb23735a555635ec5a2813a40a54eb7ae1ec0e6f691d883832ec2790ad88a7f03e15ebbaea464db20e2107635463c96c
+DIST xboxgw-1.08-2.tgz 91488 BLAKE2B 104f057e5f29d03525ad2460fa427cb32adadd8ee54d49c82e8ed61c976728494076cdc1b0fffb5f766f9f67a5045aecf2ce0022f2c68af10d8eb06573732693 SHA512 dd4b97fd535e84b4cae34135ab8220399e410a0ca3c73e3fff244ba6ec7f6944f40a7e33c74f3872496cae03fb87dc90e11b7fd4b788ee061d32f86ad36b0617
+EBUILD xboxgw-1.082.ebuild 971 BLAKE2B f70efb4fb3267d0e9d1ad7becb165de56d5ecbb62921443d748f7baff5edea21810b19c4cf740da72adc7247eaa961cb4893985eadfca1adc93b0f042dbb7bf5 SHA512 20509489a6e785937273a24bc026c7a1482edfb5240bf6ed0a0062a0fa31dd328dca771731f667b5625cf92fee32b23f35539b1fad90b09cd246fdf441c1893a
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/xboxgw/metadata.xml b/games-util/xboxgw/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-util/xboxgw/metadata.xml
@@ -0,0 +1,8 @@
+<?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-util/xboxgw/xboxgw-1.082.ebuild b/games-util/xboxgw/xboxgw-1.082.ebuild
new file mode 100644
index 000000000000..ef0a637ca80a
--- /dev/null
+++ b/games-util/xboxgw/xboxgw-1.082.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+XBOXGW_P="${PN}-1.08-2"
+HMLIBS_P="hmlibs-1.07-2"
+
+DESCRIPTION="Tunnels XBox system link games over the net"
+HOMEPAGE="http://www.xboxgw.com/"
+SRC_URI="http://www.xboxgw.com/rel/dist2.1/tarballs/i386/${XBOXGW_P}.tgz
+	http://www.xboxgw.com/rel/dist2.1/tarballs/i386/${HMLIBS_P}.i386.tgz"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+QA_PREBUILT="opt/${PN}/lib/libhmdb.so
+	opt/${PN}/lib/libhmsched.so
+	opt/${PN}/lib/libhmcli.so
+	opt/${PN}/lib/libhmsdb.so
+	opt/${PN}/bin/hmdbdump
+	opt/${PN}/bin/xboxgw
+	opt/${PN}/bin/xbifsetup"
+
+S=${WORKDIR}
+
+src_install() {
+	into /opt/${PN}
+
+	cd "${WORKDIR}/${HMLIBS_P}"
+	dolib.so *.so
+	dobin hmdbdump
+	insinto /usr/include/hmlibs
+	doins *.h
+
+	cd "${WORKDIR}/${XBOXGW_P}"
+	dobin xboxgw xbifsetup
+	dodoc *.txt
+
+	if use amd64 ; then
+		mv "${D}"/opt/${PN}/lib64 "${D}"/opt/${PN}/lib || die
+	fi
+}
diff --git a/games-util/xgame-1.7.1-r1 b/games-util/xgame-1.7.1-r1
deleted file mode 100644
index e79975e27636..000000000000
--- a/games-util/xgame-1.7.1-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Run games in a separate X session
-EAPI=6
-HOMEPAGE=http://xgame.tlhiv.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=http://downloads.tlhiv.com/xgame/xgame-1.7.1.tar.gz
-_md5_=e6c641335a77fedc06588b256274bae7
diff --git a/games-util/xgame-gtk2-2.0.2-r1 b/games-util/xgame-gtk2-2.0.2-r1
deleted file mode 100644
index 9d5ff050fd5b..000000000000
--- a/games-util/xgame-gtk2-2.0.2-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Run games in a separate X session
-EAPI=6
-HOMEPAGE=http://xgame.tlhiv.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl >=dev-perl/Gtk2-1.040
-SLOT=0
-SRC_URI=http://downloads.tlhiv.com/xgame/xgame-gtk2-2.0.2.tar.gz
-_md5_=95d69a5dd2c2de14af43252b62655552
diff --git a/games-util/xgame-gtk2/Manifest b/games-util/xgame-gtk2/Manifest
new file mode 100644
index 000000000000..2538323022d7
--- /dev/null
+++ b/games-util/xgame-gtk2/Manifest
@@ -0,0 +1,3 @@
+DIST xgame-gtk2-2.0.2.tar.gz 6055 BLAKE2B 31f95f1496fbc3b064fc54d9eeaa5b164218bcf77b0f49b6120d4fdd91bef54ebda8a2b9b3012a459d430730dbe02819b89c98c0841375639ad7bfef7986da02 SHA512 708a831f78866356e6fb5d2aa0926562eaf0a247e88b7971505f41aaa71ad7d30d5f4d2fefc57030fe1e27138a58799e7396da2026a01bd130febd8e5170c25b
+EBUILD xgame-gtk2-2.0.2-r1.ebuild 405 BLAKE2B 4f9cf44e8a96c7132a7aa42d5e483f6918b65dcde67b5ec1a89a571a5fc24be6434c494d22e31d7cf5a2d9794492f48669bd47a0120ecd92fc58a20eff7bd26b SHA512 41c271861b7d7f5e91c287d4e7dc5508ea789b4c92c80ee4b1a993a999bbef9dc35ca39159df4569b3f7a091d307eba8ddfb7bda690298d38183a24a6fd934e3
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-util/xgame-gtk2/metadata.xml b/games-util/xgame-gtk2/metadata.xml
new file mode 100644
index 000000000000..26079e608bed
--- /dev/null
+++ b/games-util/xgame-gtk2/metadata.xml
@@ -0,0 +1,8 @@
+<?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-util/xgame-gtk2/xgame-gtk2-2.0.2-r1.ebuild b/games-util/xgame-gtk2/xgame-gtk2-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..f080ea4c8fab
--- /dev/null
+++ b/games-util/xgame-gtk2/xgame-gtk2-2.0.2-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Run games in a separate X session"
+HOMEPAGE="http://xgame.tlhiv.com/"
+SRC_URI="http://downloads.tlhiv.com/xgame/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+	>=dev-perl/Gtk2-1.040"
+
+src_install() {
+	default
+	dobin xgame-gtk2
+}
diff --git a/games-util/xgame/Manifest b/games-util/xgame/Manifest
new file mode 100644
index 000000000000..2d9e318f9843
--- /dev/null
+++ b/games-util/xgame/Manifest
@@ -0,0 +1,3 @@
+DIST xgame-1.7.1.tar.gz 4657 BLAKE2B de9a7d470ab6577264cfa72d232c5cd70f6d2b2fd161d849d3f74439c236247be0c737281cd73f3f5f9b24eab301ac806e60aa372d2a35985118bf8b382c5f9b SHA512 1efe88dcac3ce6290220f60d664b3afa0e76901b9708502d954a3edca2ee73b3686af7639213067b2164990313db7eee66a404b9184440891a9f44a294008738
+EBUILD xgame-1.7.1-r1.ebuild 385 BLAKE2B b079cc10e5640b1d2d68cab7883cad33e4c1258f39fa512b479cb5ed9ec979f9be21ff7cbb3aa7310778c3a337f4e453ad9970363f9d03601de3652270928ce1 SHA512 dba77a6e47e00bec4d9d34636318e232538b593a72ce0dae07cab898694b33f265b5eac6c7188af4e537dd87008aa69c0a478ae835d6ebfa5ca7c5fddb233d4a
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-util/xgame/metadata.xml b/games-util/xgame/metadata.xml
new file mode 100644
index 000000000000..26079e608bed
--- /dev/null
+++ b/games-util/xgame/metadata.xml
@@ -0,0 +1,8 @@
+<?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-util/xgame/xgame-1.7.1-r1.ebuild b/games-util/xgame/xgame-1.7.1-r1.ebuild
new file mode 100644
index 000000000000..22754c67d800
--- /dev/null
+++ b/games-util/xgame/xgame-1.7.1-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Run games in a separate X session"
+HOMEPAGE="http://xgame.tlhiv.com/"
+SRC_URI="http://downloads.tlhiv.com/xgame/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=
+RDEPEND="dev-lang/perl"
+
+src_install() {
+	default
+	dobin xgame
+}
diff --git a/games-util/xgamer-0.6.2 b/games-util/xgamer-0.6.2
deleted file mode 100644
index b7d112011e2d..000000000000
--- a/games-util/xgamer-0.6.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-lang/perl-5.10 >=x11-libs/gtk+-2.18:2 >=dev-perl/Gtk2-1.120 virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/File-BaseDir dev-perl/XML-Twig dev-perl/glib-perl x11-misc/numlockx media-gfx/feh dev-perl/Module-Build dev-lang/perl:=
-DESCRIPTION=A launcher for starting games in a second X session
-EAPI=6
-HOMEPAGE=https://code.google.com/p/xgamer/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-lang/perl-5.10 >=x11-libs/gtk+-2.18:2 >=dev-perl/Gtk2-1.120 virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/File-BaseDir dev-perl/XML-Twig dev-perl/glib-perl x11-misc/numlockx media-gfx/feh dev-lang/perl:=
-SLOT=0
-SRC_URI=https://xgamer.googlecode.com/files/xgamer-0.6.2.tar.gz
-_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=8cc9dd001b113fd67be2fbcf23cb5643
diff --git a/games-util/xgamer/Manifest b/games-util/xgamer/Manifest
new file mode 100644
index 000000000000..1ecff1568faa
--- /dev/null
+++ b/games-util/xgamer/Manifest
@@ -0,0 +1,5 @@
+AUX xgamer-0.6.2-desktopfile.patch 236 BLAKE2B 9d4cc7ce26065fd9692f9348347ae0b816021970811b1ac2471692b6b60d357139794501b23a04eb95080b63850ea35f0166b54c7debe6640fe071d4ecadd6eb SHA512 d2c378c955358067883ebe845be3f183ec2c0f52a712e0548dc80a8f0d12b38baea0ef57674fd7897c4102cbc1f24d48034dc7fd3fe814a1271a2961bdcd9210
+AUX xgamer-0.6.2-perl526.patch 284 BLAKE2B 8d2f85e21ab5ff7b189ee38a04a9e8fb52462cb50de2b12f44e49510d87d354164a0e3dc4ae27beb318d4c2f07a64cc3b0b7d819a7193f59f043230dc3fbe953 SHA512 54b3662ef1fc054ec7316529617320cabd400f1d7357d986d577c2049e9f27e543affd797eecb685761a3f982d17deabfb126261c5704bd79325e0e395578ca3
+DIST xgamer-0.6.2.tar.gz 43222 BLAKE2B cc5d4ea8505966a3312f7fed77088112e1015f61f2c0a7547dee15ecff232fb1a6b0175ac79348dba4d2bcf3172199b8d3caaa03da8c0889c6d0597d2e0047fa SHA512 caffebe5d4f07f532366e3a5f6ff717251f254d012bb5c33c431538720a2fa301ab8b9cf277771659655cac6fbe2734534146c224ef881486f7dfc51ac992315
+EBUILD xgamer-0.6.2.ebuild 851 BLAKE2B ee439d31e2d98e47355ea56022aa95b5fa3d94ae16c91f08d58d51e09dfdb8d895d4e050eb03d12e7ef86b4580f4a465a438a38e5c910e451e69d68252be5525 SHA512 f78be62fd95d304b31a844b0fc33757845fbca43738d54c022448861b7b5851004929c0aeeec7553b94c68fa22e4dce947be2dc8db976a8d2110b68341c5e7dd
+MISC metadata.xml 329 BLAKE2B a5b0eb6010325f787d6167267067c7029414b2323e000a493da0b4bdd7f67bb02f2d543fc29784586e038e06353dc15a9c28cddf41cd62bb8fbd1f578dd977ae SHA512 89fdd2dc97da98821c9c0f17899c15d50cda0d0887309a3406d9eae0159cc775ee4b070e5721c941e497d18711d3894d52ab35494b20c7a3e87ef315fadd1ee5
diff --git a/games-util/xgamer/files/xgamer-0.6.2-desktopfile.patch b/games-util/xgamer/files/xgamer-0.6.2-desktopfile.patch
new file mode 100644
index 000000000000..3639de18e5e1
--- /dev/null
+++ b/games-util/xgamer/files/xgamer-0.6.2-desktopfile.patch
@@ -0,0 +1,10 @@
+--- xgamer/share/applications/xgamer.desktop
++++ xgamer/share/applications/xgamer.desktop
+@@ -5,6 +5,6 @@
+ Icon=xgamer
+ StartupNotify=true
+ Terminal=false
+-Categories=GTK;Game
++Categories=GTK;Game;
+ Name=XGamer
+ Comment=X Game Launcher
diff --git a/games-util/xgamer/files/xgamer-0.6.2-perl526.patch b/games-util/xgamer/files/xgamer-0.6.2-perl526.patch
new file mode 100644
index 000000000000..d59ba05263fb
--- /dev/null
+++ b/games-util/xgamer/files/xgamer-0.6.2-perl526.patch
@@ -0,0 +1,13 @@
+diff -ruN xgamer.orig/Build.PL xgamer/Build.PL
+--- xgamer.orig/Build.PL	2012-09-21 17:23:27.000000000 +0200
++++ xgamer/Build.PL	2017-07-08 20:33:44.566199833 +0200
+@@ -2,7 +2,8 @@
+  
+ use strict;
+ use warnings;
+- 
++
++use lib q[.]; 
+ use inc::MyBuilder;
+ use File::Spec::Functions;
+  
diff --git a/games-util/xgamer/metadata.xml b/games-util/xgamer/metadata.xml
new file mode 100644
index 000000000000..32950d8b9a44
--- /dev/null
+++ b/games-util/xgamer/metadata.xml
@@ -0,0 +1,11 @@
+<?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="google-code">xgamer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-util/xgamer/xgamer-0.6.2.ebuild b/games-util/xgamer/xgamer-0.6.2.ebuild
new file mode 100644
index 000000000000..ab29f4ccbd52
--- /dev/null
+++ b/games-util/xgamer/xgamer-0.6.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit perl-module
+
+DESCRIPTION="A launcher for starting games in a second X session"
+HOMEPAGE="https://code.google.com/p/xgamer/"
+SRC_URI="https://xgamer.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.10
+	>=x11-libs/gtk+-2.18:2
+	>=dev-perl/Gtk2-1.120
+	virtual/perl-File-Path
+	virtual/perl-File-Spec
+	virtual/perl-File-Temp
+	dev-perl/File-BaseDir
+	dev-perl/XML-Twig
+	dev-perl/glib-perl
+	x11-misc/numlockx
+	media-gfx/feh"
+DEPEND="${RDEPEND}
+	dev-perl/Module-Build"
+
+S=${WORKDIR}/${PN}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-desktopfile.patch
+	"${FILESDIR}"/${P}-perl526.patch
+)
+
+pkg_postinst() {
+	elog "optional dependencies:"
+	elog "  x11-wm/openbox (integrates well)"
+}
diff --git a/games-util/xqf-1.0.6.2 b/games-util/xqf-1.0.6.2
deleted file mode 100644
index 64856cb67e1c..000000000000
--- a/games-util/xqf-1.0.6.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=x11-libs/gtk+:2 >=games-util/qstat-2.11 nls? ( virtual/libintl ) geoip? ( dev-libs/geoip ) bzip2? ( app-arch/bzip2 ) 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
-DESCRIPTION=A server browser for many FPS games (frontend for qstat)
-EAPI=5
-HOMEPAGE=http://xqf.github.io/en/
-IUSE=bzip2 geoip nls
-KEYWORDS=~amd64 ~hppa ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 >=games-util/qstat-2.11 nls? ( virtual/libintl ) geoip? ( dev-libs/geoip ) bzip2? ( app-arch/bzip2 )
-SLOT=0
-SRC_URI=https://github.com/XQF/xqf/archive/xqf-1.0.6.2.tar.gz
-_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_=955cad181902ef80fef47f6634fd89e0
diff --git a/games-util/xqf/Manifest b/games-util/xqf/Manifest
new file mode 100644
index 000000000000..365be0d9f392
--- /dev/null
+++ b/games-util/xqf/Manifest
@@ -0,0 +1,5 @@
+AUX xqf-1.0.6.2-underlink.patch 300 BLAKE2B 24205c2328355fd9e5ee187c3c7e7a3b1875f8020f1afbd7ced7bf6b2f3c57ce1d3485cad6c2d23a70ee830e7cad2ec7060554bb70fb0dbfbe26bc2c339afb9b SHA512 e35c62bf83ccbaaf8ca775978acf33ed419c881158f607e44032a2329b88443512a65603d0797ede1be38edaa66de1318d7c8275f276cd5988d74ef7430b51de
+AUX xqf-1.0.6.2-zlib-1.2.5.1-compile-fix.patch 190 BLAKE2B 3c4a52c059392596c082c4ae3f4259073dc49fd5c94424ef80e4f22076e4b5473eabc60d763eabb3f73177155692db7d722d7ab8cf1f7acc9c285fdfc9d12390 SHA512 11677294d042d8303b72085867855e1795a9995e29f4b5145e415434c8c6188fa20e19c95f02d804a2b3e481f1f827cad9fa865d77f4f1f0880a3a66d69460d8
+DIST xqf-1.0.6.2.tar.gz 595096 BLAKE2B 36c135c064ae61af12daa70e9c78fe2a377ebcaf91b0f36fac43865b6b0601f104d8b09bd84b9d9699afdab7f3d4d3a0e67f3251f20d6ce025e92db2302d21a8 SHA512 8706104dde0f93a89f9f69a4b8f40f5c4c8160a3bb7a99f7572448c0110a595503e430fdba741c50b22f7e92a08f1cf6abee06aaa23956e4e37b7bf894a66a9c
+EBUILD xqf-1.0.6.2.ebuild 940 BLAKE2B e58e3632573416bd915657d88e44a850e03a45a02b16271c9bb8ef9a3eecc63b2a8e6f2e85367a4c846413aae4fde7b04d46e7374b10b54d8df10c1734ba0095 SHA512 77b887d3e70c340cf6e8f4d977c996f26976cf16576888fc0ac7bafab22283b512fb7ab5adb8e93f4c3d6a69d5a419d843a8f6fd7bb42fdf904a8a619b30ec18
+MISC metadata.xml 373 BLAKE2B d2337bac8791a2a8985237089b723183ba428527db288b5f98e37499e0dde32503f09eca2fa6d320b354fe8507fb4cd98c12f866f77e2c0f85ee52739758fa05 SHA512 b904d8495fb9fd79c072f12570ef67cb28396ba215e0cbc70f184c64dcd1b1a7c028274bb7927acf8b7012ff55cb22564fa52252d6bc41e75e86d5562761539a
diff --git a/games-util/xqf/files/xqf-1.0.6.2-underlink.patch b/games-util/xqf/files/xqf-1.0.6.2-underlink.patch
new file mode 100644
index 000000000000..fe93c7624675
--- /dev/null
+++ b/games-util/xqf/files/xqf-1.0.6.2-underlink.patch
@@ -0,0 +1,10 @@
+--- xqf-xqf-1.0.6.2/src/Makefile.am
++++ xqf-xqf-1.0.6.2/src/Makefile.am
+@@ -41,6 +41,7 @@
+ 	    $(GEOIP_LIB) \
+ 	    $(PACKAGE_LIBS) \
+ 	    $(GDK_PIXBUF_LIBS) \
++	    -lX11 \
+ 	    -lz -ldl
+ 
+ xqf_LDFLAGS = -Wl,-rpath,$(pkglibdir) -Wl,--export-dynamic -Wl,--version-script=$(top_srcdir)/src/xqf.map
diff --git a/games-util/xqf/files/xqf-1.0.6.2-zlib-1.2.5.1-compile-fix.patch b/games-util/xqf/files/xqf-1.0.6.2-zlib-1.2.5.1-compile-fix.patch
new file mode 100644
index 000000000000..9bd433b3b27e
--- /dev/null
+++ b/games-util/xqf/files/xqf-1.0.6.2-zlib-1.2.5.1-compile-fix.patch
@@ -0,0 +1,11 @@
+--- xqf-1.0.5/src/zip/ioapi.h
++++ xqf-1.0.5/src/zip/ioapi.h
+@@ -6,6 +6,8 @@
+    Copyright (C) 1998-2003 Gilles Vollant
+ */
+ 
++#define OF(x) x
++
+ #ifndef _ZLIBIOAPI_H
+ #define _ZLIBIOAPI_H
+ 
diff --git a/games-util/xqf/metadata.xml b/games-util/xqf/metadata.xml
new file mode 100644
index 000000000000..12c2d2df28fe
--- /dev/null
+++ b/games-util/xqf/metadata.xml
@@ -0,0 +1,12 @@
+<?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">xqf</remote-id>
+		<remote-id type="github">XQF/xqf</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-util/xqf/xqf-1.0.6.2.ebuild b/games-util/xqf/xqf-1.0.6.2.ebuild
new file mode 100644
index 000000000000..5ea89476375a
--- /dev/null
+++ b/games-util/xqf/xqf-1.0.6.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="A server browser for many FPS games (frontend for qstat)"
+HOMEPAGE="http://xqf.github.io/en/"
+SRC_URI="https://github.com/XQF/xqf/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="bzip2 geoip nls"
+
+RDEPEND="x11-libs/gtk+:2
+	>=games-util/qstat-2.11
+	nls? ( virtual/libintl )
+	geoip? ( dev-libs/geoip )
+	bzip2? ( app-arch/bzip2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${PN}-${P}
+
+# bug #288853
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-underlink.patch \
+		"${FILESDIR}"/${P}-zlib-1.2.5.1-compile-fix.patch
+	sed -i \
+		-e '/Icon/s/.png//' \
+		xqf.desktop.in || die
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable geoip) \
+		$(use_enable bzip2)
+}