gentoo resync : 14.07.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 21:03:06 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 21:03:06 +0100
commit: 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree: 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /games-action
parent: 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)
439 files changed, 11451 insertions, 1083 deletions
diff --git a/games-action/0verkill-0.16-r4 b/games-action/0verkill-0.16-r4
deleted file mode 100644
index 076d26ba7829..000000000000
--- a/games-action/0verkill-0.16-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=X? ( x11-libs/libXpm ) >=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 bloody 2D action deathmatch-like game in ASCII-ART
-EAPI=6
-HOMEPAGE=http://freecode.com/projects/0verkill
-IUSE=X
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=X? ( x11-libs/libXpm )
-SLOT=0
-SRC_URI=http://artax.karlin.mff.cuni.cz/~brain/0verkill/release/0verkill-0.16.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=286ebc293958343191d8c265d7f7baff
diff --git a/games-action/0verkill/0verkill-0.16-r4.ebuild b/games-action/0verkill/0verkill-0.16-r4.ebuild
new file mode 100644
index 000000000000..478fcc1bbda7
--- /dev/null
+++ b/games-action/0verkill/0verkill-0.16-r4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="A bloody 2D action deathmatch-like game in ASCII-ART"
+HOMEPAGE="http://freecode.com/projects/0verkill"
+SRC_URI="http://artax.karlin.mff.cuni.cz/~brain/0verkill/release/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+DEPEND="X? ( x11-libs/libXpm )"
+RDEPEND=${DEPEND}
+
+PATCHES=(
+		"${FILESDIR}"/${P}-docs.patch
+		"${FILESDIR}"/${P}-home-overflow.patch
+		"${FILESDIR}"/${P}-segv.patch
+		"${FILESDIR}"/${P}-gentoo-paths.patch
+		"${FILESDIR}"/${P}-ovflfix.patch
+		"${FILESDIR}"/${P}-CC.patch
+		"${FILESDIR}"/${P}-underflow-check.patch #136222
+)
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:data/:/usr/share/${PN}/data/:" cfg.h || die
+	sed -i \
+		-e "s:@CFLAGS@ -O3 :@CFLAGS@ :" Makefile.in || die
+	sed -i \
+		-e "/gettimeofday/s/getopt/getopt calloc/" configure.in || die
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with X x)
+}
+
+src_install() {
+	dobin 0verkill
+	local x
+	for x in avi bot editor server test_server ; do
+		newbin ${x} 0verkill-${x}
+	done
+	if use X ; then
+		dobin x0verkill
+		for x in avi editor ; do
+			newbin ${x} 0verkill-${x}
+		done
+	fi
+
+	insinto /usr/share/${PN}
+	doins -r data grx
+
+	rm doc/{README.OS2,"Readme Win32.txt",COPYING} || die
+	dodoc -r doc/.
+}
diff --git a/games-action/0verkill/Manifest b/games-action/0verkill/Manifest
new file mode 100644
index 000000000000..642d42166de3
--- /dev/null
+++ b/games-action/0verkill/Manifest
@@ -0,0 +1,10 @@
+AUX 0verkill-0.16-CC.patch 3795 BLAKE2B b780eaaecad8d93e7b2bdba5b54038408b1b1fabe9eb1580524965110387400a8af42bac0ae07dbfddd39a63f6584316a2373f66bbcde8fa920291c540af0af1 SHA512 ea3c848d20e4a3ce197104dac2ff26948c7bdd77eb03a7492f6d62cf6cb316c12a38f3d4555bdac87582692ce4ff15794c2996a6015a2ea18398cb84b8dee022
+AUX 0verkill-0.16-docs.patch 1477 BLAKE2B 814d3974a5017bb3568f6ef9ea28aae51e8915d3028c4b5dc01e126853f46585ced6eb7624320510169b02cc18525f73657791b174fc2613a74e2985760466fb SHA512 a1ce9ca8083855b77747f0ea32587651d9e7bdf3f41406bed6e8f76debd7fe475681a1a59571b3244a65864700db18bc5fe48858113ea22ee00cd7feff13438d
+AUX 0verkill-0.16-gentoo-paths.patch 530 BLAKE2B a3d00af6fdf1cdefedc3c673e9defa8b2eae6756a42a11600f2a508d1f7d01190d228c1c7f34442dafd68f4ee4a1bee3476cdfe81b71913494fd718f02200981 SHA512 9419b990df205c93baf4d2e2391269f2543bc2b6ba9a3d0219983be518cce01d4a1384ce9cc0dfd8ffba743e8879658b70859e6f7a4df0b97a47186dd90b3337
+AUX 0verkill-0.16-home-overflow.patch 724 BLAKE2B 186df84d2fdfacfd576eb20db8f61228fd2bfe6e48c9e4e8674584376efe5bec22468c43f4b94e974e5ba2995f1784a0400495286599b1f1a0ddb77989fc14f4 SHA512 379edf4f8f9bd31d38bd39812bd0602429afb4254e040cb9f5677764bfe4e34fede5f6e0d07c27e691c9682e205c78fa53109b8c1e4ca6be509d06e752eb08b5
+AUX 0verkill-0.16-ovflfix.patch 805 BLAKE2B 206ca5dc584e09bdaab577e559bc45cd9f9be2c6256dc27b37eba6db5ad3edf3ac4c9c9778c0691cc812b839045b3c865635ff39cfbcf3716f74d98b72173c4e SHA512 ad4f57d6d44c663af4d7a2b75c680ad287f582a5c7b4038e392bdc6425c5819de719e0dadd38e45d784d077f22eb5d098fd0e65c7ecb8bd29824b4fb81032220
+AUX 0verkill-0.16-segv.patch 1560 BLAKE2B c7ab421261b7168d53c77b7baf800cdc4b4e3bb1c5756078729a17f82c391ce9276ab846b65428eae5f0513facc995b90f182ce810c81dee70eb23ded69d0f19 SHA512 05ce966d80cf199a9602cb7143a2d7e8479ccb4b03da2275dc8a93a9065d387fe15426c48559279acb73eb3c371306a02706de899d5c6a97c123319426b3f6bc
+AUX 0verkill-0.16-underflow-check.patch 675 BLAKE2B 12ebde16b9eb4e825a34259103fec200d174e9b9b3ee3d9b689a47f53406abb7c36e8c5cc9d444cd53d84553cc18658bdc7346c02bced87ed4279189af33dd87 SHA512 3b5bff2c18c1862fadbb3d932be23f35559ed9eb3ffb979cf11c50bbac9fff8928b5ead8349ddfc78c84d07a5d1afe4431af56263568b3b82fd7cb015f442e42
+DIST 0verkill-0.16.tgz 276579 BLAKE2B 125a441bfce8433f750180653323059409495c41ff318cec58c31840102739d7a911cd73c07e64ea459c8dd4062fd8bbdbd4a26b6b280b359fe7f61d52ef5ae2 SHA512 6ab273085f2be3a6d0a2b785a51a9bfd52add0212b3c8522b22255c4e3e48a9470f20d9d678158233da9c9465563279079c29ca5526d322247f2ef1d74107144
+EBUILD 0verkill-0.16-r4.ebuild 1371 BLAKE2B c077b1dddf99fd5d4b71f2ae90a09697ea0c312bac60443e341bbf5926a59ae23d83b0f68ea3de6b088f5673f5572497687654a54135fcfc697fcd48806ad396 SHA512 35c019c33ffbc2b9429770b697b58b15368fbc251a13e16a345409224e9fd1a1dac8a6c1b9ac5cee609cbb8d2ef1a7342596f2bc9c8b9ad5ee900a6634008795
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/0verkill/files/0verkill-0.16-CC.patch b/games-action/0verkill/files/0verkill-0.16-CC.patch
new file mode 100644
index 000000000000..568f8a4aa6f2
--- /dev/null
+++ b/games-action/0verkill/files/0verkill-0.16-CC.patch
@@ -0,0 +1,50 @@
+--- a/Makefile.in	2010-11-08 13:30:42.060916323 -0500
++++ b/Makefile.in	2010-11-08 13:31:03.199940471 -0500
+@@ -24,7 +24,7 @@
+ server.o: server.c server.h net.h data.h hash.h cfg.h time.h math.h config.h error.h
+ client.o: client.c data.h sprite.h cfg.h net.h hash.h time.h math.h console.h help.h blit.h config.h error.h
+ xclient.o: client.c data.h sprite.h cfg.h net.h hash.h time.h math.h console.h help.h config.h error.h
+-	gcc -c $(CFLAGS) -DXWINDOW -o xclient.o client.c
++	$(CC) -c $(CFLAGS) -DXWINDOW -o xclient.o client.c
+ time.o: time.c time.h error.h
+ help.o:	help.c blit.h error.h
+ avihelp.o: avihelp.c blit.h error.h
+@@ -38,29 +38,29 @@
+ 
+ 
+ avi: avi.o blit.o console.o kbd.o time.o avihelp.o error.o
+-	gcc $(LDFLAGS) -o avi avi.o blit.o console.o kbd.o error.o time.o avihelp.o $(LIBS)
++	$(CC) $(LDFLAGS) -o avi avi.o blit.o console.o kbd.o error.o time.o avihelp.o $(LIBS)
+ 
+ xavi: avi.o blit.o xinterface.o xkbd.o time.o avihelp.o error.o
+-	gcc $(LDFLAGS) -o xavi avi.o blit.o xinterface.o xkbd.o error.o time.o avihelp.o $(LIBS) $(XLIBS)
++	$(CC) $(LDFLAGS) -o xavi avi.o blit.o xinterface.o xkbd.o error.o time.o avihelp.o $(LIBS) $(XLIBS)
+ 
+ bot: bot.o data.o hash.o time.o net.o crc32.o md5.o md5hl.o error.o
+-	gcc $(LDFLAGS) -o bot bot.o data.o hash.o time.o net.o error.o md5.o md5hl.o crc32.o sprite.o $(LIBS)
++	$(CC) $(LDFLAGS) -o bot bot.o data.o hash.o time.o net.o error.o md5.o md5hl.o crc32.o sprite.o $(LIBS)
+ 
+ 0verkill: client.o data.o sprite.o blit.o console.o hash.o time.o net.o error.o crc32.o md5.o md5hl.o kbd.o help.o
+-	gcc $(LDFLAGS) -o 0verkill client.o data.o sprite.o blit.o console.o error.o hash.o time.o md5.o md5hl.o kbd.o net.o crc32.o help.o $(LIBS)
++	$(CC) $(LDFLAGS) -o 0verkill client.o data.o sprite.o blit.o console.o error.o hash.o time.o md5.o md5hl.o kbd.o net.o crc32.o help.o $(LIBS)
+ 	@OVERKILL_SPECIAL@
+ 
+ x0verkill: xclient.o data.o sprite.o blit.o xinterface.o hash.o time.o net.o crc32.o error.o xkbd.o help.o md5.o md5hl.o
+-	gcc $(LDFLAGS) -o x0verkill xclient.o data.o blit.o sprite.o xinterface.o xkbd.o error.o md5.o md5hl.o hash.o time.o net.o crc32.o help.o $(LIBS) $(XLIBS)
++	$(CC) $(LDFLAGS) -o x0verkill xclient.o data.o blit.o sprite.o xinterface.o xkbd.o error.o md5.o md5hl.o hash.o time.o net.o crc32.o help.o $(LIBS) $(XLIBS)
+ 
+ server: server.o data.o sprite.o blit.o console.o hash.o time.o kbd.o net.o crc32.o md5.o md5hl.o error.o
+-	gcc $(LDFLAGS) -o server server.o data.o sprite.o blit.o console.o hash.o time.o kbd.o md5.o md5hl.o error.o net.o crc32.o $(LIBS)
++	$(CC) $(LDFLAGS) -o server server.o data.o sprite.o blit.o console.o hash.o time.o kbd.o md5.o md5hl.o error.o net.o crc32.o $(LIBS)
+ 
+ editor: editor.o data.o blit.o sprite.o console.o hash.o time.o kbd.o md5.o md5hl.o error.o 
+-	gcc $(LDFLAGS) -o editor editor.o data.o blit.o sprite.o console.o hash.o md5.o md5hl.o error.o time.o kbd.o $(LIBS) 
++	$(CC) $(LDFLAGS) -o editor editor.o data.o blit.o sprite.o console.o hash.o md5.o md5hl.o error.o time.o kbd.o $(LIBS) 
+ 
+ xeditor: editor.o data.o blit.o sprite.o xinterface.o hash.o time.o xkbd.o md5.o md5hl.o error.o
+-	gcc $(LDFLAGS) -o xeditor editor.o data.o blit.o sprite.o xinterface.o hash.o md5.o error.o md5hl.o time.o xkbd.o $(LIBS) $(XLIBS)
++	$(CC) $(LDFLAGS) -o xeditor editor.o data.o blit.o sprite.o xinterface.o hash.o md5.o error.o md5hl.o time.o xkbd.o $(LIBS) $(XLIBS)
+ 
+ test_server: test_server.o net.o data.o crc32.o blit.o sprite.o time.o hash.o console.o kbd.o md5.o md5hl.o error.o 
+-	gcc $(LDFLAGS) -o test_server test_server.o net.o data.o crc32.o blit.o sprite.o time.o hash.o md5.o md5hl.o error.o console.o kbd.o $(LIBS) 
++	$(CC) $(LDFLAGS) -o test_server test_server.o net.o data.o crc32.o blit.o sprite.o time.o hash.o md5.o md5hl.o error.o console.o kbd.o $(LIBS) 
diff --git a/games-action/0verkill/files/0verkill-0.16-docs.patch b/games-action/0verkill/files/0verkill-0.16-docs.patch
new file mode 100644
index 000000000000..90d049309f4d
--- /dev/null
+++ b/games-action/0verkill/files/0verkill-0.16-docs.patch
@@ -0,0 +1,32 @@
+--- 0verkill-0.16/doc/README.html
++++ 0verkill-0.16-gentoo/doc/README.html
+@@ -30,7 +30,7 @@
+ <center><h1><a name="running">RUNNING</a></h1></center>
+ 
+ <p><h2><a name="server">Running server</a></h2>
+-<p>First thing to start 0verkill is run the server - type <i>server</i>. Server
++<p>First thing to start 0verkill is run the server - type <i>0verkill-server</i>. Server
+ takes options <i>-p</i> and <i>-n</i>. As usual, option <i>-h</i> prints help.
+ 
+ <p> Option <i>-p</i> takes one argument: port number. Server needs UDP port
+@@ -84,9 +84,9 @@
+ 
+ <p><h2><a name="testserver">Testing Program</a></h2>
+ 
+-<p>There's <i>test_server</i> program in the distribution. It avoids testing
++<p>There's <i>0verkill-test_server</i> program in the distribution. It avoids testing
+ remote server if it's up and how many players there is. To use it simply type
+-<i>test_server -a &lt;server address&gt; -p &lt;port number &gt;</i>.
++<i>0verkill-test_server -a &lt;server address&gt; -p &lt;port number &gt;</i>.
+ 
+ <center><h1><a name="controls">GAME CONTROLS</a></h1></center>
+ 
+--- 0verkill-0.16/doc/adding_a_level.txt
++++ 0verkill-0.16-gentoo/doc/adding_a_level.txt
+@@ -19,5 +19,5 @@
+ 5) If you want to create some cool new graphics, run 
+    "avi grx/graphics_file.avi". Then add it to the data/new_level.sp
+ 
+-6) When the level is done, run "server -lX", where X is again from (1). And
++6) When the level is done, run "0verkill-server -lX", where X is again from (1). And
+    play!
diff --git a/games-action/0verkill/files/0verkill-0.16-gentoo-paths.patch b/games-action/0verkill/files/0verkill-0.16-gentoo-paths.patch
new file mode 100644
index 000000000000..d48b758c9e53
--- /dev/null
+++ b/games-action/0verkill/files/0verkill-0.16-gentoo-paths.patch
@@ -0,0 +1,23 @@
+--- a/sprite.c	2007-11-15 18:26:30.000000000 -0500
++++ b/sprite.c	2007-11-15 18:26:57.000000000 -0500
+@@ -2,6 +2,7 @@
+ #include <ctype.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <unistd.h>
+ 
+ #ifndef WIN32
+ #include "config.h"
+@@ -188,6 +189,12 @@
+  
+ 	if (!(f=fopen(filename,"rb")))
+ 	{
++		chdir(DATA_PATH);
++	}
++	if (!(f=fopen(filename,"rb"))) {
++		chdir(DATA_PATH "/../");
++	}
++	if (!(f=fopen(filename,"rb"))) {
+ 		unsigned char msg[256];
+ 		snprintf(msg,256,"Error opening file \"%s\"!\n",filename);
+ 		ERROR(msg);
diff --git a/games-action/0verkill/files/0verkill-0.16-home-overflow.patch b/games-action/0verkill/files/0verkill-0.16-home-overflow.patch
new file mode 100644
index 000000000000..63bfb5fa7a6a
--- /dev/null
+++ b/games-action/0verkill/files/0verkill-0.16-home-overflow.patch
@@ -0,0 +1,26 @@
+--- a/client.c	2001-12-16 04:26:38.000000000 -0500
++++ b/client.c	2003-11-17 15:12:52.850772508 -0500
+@@ -191,9 +191,9 @@
+ 	unsigned char txt[256];
+ 
+ #ifndef WIN32
+-	sprintf(txt,"%s/%s",getenv("HOME"),CFG_FILE);
++	snprintf(txt,sizeof(txt),"%s/%s",getenv("HOME"),CFG_FILE);
+ #else
+-	sprintf(txt,"./%s",CFG_FILE);
++	snprintf(txt,sizeof(txt),"./%s",CFG_FILE);
+ #endif
+ 	stream=fopen(txt,"r");
+ 	if (!stream)return;
+@@ -223,9 +223,9 @@
+ 	unsigned char txt[256];
+ 
+ #ifndef WIN32
+-	sprintf(txt,"%s/%s",getenv("HOME"),CFG_FILE);
++	snprintf(txt,sizeof(txt),"%s/%s",getenv("HOME"),CFG_FILE);
+ #else
+-	sprintf(txt,"./%s",CFG_FILE);
++	snprintf(txt,sizeof(txt),"./%s",CFG_FILE);
+ #endif
+ 	stream=fopen(txt,"w");
+ 	if (!stream)return;
diff --git a/games-action/0verkill/files/0verkill-0.16-ovflfix.patch b/games-action/0verkill/files/0verkill-0.16-ovflfix.patch
new file mode 100644
index 000000000000..a8a832e19619
--- /dev/null
+++ b/games-action/0verkill/files/0verkill-0.16-ovflfix.patch
@@ -0,0 +1,24 @@
+--- a/server.c	2010-11-08 11:53:18.000000000 +0100
++++ b/server.c	2010-11-08 11:53:43.000000000 +0100
+@@ -905,8 +905,8 @@
+ 	int len;
+ 
+ 	packet[0]=P_MESSAGE;
+-	if (!name){snprintf(packet+1,256,"%s",msg);len=strlen(msg)+1+1;}
+-	else {snprintf(packet+1,256,"%s> %s",name,msg);len=strlen(name)+strlen(msg)+1+3;}
++	if (!name){snprintf(packet+1,255,"%s",msg);len=strlen(msg)+1+1;}
++	else {snprintf(packet+1,255,"%s> %s",name,msg);len=strlen(name)+strlen(msg)+1+3;}
+ 	send_chunk_packet_to_player(packet,len,player);
+ }
+ 
+--- a/console.c	2010-11-08 11:53:26.000000000 +0100
++++ b/console.c	2010-11-08 11:54:44.000000000 +0100
+@@ -206,7 +206,7 @@
+ void c_setcolor_3b(unsigned char a)
+ {
+ 	char txt[8];
+-	snprintf(txt,16,"\033[%dm",30+(a&7));
++	snprintf(txt,sizeof(txt),"\033[%dm",30+(a&7));
+ 	my_print(txt);
+ }
+ 
diff --git a/games-action/0verkill/files/0verkill-0.16-segv.patch b/games-action/0verkill/files/0verkill-0.16-segv.patch
new file mode 100644
index 000000000000..9f9656dfd9fa
--- /dev/null
+++ b/games-action/0verkill/files/0verkill-0.16-segv.patch
@@ -0,0 +1,39 @@
+diff -Naurp 0verkill-0.16.old/data.c 0verkill-0.16/data.c
+--- 0verkill-0.16.old/data.c	2007-10-30 19:49:59.000000000 +0100
++++ 0verkill-0.16/data.c	2007-10-30 20:25:08.000000000 +0100
+@@ -471,7 +471,7 @@ my_double can_go_x(my_double old_x,my_do
+ 		for (x=double2int(old_x)+1;x<=round_up(new_x);x++)  /* go to the right */
+ 		{
+ 			if (x>AREA_X-1) return int2double(AREA_X-1);
+-			for (y=yh;y<=yl;y++)
++			for (y=(yh>=0?yh:0);y<=yl;y++)
+ 				if ((area_a[x+y*AREA_X]&240)==TYPE_WALL)
+ 					return int2double(x-1);
+ 		}
+@@ -479,7 +479,7 @@ my_double can_go_x(my_double old_x,my_do
+ 		for (x=round_up(old_x)-1;x>=double2int(new_x);x--)  /* go to the left */
+ 		{
+ 			if (x<0) return 0;
+-			for (y=yh;y<=yl;y++)
++			for (y=(yh>=0?yh:0);y<=yl;y++)
+ 				if ((area_a[x+y*AREA_X]&240)==TYPE_WALL) return int2double(x+1);
+ 		}
+ 	if(flag)*flag=0;
+@@ -501,7 +501,7 @@ my_double can_go_y(my_double old_y, my_d
+ 		for (y=double2int(old_y)+1;y<=round_up(new_y);y++)  /* go down */
+ 		{
+ 			if (y>AREA_Y-1) return int2double(AREA_Y-1);
+-			for (x=xl;x<=xr;x++)
++			for (x=(xl>=0?xl:0);x<=xr;x++)
+ 				if ((area_a[x+y*AREA_X]&240)==TYPE_WALL||(!down_ladder&&((area_a[x+y*AREA_X]&240)==TYPE_JUMP||(area_a[x+y*AREA_X]&240)==TYPE_JUMP_FOREGROUND))) return int2double(y-1);
+ 		}
+ 	else
+@@ -510,7 +510,7 @@ my_double can_go_y(my_double old_y, my_d
+ 		for (y=round_up(old_y)-1;y>=double2int(new_y);y--)  /* go up */
+ 		{
+ 			if (y<0) return 0;
+-			for (x=xl;x<=xr;x++)
++			for (x=(xl>=0?xl:0);x<=xr;x++)
+ 				if ((area_a[x+y*AREA_X]&240)==TYPE_WALL) return int2double(y+1);
+ 		}
+ 	}
diff --git a/games-action/0verkill/files/0verkill-0.16-underflow-check.patch b/games-action/0verkill/files/0verkill-0.16-underflow-check.patch
new file mode 100644
index 000000000000..d0af396deafd
--- /dev/null
+++ b/games-action/0verkill/files/0verkill-0.16-underflow-check.patch
@@ -0,0 +1,17 @@
+The vulnerability is cause due to an integer underflow error in "recv_packet()"
+within the handling of a received UDP packet. This can be exploited to cause
+out-of-bounds memory access which crashes the server process via a UDP packet
+that is smaller than 12 bytes in size.
+
+http://bugs.gentoo.org/136222
+
+--- 0verkill-0.16/net.c
++++ 0verkill-0.16/net.c
+@@ -84,6 +84,7 @@
+ 	p=mem_alloc(max_len+12);
+ 	if (!p)return -1;  /* not enough memory */
+ 	retval=recvfrom(fd,p,max_len+12,0,addr,addr_len);
++	if (retval<12)return -1; /* not enough data from network */
+ 	memcpy(packet,p+12,max_len);
+ 	crc=p[0]+(p[1]<<8)+(p[2]<<16)+(p[3]<<24);
+ 	s=p[4]+(p[5]<<8)+(p[6]<<16)+(p[7]<<24);
diff --git a/games-action/0verkill/metadata.xml b/games-action/0verkill/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-action/0verkill/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-action/Manifest.gz b/games-action/Manifest.gz
index 9f2380038025..d09cebd91159 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/abuse-0.8-r1 b/games-action/abuse-0.8-r1
deleted file mode 100644
index 0b4352eac684..000000000000
--- a/games-action/abuse-0.8-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=>=media-libs/libsdl-1.1.6[sound,opengl,video] media-libs/sdl-mixer virtual/opengl >=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=Port of Abuse by Crack Dot Com
-EAPI=6
-HOMEPAGE=http://abuse.zoy.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 WTFPL-2
-RDEPEND=>=media-libs/libsdl-1.1.6[sound,opengl,video] media-libs/sdl-mixer virtual/opengl
-SLOT=0
-SRC_URI=http://abuse.zoy.org/raw-attachment/wiki/download/abuse-0.8.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_=ede04c13cc8b558ebd5584e0dded7fea
diff --git a/games-action/abuse/Manifest b/games-action/abuse/Manifest
new file mode 100644
index 000000000000..b59bb441f6ff
--- /dev/null
+++ b/games-action/abuse/Manifest
@@ -0,0 +1,4 @@
+AUX abuse-0.8-gentoo.patch 891 BLAKE2B b24d6ac109e82c2fb2926a5cf9894cff13f55618f1f46f6894c1341a2a49d27c3357cdcfa26aee0164a94aaa64da847a42651d0701b766699c8ecaf1a500c471 SHA512 544858fd991c611eeac9470c833b15be8c06c709f2b6dc473ab35ec7e5e4aae885a363d17f09080afcd4022229089cf46fe5b7c0abd14fb7b84449bb46ac35d9
+DIST abuse-0.8.tar.gz 6053500 BLAKE2B 4f52256b7bf13e0efa77ef50147a976fdf1fceec4ce20fb4b855a9961a7c816cf08bf51286b424da42072956a137bc3385357cfdb61bf37ff9f907284d99e09c SHA512 5c60dcf6910f9f751da26e919cd289c12349bb82eb925f9a41dc921263ece0d0f5f24c2ab2d1c718c0a5d0315453f92dfcba665fe5082eb4135ed737d2859d18
+EBUILD abuse-0.8-r1.ebuild 818 BLAKE2B 20b8b23c27fdbe57062803f0d262cf3cd1211adcc8e47c15fffb34984e668a5374c96a0bdad9ecae4cae9b14e908c7ca9077e6d7b4b70e41ac3a7e949a8dc770 SHA512 b55b5b0763c04306285cdaf628d60a5746395c8f9d7d030ae7fc2cb6be891f8f8c14d681e6e449194205fc83002f961f4007a8325abd204d855481739dc42f03
+MISC metadata.xml 259 BLAKE2B de713fcef8fdf70397a1488db3be1d10415e1177b400921c0017b69bcfb1849bb5eaef32ca00118ff25391d52d2071af70c83b6357fbf5199e4745d34e9994e1 SHA512 8516e2364a64325b483a394a14c52e32b029beccd05586623e5dba0b861970722c3709070c8fd4b80a23f0a84b74a475485b0f2b05f44fae6f27f163714aef68
diff --git a/games-action/abuse/abuse-0.8-r1.ebuild b/games-action/abuse/abuse-0.8-r1.ebuild
new file mode 100644
index 000000000000..5099dd703aa8
--- /dev/null
+++ b/games-action/abuse/abuse-0.8-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils
+
+DESCRIPTION="Port of Abuse by Crack Dot Com"
+HOMEPAGE="http://abuse.zoy.org/"
+SRC_URI="http://abuse.zoy.org/raw-attachment/wiki/download/${P}.tar.gz"
+
+LICENSE="GPL-2 WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=media-libs/libsdl-1.1.6[sound,opengl,video]
+	media-libs/sdl-mixer
+	virtual/opengl"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	# Source-based install
+	default
+
+	doicon doc/${PN}.png
+	make_desktop_entry abuse Abuse
+}
+
+pkg_postinst() {
+	elog "NOTE: If you had previous version of abuse installed"
+	elog "you may need to remove ~/.abuse for the game to work correctly."
+}
diff --git a/games-action/abuse/files/abuse-0.8-gentoo.patch b/games-action/abuse/files/abuse-0.8-gentoo.patch
new file mode 100644
index 000000000000..c5d97834d9ec
--- /dev/null
+++ b/games-action/abuse/files/abuse-0.8-gentoo.patch
@@ -0,0 +1,24 @@
+diff -ru abuse-0.8.orig/Makefile.am abuse-0.8/Makefile.am
+--- abuse-0.8.orig/Makefile.am	2011-05-09 03:58:04.000000000 -0400
++++ abuse-0.8/Makefile.am	2011-05-16 22:22:51.642655295 -0400
+@@ -2,8 +2,6 @@
+ 
+ SUBDIRS = src data doc
+ 
+-EXTRA_DIST = COPYING.GPL COPYING.WTFPL PACKAGERS bootstrap
+-
+ dist-hook:
+ 	@echo ""
+ 	@echo "          ===================================================="
+diff -ru abuse-0.8.orig/configure.ac abuse-0.8/configure.ac
+--- abuse-0.8.orig/configure.ac	2011-05-09 03:58:04.000000000 -0400
++++ abuse-0.8/configure.ac	2011-05-16 22:22:35.771824632 -0400
+@@ -90,8 +90,6 @@
+ fi
+ AM_CONDITIONAL(HAVE_NONFREE, test "${ac_cv_have_nonfree}" = "yes")
+ 
+-# Optimizations
+-CXXFLAGS="${CXXFLAGS} ${OPT} ${REL}"
+ # Code qui fait des warnings == code de porc == deux baffes dans ta gueule
+ CXXFLAGS="${CXXFLAGS} -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wsign-compare"
+ 
diff --git a/games-action/abuse/metadata.xml b/games-action/abuse/metadata.xml
new file mode 100644
index 000000000000..c040f7c7d3e0
--- /dev/null
+++ b/games-action/abuse/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-action/accelerator3d-0.1.1-r3 b/games-action/accelerator3d-0.1.1-r3
deleted file mode 100644
index 90d666bb13cd..000000000000
--- a/games-action/accelerator3d-0.1.1-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Fast-paced, 3D, first-person shoot/dodge-'em-up, in the vain of Tempest or n2o
-EAPI=6
-HOMEPAGE=http://accelerator3d.sourceforge.net/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=Artistic
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/accelerator3d/accelerator-0.1.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4e8a6e328f9f9832dc09c2725ffdbca5
diff --git a/games-action/accelerator3d/Manifest b/games-action/accelerator3d/Manifest
new file mode 100644
index 000000000000..d91f1930bfb9
--- /dev/null
+++ b/games-action/accelerator3d/Manifest
@@ -0,0 +1,5 @@
+AUX accelerator3d-0.1.1-gentoo-paths.patch 3073 BLAKE2B 1b9621992e022838f9319d839b0f765b69d6ac6086dd99127c5398718b1507db0039a414e65bb3a19c0d8898ea0cfa762e41271424def05dcd984e5eb481be6a SHA512 176b46b537c65319cc611159fc6dda6b6d21858c101d491a54c28099522d9a5a06fd6d07b84b70c1d8bfd30c591a61ad3a5e3d72ce5415760f18c828c42f1e56
+AUX accelerator3d-0.1.1-gllightmodel.patch 574 BLAKE2B 524d7fae81db0382f5ca29ad055fecac9a55d4aeea900c1559fb0fe0ba3af2485eb8f891348f13345aa7ec1df4a6a66080c9a5091eb8c0341f88b37ec64c2c54 SHA512 e6364093194560e1834ea52b943bb01f5b1e2990ed5b087c30a1c756a7f44857bfdff908ade0f67c1c8047cff82f2c7e4b660968cdf82a90012f00c2ccef5e7b
+DIST accelerator-0.1.1.tar.bz2 1183838 BLAKE2B 8c7b888e4eadc0a1ed63745904db94757cfa73557664e0b2a7f7c8960990eb82991be9b1b42cb0d60f3af113867a2a02fb9304bd97f7658fec7d86efe5747c34 SHA512 f4321beb5f5b61c10d0b275321641ec173636267ae08cf88f7a2ecaaf0799cfe6593cbc7343c8ebfa72853c59773841295b1aca9a0ac0ef510de390107aa01da
+EBUILD accelerator3d-0.1.1-r3.ebuild 1057 BLAKE2B 81995a41e7879deedb0a4db5d295d6c4f12490f54ef2df4c97829a079f0fbce3c49d2045a1ad2f16bcfdc5689c8c17ca35c697523baccf86ef2db82dbcbd78b6 SHA512 dc714c64480520e86e66f18a46edcd020b742271d90d8a2eb1908a216bf53ac76a936fa754baf33a3b14c0357a774d0833fc76b768115bdbf4be576046797a2c
+MISC metadata.xml 336 BLAKE2B 0a097a131cf597dadb452521435b8bbf48ebc783dd45159dabfdd3ea68a15cb279307788cd54b577335f6d99c378583b85190802b7baacfc9918929c619f245b SHA512 a5f747c0ca0e4a9b14d09981181248de38c92175f80c96ad368f04033c4782e0ae0ae84af6604ee8ba0d6e438d395e4101a62fc5eefcfbef0cd003e78978c51c
diff --git a/games-action/accelerator3d/accelerator3d-0.1.1-r3.ebuild b/games-action/accelerator3d/accelerator3d-0.1.1-r3.ebuild
new file mode 100644
index 000000000000..1a5d9737b89a
--- /dev/null
+++ b/games-action/accelerator3d/accelerator3d-0.1.1-r3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils python-r1
+
+DESCRIPTION="Fast-paced, 3D, first-person shoot/dodge-'em-up, in the vain of Tempest or n2o"
+HOMEPAGE="http://accelerator3d.sourceforge.net/"
+SRC_URI="mirror://sourceforge/accelerator3d/accelerator-${PV}.tar.bz2"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	dev-python/pygame[${PYTHON_USEDEP}]
+	dev-python/pyode[${PYTHON_USEDEP}]
+	dev-python/pyopengl[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${PN}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo-paths.patch
+	"${FILESDIR}"/${P}-gllightmodel.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s:@GENTOO_DATADIR@:${EPREFIX}/usr/share/${PN}:" \
+		accelerator.py || die
+}
+
+src_install() {
+	python_foreach_impl python_newscript accelerator.py accelerator
+
+	insinto /usr/share/${PN}
+	doins -r gfx/. snd/.
+	einstalldocs
+	make_desktop_entry accelerator
+}
diff --git a/games-action/accelerator3d/files/accelerator3d-0.1.1-gentoo-paths.patch b/games-action/accelerator3d/files/accelerator3d-0.1.1-gentoo-paths.patch
new file mode 100644
index 000000000000..526fa678fdbc
--- /dev/null
+++ b/games-action/accelerator3d/files/accelerator3d-0.1.1-gentoo-paths.patch
@@ -0,0 +1,53 @@
+--- a/accelerator.py	2006-04-18 21:51:28.000000000 +0200
++++ b/accelerator.py	2006-04-18 22:07:28.000000000 +0200
+@@ -72,7 +72,7 @@
+ 	# default parameters on it (min/mag filters, wrapping).
+ 	def __init__(self,texfile,mipmap = False):
+ 		global activeTexture
+-		filename = os.path.join('gfx',texfile)
++		filename = os.path.join('@GENTOO_DATADIR@',texfile)
+ 		image = pygame.image.load(filename)
+ 		data = pygame.image.tostring(image,'RGBX')
+ 		self.__texref = glGenTextures(1)
+@@ -599,8 +599,8 @@
+ 			for i in xrange(len(self.__menu[j][0])):
+ 				font.addString(self.__menu[j][0][i])
+ 		if (soundon):
+-			self.__browsesound = pygame.mixer.Sound(os.path.join('snd','menu_browse.wav'))
+-			self.__selectsound = pygame.mixer.Sound(os.path.join('snd','menu_select.wav'))
++			self.__browsesound = pygame.mixer.Sound(os.path.join('@GENTOO_DATADIR@','menu_browse.wav'))
++			self.__selectsound = pygame.mixer.Sound(os.path.join('@GENTOO_DATADIR@','menu_select.wav'))
+ 
+ 	def doLoop(self):
+ 		global elapsed, z_increment, font
+@@ -792,19 +792,19 @@
+ 
+ 		# sound!
+ 		if soundon:
+-			self.__shootsound = pygame.mixer.Sound(os.path.join('snd','shoot.wav'))
+-			self.__cluonsound = pygame.mixer.Sound(os.path.join('snd','cluon.wav'))
+-			self.__bogonsound = pygame.mixer.Sound(os.path.join('snd','bogon.wav'))
+-			self.__shipdeadsound = pygame.mixer.Sound(os.path.join('snd','ship_explode.wav'))
+-			self.__shocksound = pygame.mixer.Sound(os.path.join('snd','electricshock.wav'))
+-			self.__thudsound = pygame.mixer.Sound(os.path.join('snd','thud.wav'))
+-			self.__enginesound = pygame.mixer.Sound(os.path.join('snd','engine.wav'))
+-			self.__chargesound = pygame.mixer.Sound(os.path.join('snd','neon.wav'))
++			self.__shootsound = pygame.mixer.Sound(os.path.join('@GENTOO_DATADIR@','shoot.wav'))
++			self.__cluonsound = pygame.mixer.Sound(os.path.join('@GENTOO_DATADIR@','cluon.wav'))
++			self.__bogonsound = pygame.mixer.Sound(os.path.join('@GENTOO_DATADIR@','bogon.wav'))
++			self.__shipdeadsound = pygame.mixer.Sound(os.path.join('@GENTOO_DATADIR@','ship_explode.wav'))
++			self.__shocksound = pygame.mixer.Sound(os.path.join('@GENTOO_DATADIR@','electricshock.wav'))
++			self.__thudsound = pygame.mixer.Sound(os.path.join('@GENTOO_DATADIR@','thud.wav'))
++			self.__enginesound = pygame.mixer.Sound(os.path.join('@GENTOO_DATADIR@','engine.wav'))
++			self.__chargesound = pygame.mixer.Sound(os.path.join('@GENTOO_DATADIR@','neon.wav'))
+ 			self.__chargeplaying = False
+-			self.__scrapesound = pygame.mixer.Sound(os.path.join('snd','scrape.wav'))
++			self.__scrapesound = pygame.mixer.Sound(os.path.join('@GENTOO_DATADIR@','scrape.wav'))
+ 			self.__scrapeplaying = False
+-			self.__slamsound = pygame.mixer.Sound(os.path.join('snd','slam.wav'))
+-			self.__phlogsound = pygame.mixer.Sound(os.path.join('snd','phlogiston.wav'))
++			self.__slamsound = pygame.mixer.Sound(os.path.join('@GENTOO_DATADIR@','slam.wav'))
++			self.__phlogsound = pygame.mixer.Sound(os.path.join('@GENTOO_DATADIR@','phlogiston.wav'))
+ 
+ 			# reserve channel 0 for bullet sounds
+ 			pygame.mixer.set_reserved(2)
diff --git a/games-action/accelerator3d/files/accelerator3d-0.1.1-gllightmodel.patch b/games-action/accelerator3d/files/accelerator3d-0.1.1-gllightmodel.patch
new file mode 100644
index 000000000000..31d0a8b5b4c5
--- /dev/null
+++ b/games-action/accelerator3d/files/accelerator3d-0.1.1-gllightmodel.patch
@@ -0,0 +1,11 @@
+--- a/accelerator.py
++++ b/accelerator.py
+@@ -274,7 +274,7 @@
+ 	glColorMaterial(GL_FRONT,GL_AMBIENT_AND_DIFFUSE)
+ 	glMaterialfv(GL_FRONT,GL_SHININESS,128)
+ 	glMaterialfv(GL_FRONT,GL_SPECULAR,(0.5,0.5,0.5,1))
+-	glLightModel(GL_LIGHT_MODEL_COLOR_CONTROL_EXT,GL_SEPARATE_SPECULAR_COLOR_EXT) # GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR
++	glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL_EXT,GL_SEPARATE_SPECULAR_COLOR_EXT) # GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR
+ 	glEnable(GL_LINE_SMOOTH)
+ 	glEnable(GL_NORMALIZE)
+ 	#glPolygonMode(GL_FRONT,GL_LINE)
diff --git a/games-action/accelerator3d/metadata.xml b/games-action/accelerator3d/metadata.xml
new file mode 100644
index 000000000000..eaa5ae72c1f2
--- /dev/null
+++ b/games-action/accelerator3d/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">accelerator3d</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/armagetronad-0.2.8.3.3-r1 b/games-action/armagetronad-0.2.8.3.3-r1
deleted file mode 100644
index 5629f043eca9..000000000000
--- a/games-action/armagetronad-0.2.8.3.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=dev-libs/libxml2 !dedicated? ( media-libs/libpng:0= media-libs/libsdl[X,opengl,video,sound?] media-libs/sdl-image[jpeg,png] virtual/glu virtual/opengl sound? ( media-libs/sdl-mixer ) ) >=sys-apps/sed-4
-DESCRIPTION=Fast-paced 3D lightcycle game based on Tron
-EAPI=6
-HOMEPAGE=http://armagetronad.org/
-IUSE=dedicated sound
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/libxml2 !dedicated? ( media-libs/libpng:0= media-libs/libsdl[X,opengl,video,sound?] media-libs/sdl-image[jpeg,png] virtual/glu virtual/opengl sound? ( media-libs/sdl-mixer ) )
-SLOT=0
-SRC_URI=https://launchpad.net/armagetronad/0.2.8/0.2.8.3.x/+download/armagetronad-0.2.8.3.3.src.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=030caec13fb8394b5d889f433a2990ae
diff --git a/games-action/armagetronad/Manifest b/games-action/armagetronad/Manifest
new file mode 100644
index 000000000000..018b527f208b
--- /dev/null
+++ b/games-action/armagetronad/Manifest
@@ -0,0 +1,4 @@
+AUX armagetronad-0.2.8.3.3-gcc6.patch 6419 BLAKE2B af8f6ec0ab77839ced171e6002279952a1aa680115bf2985c69df8b973c67f8c6516a45608737b4e473175b5682b0a03ec2c089a70b47b34ffeb8ce9318aad9c SHA512 ff56e2388b56736fddd1a4fba94914a3d327c11b25675a45f930b1ceab215cd197563194aa6485571ba5ee7c4ed6e2644da9f81f70cc686201a8efbed9149a44
+DIST armagetronad-0.2.8.3.3.src.tar.bz2 1857868 BLAKE2B 60a8fffe61903cb1fa4b188ae6c72ad842e5395b8a37276a6b84018e5393e1294e6ef5438fc7e029d02bfd7172eb81973781e7fbb670c3c7fbacae46d19de409 SHA512 05dd7db10efdac0e681133d07384b0e3c2edea328433f1d906e36b5f70960bf502df8d496967981b6bd67e1a119af9a5bbd71b0c824f790921deb3165165dc3f
+EBUILD armagetronad-0.2.8.3.3-r1.ebuild 1321 BLAKE2B 68a66afe2c40cd1a083531c60ec9b8b3dbd7dbe1edc8533df273e5fb4962d97296db52a60c9c38d7a52a21c389026ea653583c11a806a44fe08cb8d1c53de84c SHA512 9fd7a73fc82c802189bb4e379d26c87807508fc3631adbe6c1b2a4f35d82fd97f73fbce7455d8d8020780ad6ee766d1875f32a4bbac6b1f8d37271764ad3d1f6
+MISC metadata.xml 333 BLAKE2B 9e7f4657f3f025fbe42e09e9b64d191a79a125ad3df9ff007e1f6cbdbe40b9311ef257adac0a5861750c21c067bfe6165e80451ac211e06dd0dce542f126ca3f SHA512 ead9b44190ac80607b29eb37c771f7ce041cdde47e1e8203201d0e616ea78377312101dbf1ed6a508c64a884980506c96cf77dbd8a4d05f0a69ecd807fc40ead
diff --git a/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild b/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild
new file mode 100644
index 000000000000..9147b2111608
--- /dev/null
+++ b/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils
+
+DESCRIPTION="Fast-paced 3D lightcycle game based on Tron"
+HOMEPAGE="http://armagetronad.org/"
+SRC_URI="https://launchpad.net/armagetronad/${PV:0:5}/${PV:0:7}.x/+download/armagetronad-${PV}.src.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated sound"
+
+RDEPEND="
+	dev-libs/libxml2
+	!dedicated? (
+		media-libs/libpng:0=
+		media-libs/libsdl[X,opengl,video,sound?]
+		media-libs/sdl-image[jpeg,png]
+		virtual/glu
+		virtual/opengl
+		sound? ( media-libs/sdl-mixer )
+	)"
+DEPEND=${RDEPEND}
+
+PATCHES=( "${FILESDIR}"/${P}-gcc6.patch )
+
+src_prepare() {
+	default
+	sed -i -e 's#aa_docdir=.*$#aa_docdir=${docdir}#' configure || die
+}
+
+src_configure() {
+	# --enable-games just messes up paths
+	econf \
+		$(use_enable dedicated) \
+		$(use_enable sound music) \
+		--disable-sysinstall \
+		--disable-useradd \
+		--disable-uninstall \
+		--disable-games
+}
+
+src_install() {
+	default
+
+	# misplaced desktop-file/icons
+	rm -r "${ED%/}"/usr/share/${PN}/desktop || die
+	doicon -s 48 desktop/icons/large/armagetronad.png
+	make_desktop_entry ${PN}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-action/armagetronad/files/armagetronad-0.2.8.3.3-gcc6.patch b/games-action/armagetronad/files/armagetronad-0.2.8.3.3-gcc6.patch
new file mode 100644
index 000000000000..0cd6e5bc1d67
--- /dev/null
+++ b/games-action/armagetronad/files/armagetronad-0.2.8.3.3-gcc6.patch
@@ -0,0 +1,222 @@
+Bug: https://bugs.gentoo.org/show_bug.cgi?id=617768
+Commit: https://sourceforge.net/p/armagetronad/code/10845/
+
+--- a/src/engine/eNetGameObject.cpp
++++ b/src/engine/eNetGameObject.cpp
+@@ -85,7 +85,7 @@
+ eNetGameObject::eNetGameObject(eGrid *grid, const eCoord &pos,const eCoord &dir,
+                                ePlayerNetID* p,bool autodelete)
+         :eGameObject(grid, pos,dir,NULL,autodelete),
+-nNetObject(p->Owner()),player(p){
++         nNetObject(Owner(p)),player(p){
+     lastClientsideAction=0;
+     if (sn_GetNetState()!=nCLIENT)
+         RequestSync();
+@@ -205,7 +205,7 @@
+ 
+ void eNetGameObject::SetPlayer(ePlayerNetID* a_player)
+ {
+-    tASSERT( !a_player || Owner() == player->Owner() );
++    tASSERT( !a_player || Owner() == Owner(player) );
+     player  = a_player;
+     if ( laggometerSmooth == 0 && sn_GetNetState() != nCLIENT )
+         laggometerSmooth = laggometer = se_GetPing( player );
+--- a/src/engine/ePlayer.cpp
++++ b/src/engine/ePlayer.cpp
+@@ -56,6 +56,7 @@
+ #include "nConfig.h"
+ #include "nNetwork.h"
+ #include <time.h>
++#include <climits>
+ 
+ int se_lastSaidMaxEntries = 8;
+ 
+@@ -1689,9 +1690,9 @@
+         // foo (Red Team) --> Blue Team: some message here
+         eTeam *senderTeam = sender->CurrentTeam();
+         console << tColoredString::ColorString(1,1,.5) << " (";
+-        console << *senderTeam;
++        console << senderTeam;
+         console << tColoredString::ColorString(1,1,.5) << ") --> ";
+-        console << *team;
++        console << team;
+     }
+ 
+     console << tColoredString::ColorString(1,1,.5) << ": ";
+@@ -1923,7 +1924,7 @@
+         else {
+             eTeam *senderTeam = sender->CurrentTeam();
+             say << tColoredString::ColorString(1,1,.5) << " (";
+-            say << *team;
++            say << team;
+             say << tColoredString::ColorString(1,1,.5) << " ) --> ";
+             say << senderTeam;
+         }
+@@ -3941,7 +3942,7 @@
+     sg_ClampPingCharity( ::pingCharity );
+ }
+ 
+-static int IMPOSSIBLY_LOW_SCORE=(-1 << 31);
++static int IMPOSSIBLY_LOW_SCORE=INT_MIN;
+ 
+ static nSpamProtectionSettings se_chatSpamSettings( 1.0f, "SPAM_PROTECTION_CHAT", tOutput("$spam_protection") );
+ 
+--- a/src/engine/eTeam.cpp
++++ b/src/engine/eTeam.cpp
+@@ -31,20 +31,21 @@
+ #include "nConfig.h"
+ 
+ #include <set>
++#include <climits>
+ 
+-tString & operator << ( tString &s, const eTeam & team)
++tString & operator << ( tString &s, const eTeam * team)
+ {
+-    if ( !(&team) )
++    if ( !team )
+         return s << tOutput("$player_spectator_message");
+     else
+-        return s << team.GetColoredName();
++        return s << team->GetColoredName();
+ }
+-std::ostream & operator << ( std::ostream &s, const eTeam & team)
++std::ostream & operator << ( std::ostream &s, const eTeam * team)
+ {
+-    if ( !(&team) )
++    if ( !team )
+         return s << tOutput("$player_spectator_message");
+     else
+-        return s << team.GetColoredName();
++        return s << team->GetColoredName();
+ }
+ 
+ #define TEAMCOLORS 8
+@@ -75,7 +76,7 @@
+ // static tList<eTeam> se_ColoredTeams;
+ static eTeam * se_ColoredTeams[TEAMCOLORS]={0,0,0,0,0,0,0,0};
+ 
+-static int IMPOSSIBLY_LOW_SCORE=(-1 << 31);
++static int IMPOSSIBLY_LOW_SCORE=INT_MIN;
+ 
+ // class that creates config items for one team
+ // TEAM_(NAME|RED|GREEN|BLUE)_X
+--- a/src/engine/eTeam.h
++++ b/src/engine/eTeam.h
+@@ -32,8 +32,8 @@
+ #include "nNetObject.h"
+ #include "tList.h"
+ 
+-tString & operator << ( tString&, const eTeam&);
+-std::ostream & operator << ( std::ostream&, const eTeam&);
++tString & operator << ( tString&, const eTeam*);
++std::ostream & operator << ( std::ostream&, const eTeam*);
+ 
+ template<class T> class nConfItem;
+ 
+--- a/src/network/nNetObject.h
++++ b/src/network/nNetObject.h
+@@ -128,7 +128,16 @@
+ 
+     virtual void Dump( tConsole& con ); // dumps object stats
+ 
++    static unsigned short ID(nNetObject const *pThis)
++    {
++        if (pThis)
++            return pThis->id;
++        else
++            return 0;
++    }
++
+     unsigned short ID() const{
++        tASSERT(this);
+         if (this)
+             return id;
+         else
+@@ -135,7 +144,16 @@
+             return 0;
+     }
+ 
++    static unsigned short Owner(nNetObject const *pThis)
++    {
++        if (pThis)
++            return pThis->owner;
++        else
++            return ::sn_myNetID;
++    }
++
+     unsigned short Owner() const{
++        tASSERT(this);
+         if (this)
+             return owner;
+         else
+--- a/src/tools/tLocale.cpp
++++ b/src/tools/tLocale.cpp
+@@ -731,6 +731,13 @@
+ 
+ // and a special implementation for the locales and strings:
+ tOutput& operator << (tOutput &o, const char *locale){
++    return o.AddString(locale);
++}
++
++tOutput & tOutput::AddString(char const * locale)
++{
++    tOutput & o = *this;
++
+     int len = strlen(locale);
+     if (len == 0)
+         return o;
+--- a/src/tools/tLocale.h
++++ b/src/tools/tLocale.h
+@@ -81,7 +81,7 @@
+ 
+     tOutputItemBase *anchor;
+ 
+-    tOutput& operator << (const tOutput &o);
++    // tOutput& operator << (const tOutput &o);
+ public:
+     tOutput();
+     ~tOutput();
+@@ -91,6 +91,7 @@
+     void AddLiteral(const char *);       // adds a language independent string
+     void AddLocale(const char *);        // adds a language dependant string
+     void AddSpace();                     // adds a simple space
++    tOutput & AddString(char const * pString); // checks the string, delegates to correct Add...()-Function
+ 
+     // set a template parameter at this position of the output string
+     tOutput & SetTemplateParameter(int num, const char *parameter);
+@@ -113,7 +114,7 @@
+ 
+         SetTemplateParameter(1, template1);
+ 
+-        *this << identifier;
++        AddString(identifier);
+     }
+ 
+     template< class T1, class T2 >
+@@ -125,7 +126,7 @@
+         SetTemplateParameter(1, template1);
+         SetTemplateParameter(2, template2);
+ 
+-        *this << identifier;
++        AddString(identifier);
+     }
+ 
+     template< class T1, class T2, class T3 >
+@@ -138,7 +139,7 @@
+         SetTemplateParameter(2, template2);
+         SetTemplateParameter(3, template3);
+ 
+-        *this << identifier;
++        AddString(identifier);
+     }
+ 
+     template< class T1, class T2, class T3, class T4 >
+@@ -152,7 +153,7 @@
+         SetTemplateParameter(3, template3);
+         SetTemplateParameter(4, template4);
+ 
+-        *this << identifier;
++        AddString(identifier);
+     }
+ 
+     tOutput(const tOutput &o); // copy constructor
diff --git a/games-action/armagetronad/metadata.xml b/games-action/armagetronad/metadata.xml
new file mode 100644
index 000000000000..0a249e335798
--- /dev/null
+++ b/games-action/armagetronad/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="launchpad">armagetronad</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/atanks-6.4-r1 b/games-action/atanks-6.4-r1
deleted file mode 100644
index 8ec01bae877a..000000000000
--- a/games-action/atanks-6.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst
-DEPEND=media-libs/allegro:0[X] >=sys-apps/sed-4
-DESCRIPTION=Worms and Scorched Earth-like game
-EAPI=6
-HOMEPAGE=http://atanks.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=media-libs/allegro:0[X]
-SLOT=0
-SRC_URI=mirror://sourceforge/atanks/atanks-6.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9bdbadad815ceedaeb2be3aed8ade114
diff --git a/games-action/atanks/Manifest b/games-action/atanks/Manifest
new file mode 100644
index 000000000000..8c9c1ee6f223
--- /dev/null
+++ b/games-action/atanks/Manifest
@@ -0,0 +1,4 @@
+AUX atanks-6.4-fix-build-system.patch 579 BLAKE2B 002bbbbba9981e010669f5b85cccb48816d35f1dfde0a35ef9c6cb1634cc75686b531572fa0c2163f78d49e56f15375b4cc0810798adb56b91e51e877ca3b279 SHA512 86b046c37de4ff24f30dce799f32674d33930605c9da32a1c95e8438f6573e66f46455cbf371f66a1b4d8240c608dd338376be150bab59d4048bb46326f82daa
+DIST atanks-6.4.tar.gz 6059315 BLAKE2B ea217b5dceaf63e85e3772369ebab1f76d35175cf8e2d0914e2806db8209f9d4721590f8a285bbfe0938f4957eec409e1581189257f117ec5d5e4c3af59707c1 SHA512 e9410e5bf0e8ec0281718ad8ddca74b67000db96b09b6af8aa906bbf2cd815f07ff550087ecdee2e4c5bfabc42941f184173f35e50538e57bb008372a599e1e6
+EBUILD atanks-6.4-r1.ebuild 971 BLAKE2B 88e97b1497c2d0fb55f1038eb74f1e21e91dff44f610d6b9158427e3abd12ddb3050ef425221701d70667b066f9a2d5cc46f0335f7e1f8e36788d79c673cd790 SHA512 6b855aacfec1311d5c85bdbbf1607829c81183e15e3fbddcd2177492184eab1b94c1d250e3b269783602e4d0e37bdc8da1664a944ed8cb6bf586eea45950caba
+MISC metadata.xml 329 BLAKE2B 7a85aeb104fe2068285701ff8f771f7337a7b5f884b33e683206be3d66aca6e1fbfc611b312e71288ec842c28790bf025b979235677387d72070aa85f0bf0adc SHA512 1dc2914fc7dfe5c7f87ac565b6183b50d281fdf768e05cf211309699a264fde8a3e434ed07049b984e6f116256fec2124ed458ccfc70374ff35ff3189ec57917
diff --git a/games-action/atanks/atanks-6.4-r1.ebuild b/games-action/atanks/atanks-6.4-r1.ebuild
new file mode 100644
index 000000000000..ed2deed79042
--- /dev/null
+++ b/games-action/atanks/atanks-6.4-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils toolchain-funcs
+
+DESCRIPTION="Worms and Scorched Earth-like game"
+HOMEPAGE="http://atanks.sourceforge.net/"
+SRC_URI="mirror://sourceforge/atanks/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-libs/allegro:0[X]"
+RDEPEND=${DEPEND}
+
+PATCHES=( "${FILESDIR}"/${PN}-6.4-fix-build-system.patch )
+
+src_configure() {
+	tc-export CXX
+}
+
+src_compile() {
+	emake \
+		INSTALLDIR="${EPREFIX}/usr/share/${PN}"
+}
+
+src_install() {
+	dobin ${PN}
+	local DOCS=( Changelog README TODO )
+	einstalldocs
+
+	insinto /usr/share/${PN}
+	doins -r button misc missile sound stock tank tankgun text title unicode.dat *.txt
+
+	doicon -s 48 ${PN}.png
+	make_desktop_entry atanks "Atomic Tanks"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-action/atanks/files/atanks-6.4-fix-build-system.patch b/games-action/atanks/files/atanks-6.4-fix-build-system.patch
new file mode 100644
index 000000000000..e13ebb1d1421
--- /dev/null
+++ b/games-action/atanks/files/atanks-6.4-fix-build-system.patch
@@ -0,0 +1,28 @@
+* Don't try to find where $(CXX) is, just use it
+* Don't muck with CXXFLAGS
+
+--- a/Makefile
++++ b/Makefile
+@@ -85,13 +85,9 @@
+ # ------------------------------------
+ INSTALL := $(shell which install)
+ RM      := $(shell which rm) -f
+-CXX     ?= g++
+ SED     := $(shell which sed)
+ WINDRES :=
+ 
+-ifeq (,$(findstring /,$(CXX)))
+-  CXX   := $(shell which $(CXX))
+-endif
+ 
+ 
+ # if this is a Windows target, prefer mingw32-g++ over g++
+@@ -231,8 +227,6 @@
+     CPPFLAGS := ${CPPFLAGS} -DATANKS_DEBUG_LOGTOFILE
+   endif
+ 
+-else
+-  CXXFLAGS := -march=native ${CXXFLAGS} -O2
+ endif
+ 
+ 
diff --git a/games-action/atanks/metadata.xml b/games-action/atanks/metadata.xml
new file mode 100644
index 000000000000..f4e068857c3f
--- /dev/null
+++ b/games-action/atanks/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">atanks</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/barrage-1.0.4-r1 b/games-action/barrage-1.0.4-r1
deleted file mode 100644
index 4d680b398ff7..000000000000
--- a/games-action/barrage-1.0.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=media-libs/libsdl-1.2[sound,video] >=media-libs/sdl-mixer-1.2.4
-DESCRIPTION=A violent point-and-click shooting game
-EAPI=6
-HOMEPAGE=http://lgames.sourceforge.net/Barrage/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libsdl-1.2[sound,video] >=media-libs/sdl-mixer-1.2.4
-SLOT=0
-SRC_URI=mirror://sourceforge/lgames/barrage-1.0.4.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_=a7a6589c7182decb28bda2f5ce2d5337
diff --git a/games-action/barrage/Manifest b/games-action/barrage/Manifest
new file mode 100644
index 000000000000..3b217a4f8900
--- /dev/null
+++ b/games-action/barrage/Manifest
@@ -0,0 +1,3 @@
+DIST barrage-1.0.4.tar.gz 484641 BLAKE2B 84a3747245c2e475c7685cc49259eb8e345fe639e9b345a9b8cb59f36ec04a31f639169a4498a50369e86a3355414e84c7326addcdc519e8bf869734ffd2ae30 SHA512 c866c0b98541c0c878ff015d99a2ae62e123c8095e94f64ef5aed26d68b734432110181c11a5b429d4feb808b2b276ac94295ff2b23ddfc64a8790d04a89a966
+EBUILD barrage-1.0.4-r1.ebuild 596 BLAKE2B 8a10ebbe6efaa96d97bc9cf404671bdf85140605add93793a6cf5ec4a13c8757ceb0fc74f6e5cb3c4073de6c22ee2ff2708a5175df05f46ef582913de0508ca2 SHA512 3e2af1687622eaefedda47536f940f3426e66151e15aaf678c12bba4818ddff42b097ed3fb492810463fb608ce205edf0b1e9c6eb15f40a49b4cc3ac80b5f647
+MISC metadata.xml 329 BLAKE2B bcb35c37e05c93388a83ec235e25d38fb4a37ecb7df64c38a00e6bc7959090297f2c0168d1d461b24a43d0991184f62690de6d483a1d610bc74810238181593d SHA512 2439299362958450ac88f39ba8332cb84d42694d471f79cf8a6b9d38ecc96fa629b91530dee7c50aa23fab5e5a0155cb92cb3a8131a1b69e9375f114da86b463
diff --git a/games-action/barrage/barrage-1.0.4-r1.ebuild b/games-action/barrage/barrage-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..fc4dde6e54ed
--- /dev/null
+++ b/games-action/barrage/barrage-1.0.4-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="A violent point-and-click shooting game"
+HOMEPAGE="http://lgames.sourceforge.net/Barrage/"
+SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=media-libs/libsdl-1.2[sound,video]
+	>=media-libs/sdl-mixer-1.2.4"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	default
+
+	newicon barrage48.png ${PN}.png
+	make_desktop_entry ${PN} Barrage
+	rm "${ED%/}"/usr/share/applications/${PN}.desktop || die
+}
diff --git a/games-action/barrage/metadata.xml b/games-action/barrage/metadata.xml
new file mode 100644
index 000000000000..2cbba7c09d17
--- /dev/null
+++ b/games-action/barrage/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">lgames</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/battalion-1.4b-r1 b/games-action/battalion-1.4b-r1
deleted file mode 100644
index e962f360d62c..000000000000
--- a/games-action/battalion-1.4b-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=virtual/glu virtual/opengl x11-libs/libX11
-DESCRIPTION=Be a rampaging monster and destroy the city
-EAPI=6
-HOMEPAGE=http://evlweb.eecs.uic.edu/aej/AndyBattalion.html
-KEYWORDS=~x86
-LICENSE=battalion HPND
-RDEPEND=virtual/glu virtual/opengl x11-libs/libX11
-SLOT=0
-SRC_URI=http://evlweb.eecs.uic.edu/aej/BATTALION/battalion1.4b.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=7e5ede248528bfcbb754faadf25ec1c0
diff --git a/games-action/battalion/Manifest b/games-action/battalion/Manifest
new file mode 100644
index 000000000000..3d3f8b7e0742
--- /dev/null
+++ b/games-action/battalion/Manifest
@@ -0,0 +1,5 @@
+AUX battalion-1.4b-fix-build-system.patch 1899 BLAKE2B cb53fff37506c874701549c1c4bdbae9760ece3bc7a51dd01da5d3acad6bfc491d36ff31eb6874f73680f67502210d58dacc28c11c22fcb7347d0d396ea07222 SHA512 66248fee82a88f416d255ff7e23c5ffeaac6a10bca22b93231645f9c9923b18df339dea2e38f6b4ab0a5189ce2650e7e21813060576ce1f70fe5e7c29d0f0bb0
+AUX battalion-1.4b-warning.patch 490 BLAKE2B 21f4bca09c2581e4054c0a03f7c1f65f527bbdf05dca8554c9da2350b01a56d6ad6efcfe2ed390392a48df40a82fb25f7a6d308d65131a5155594ec336e232d3 SHA512 ba216b192f454b07b14891dbc6c412b301257a91546b77c1e2053324248243422bfac43794849f44068afb65919958f466416d39826248b28dc71a644a1ee660
+DIST battalion1.4b.tar.bz2 942342 BLAKE2B 6a4bd9afc7202d68c2cf62fbfe5b3b8377069263d71adaad006d2b4803d5989b130e0ef7fd5b1479a7698d79c819bc463ab19f2fa1493d4caf616708091e2c83 SHA512 c3c615772012c63a709aaeaf4f23246760bf577b82eeec7cf5b2a479c6240fe4a2f839aca50540299ed4bee9b297f61fb8b7e1f5af74ea357f0d7e749d86f84b
+EBUILD battalion-1.4b-r1.ebuild 1545 BLAKE2B 9f11a189da4dea715299d7a18f205b7a42d6da9ac2ba359cab96a5562f9ca1d62a1c272b99e53245d1fbd467aa20ec3fc2059a1857544f2af739481a61affe7c SHA512 2c2a348a748108e648a439d3aa3a2c8ba3828ff8acbdce855a32b0f5e892a04c0db0de24bb3ba6a07254f1c8472ab0959ae000f1359390fd571d491f5e725830
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/battalion/battalion-1.4b-r1.ebuild b/games-action/battalion/battalion-1.4b-r1.ebuild
new file mode 100644
index 000000000000..d601672cf212
--- /dev/null
+++ b/games-action/battalion/battalion-1.4b-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Be a rampaging monster and destroy the city"
+HOMEPAGE="http://evlweb.eecs.uic.edu/aej/AndyBattalion.html"
+SRC_URI="http://evlweb.eecs.uic.edu/aej/BATTALION/${PN}${PV}.tar.bz2"
+
+LICENSE="battalion HPND"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND="
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${PN}${PV}
+PATCHES=(
+	"${FILESDIR}"/${P}-warning.patch
+	"${FILESDIR}"/${PN}-1.4b-fix-build-system.patch
+)
+
+src_prepare() {
+	default
+
+	# Modify data paths
+	sed -i \
+		-e "s:SOUNDS/:${EPREFIX}/usr/share/${PN}/SOUNDS/:" \
+		-e "s:MUSIC/:${EPREFIX}/usr/share/${PN}/MUSIC/:" \
+		audio.c || die
+	sed -i \
+		-e "s:DATA/:${EPREFIX}/usr/share/${PN}/DATA/:" \
+		-e "s:/usr/tmp:${EPREFIX}/var/${PN}:" \
+		battalion.c || die
+	sed -i \
+		-e "s:TEXTURES/:${EPREFIX}/usr/share/${PN}/TEXTURES/:" \
+		graphics.c || die
+
+	# Only .raw sound files are used on Linux. The .au files are not needed.
+	rm {SOUNDS,MUSIC}/*.au || die
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin battalion
+	einstalldocs
+
+	insinto /usr/share/${PN}
+	doins -r DATA MUSIC SOUNDS TEXTURES
+
+	dodir /var/${PN}
+	touch "${ED%/}"/var/${PN}/battalion_hiscore || die
+	fperms 660 /var/${PN}/battalion_hiscore
+}
+
+pkg_postinst() {
+	elog "Sound and music are not enabled by default."
+	elog "Use the S and M keys to enable them in-game, or start the game with"
+	elog "the -s and -m switches: battalion -s -m"
+}
diff --git a/games-action/battalion/files/battalion-1.4b-fix-build-system.patch b/games-action/battalion/files/battalion-1.4b-fix-build-system.patch
new file mode 100644
index 000000000000..fe209e1db953
--- /dev/null
+++ b/games-action/battalion/files/battalion-1.4b-fix-build-system.patch
@@ -0,0 +1,55 @@
+--- a/Makefile
++++ b/Makefile
+@@ -23,7 +23,6 @@
+ # (the program should compile with no warning messages - if you
+ #  see a warning message please let me know about it)
+ # ------------------------------------------------------------
+-CC = cc
+ 
+ 
+ # STEP 2: IF YOU WANT TO COMPILE WITH THE MESA LIBRARIES THEN
+@@ -39,7 +38,8 @@
+ # ------------------------------------------------------------
+ #GLIB = -lMesaGL -lMesaGLU
+ # or
+-GLIB =  -lGL -lGLU
++GLIB_CFLAGS = `pkg-config --cflags gl` `pkg-config --cflags glu`
++GLIB_LIBS = `pkg-config --libs gl` `pkg-config --libs glu`
+ 
+ 
+ # STEP 4: CHOOSE WHICH HARDWARE / OS YOU ARE RUNNING
+@@ -91,13 +91,11 @@
+ 
+ # STEP 7: CHOOSE ANY OPTIMIZATIONS OR ADD ANY SPECIAL INCLUSIONS
+ # ------------------------------------------------------------
+-CFLAGS     = -O2  -I/usr/local/X11/include -I/usr/demo/SOUND/ -I./. $(AUDIODEF) $(OS)
+ 
+ 
+ # STEP 8: ADD ANY SPECIAL LIBRARY PATHS
+ #         (USEFUL TO POINT TO WHERE THE MESA LIBRARIES RESIDE)
+ # ------------------------------------------------------------
+-LIBFLAGS     = 
+ 
+ # you should now be able to type 'make' and everything should be fine ...
+ 
+@@ -106,15 +104,16 @@
+ TARGET 	= battalion
+ 
+ OBJ 	= battalion.o audio.o net.o gprim.o graphics.o objects.o text.o update.o tk.o font.o soundIt.o
+-LIBS    = -L./. -L/usr/X11R6/lib -lm -lX11 -lXext
++my_CPPFLAGS = -lm `pkg-config --cflags x11` `pkg-config --cflags xext` -I./. $(AUDIODEF) $(OS)
++my_LIBS = -lm `pkg-config --libs x11` `pkg-config --libs xext`
+ 
+ all:	$(TARGET)
+ 
+-#$(OBJ): $(?:.o=.c)
+-#	$(CC) $(CFLAGS) $(LIBFLAG) $(OS) $(WHICHLIB) $(AUDIOLIB) -c $?
++.c.o:
++	$(CC) $(CPPFLAGS) $(my_CPPFLAGS) $(CFLAGS) $(GLIB_CFLAGS) $(OS) $(WHICHLIB) $(AUDIOLIB) -c $<
+ 
+ $(TARGET): $(OBJ)
+-	$(CC) -o $(TARGET) $(OBJ) $(LIBFLAGS) $(GLIB) $(LIBS) $(AUDIODEF)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(GLIB_LIBS) $(LIBS) $(my_LIBS) $(AUDIODEF)
+ 
+ clean:
+ 	rm -f $(OBJ)
diff --git a/games-action/battalion/files/battalion-1.4b-warning.patch b/games-action/battalion/files/battalion-1.4b-warning.patch
new file mode 100644
index 000000000000..91fd8ee51d3b
--- /dev/null
+++ b/games-action/battalion/files/battalion-1.4b-warning.patch
@@ -0,0 +1,12 @@
+diff -ru battalion1.4b.orig/net.c battalion1.4b/net.c
+--- battalion1.4b.orig/net.c	2002-05-06 09:57:01.000000000 -0400
++++ battalion1.4b/net.c	2015-03-30 18:29:23.885306334 -0400
+@@ -378,7 +378,7 @@
+ 
+ /* nother copy of this elsewhere */
+ 
+-	sprintf(mesg, "%s %d %3.1f %3.1f %3.1f %3.1f %0.3f %d %d #", MESG_NEW_TANK,
++	sprintf(mesg, "%s %d %3.1f %3.1f %3.1f %3.1f %0.3f %d #", MESG_NEW_TANK,
+ 						 tempTank->number, 
+ 						 tempTank->x-globalxshift, 
+ 						 tempTank->z-globalzshift, 
diff --git a/games-action/battalion/metadata.xml b/games-action/battalion/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-action/battalion/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-action/beathazardultra-20130308-r1 b/games-action/beathazardultra-20130308-r1
deleted file mode 100644
index 450aa8c7b3a5..000000000000
--- a/games-action/beathazardultra-20130308-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch prepare unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Intense music-driven arcade shooter powered by your music
-EAPI=6
-HOMEPAGE=http://www.coldbeamgames.com/
-IUSE=bundled-libs
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=virtual/opengl amd64? ( !bundled-libs? ( >=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)] >=virtual/jpeg-0-r2[abi_x86_32(-)] ) >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] ) x86? ( x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXinerama x11-libs/libXrandr !bundled-libs? ( media-libs/libpng:1.2 virtual/jpeg ) )
-RESTRICT=bindist fetch splitdebug
-SLOT=0
-SRC_URI=beathazard-installer_03-08-13
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f32877e5222047d21d807931586383c4
diff --git a/games-action/beathazardultra/Manifest b/games-action/beathazardultra/Manifest
new file mode 100644
index 000000000000..9bbb60437fa1
--- /dev/null
+++ b/games-action/beathazardultra/Manifest
@@ -0,0 +1,3 @@
+DIST beathazard-installer_03-08-13 183569201 BLAKE2B 769fffbfc752d9c924c26a0fab347297087787d4eb665440fd3aed1c315a6f93f8e0526dbe62219b6aff2bb6ad1b7d7a5ccdc16663e9ea32671ec5c28fc12ebb SHA512 273f550034473d43ac4ceb41018b540f6518393606249de490642a4e6f0dfb5f0b860d3a633db0f90f3b9fce1dc156cf4bd80d383f7e6eae91a5e7bd9e9427d4
+EBUILD beathazardultra-20130308-r1.ebuild 1767 BLAKE2B ebd5ba6778165a4aef0e75798ee1658fe6df14ce4a37a9d1bbf5937a3fc20f0b022c47935eb1261632f1d3bdaa50299fdcf36951f4c66fcea9fc56b235314d9a SHA512 99cb0b82fff0de64b24c182924b444573e993c39360dae03974edc5b722d5ab2735b7138e9e8ae6b9acbfeb227e6d963f0384495ca74f623e3b1e1f6a395d675
+MISC metadata.xml 355 BLAKE2B 2ebe0923f754bb09445457bb7f266a9fb673682281d31d70b39a05f1cd0beb682fa26e89861c46e9dab0f77428b916f9f99d8324b3780c795f317b6e06efde84 SHA512 78f8cc8f1f1be915da206e4b8be196a21b58a6f209023594755e481136a1b86ee31c8d0dfedd516d756a47db624e89728875b073b71c3b08ac94a5cde8ff3b83
diff --git a/games-action/beathazardultra/beathazardultra-20130308-r1.ebuild b/games-action/beathazardultra/beathazardultra-20130308-r1.ebuild
new file mode 100644
index 000000000000..dbfa798f384d
--- /dev/null
+++ b/games-action/beathazardultra/beathazardultra-20130308-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: unbundle allegro[gtk...] (no multilib on amd64 and 5.0.9 soname)
+
+EAPI=6
+inherit eutils unpacker
+
+DESCRIPTION="Intense music-driven arcade shooter powered by your music"
+HOMEPAGE="http://www.coldbeamgames.com/"
+SRC_URI="beathazard-installer_03-08-13"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="bundled-libs"
+RESTRICT="bindist fetch splitdebug"
+QA_PREBUILT="/opt/${PN}/BeatHazard_Linux2
+	/opt/${PN}/hge_lib/*"
+
+DEPEND="app-arch/unzip"
+RDEPEND="
+	virtual/opengl
+	amd64? (
+		!bundled-libs? (
+			>=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)]
+			>=virtual/jpeg-0-r2[abi_x86_32(-)]
+		)
+		>=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
+		>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+		>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+		>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
+		>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+	)
+	x86? (
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		!bundled-libs? (
+			media-libs/libpng:1.2
+			virtual/jpeg
+		)
+	)"
+
+S=${WORKDIR}/data
+
+pkg_nofetch() {
+	einfo "Please buy & download ${SRC_URI} from:"
+	einfo "  ${HOMEPAGE}"
+	einfo "and move it to ${DISTDIR}"
+	einfo
+}
+
+src_unpack() {
+	unpack_zip ${A}
+}
+
+src_prepare() {
+	if ! use bundled-libs ; then
+		einfo "Removing bundled libs..."
+		rm -v all/hge_lib/libjpeg.so* all/hge_lib/libpng12.so* || die
+	fi
+	default
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r all/*
+
+	dodoc Linux.README
+
+	newicon SmileLogo.png ${PN}.png
+	make_desktop_entry ${PN}
+	make_wrapper ${PN} "./BeatHazard_Linux2" "/opt/${PN}" "/opt/${PN}/hge_lib"
+
+	fperms +x /opt/${PN}/BeatHazard_Linux2
+}
diff --git a/games-action/beathazardultra/metadata.xml b/games-action/beathazardultra/metadata.xml
new file mode 100644
index 000000000000..b878aaa1812d
--- /dev/null
+++ b/games-action/beathazardultra/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="bundled-libs">
+			Use the upstream provided bundled libraries.
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/games-action/bomberclone-0.11.8-r1 b/games-action/bomberclone-0.11.8-r1
deleted file mode 100644
index 296b7c93a7da..000000000000
--- a/games-action/bomberclone-0.11.8-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=media-libs/libsdl-1.1.0[video] media-libs/sdl-image[png] media-libs/sdl-mixer[mod] X? ( x11-libs/libXt ) >=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=BomberMan clone with network game support
-EAPI=6
-HOMEPAGE=https://www.bomberclone.de/
-IUSE=X
-KEYWORDS=~amd64 ~mips ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libsdl-1.1.0[video] media-libs/sdl-image[png] media-libs/sdl-mixer[mod] X? ( x11-libs/libXt )
-SLOT=0
-SRC_URI=mirror://sourceforge/bomberclone/bomberclone-0.11.8.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_=6c81d452b10c7a8827bb9b5ee1baa724
diff --git a/games-action/bomberclone/Manifest b/games-action/bomberclone/Manifest
new file mode 100644
index 000000000000..a3857946adc9
--- /dev/null
+++ b/games-action/bomberclone/Manifest
@@ -0,0 +1,5 @@
+AUX bomberclone-0.11.8-gcc52.patch 223 BLAKE2B bbce3a29a92c94a7e55e02514d1c3d197517d48e8660eabe11e13cf8dd75068a379f9e621f2b864640a7830df2d84b667b2b4356a7704e8403216774b2957f62 SHA512 a536ce4130f6dca9aaaeb79a4b4501edee1f52e020f333202f592477839409f4691ad95735cffd9f178e21c8ea8e885a908684f39e3477fd0d4137b9f8c49012
+AUX bomberclone-0.11.8-underlink.patch 434 BLAKE2B e0cf13a2d51d2597583877c8ab5add8cb76b1482f14fef7cf33c40573864f5c4c42ed346291635ec467c3f2d3baaf3a9673c9ede3f8a37d0a062d37064c71568 SHA512 78738422f3a83a9dbfa03976701bb136c4326b9bb6fca310968518c77c2a6440ba9291a568162773bf0f48691a8039e0c461972c0d8f9e40d4b54525a2db9840
+DIST bomberclone-0.11.8.tar.bz2 7966452 BLAKE2B ab090be622e891ae803529360d8bd753ac64b9d66b045d06946735a06e9203bf07a32dddd165f038ea484d584383ed760a5bf9e5d206638438ecb10583734225 SHA512 a5e52db43f7f508993231ec13bb2705f60e25cfc21d15c17d9b422c6fc948dc14cc8c4519acfac2e9b7b32a3072dc3a521fbf28b2150a86cfb4099ced72ab79b
+EBUILD bomberclone-0.11.8-r1.ebuild 1207 BLAKE2B 5d38c6b10c187793d213ad9f6d1532b90c00a3e183d35d5a692246a5973e6a15e72cffe272ab9e16800ee55bd06712501dda3e4d3d6f24b4944a2baed03a3ee8 SHA512 d0d5713d51c53183c191ef3bd1b23df1661a631b29bac38bee10d3cfc4e2b8ec343d7b7190ed137f13316cdff890610835f5a95eb7c7186bec0bbcc7636bd725
+MISC metadata.xml 334 BLAKE2B 5d34b252ed17c0a05782417336de98dfc5196ad854dd1705e286781eecee9d7e3081f46d1dc9014a39e8b236ca082a1c14af26e8ce4c26652e510644eda46b18 SHA512 0e309d5ada167696d234e2e2c44cb045607018801b9e03fab79bc2496c66f6e484364200320bf6124fb5fdd787d798de6052fa659862336d233cd6bd1eb8e5e9
diff --git a/games-action/bomberclone/bomberclone-0.11.8-r1.ebuild b/games-action/bomberclone/bomberclone-0.11.8-r1.ebuild
new file mode 100644
index 000000000000..31eb3fe53e87
--- /dev/null
+++ b/games-action/bomberclone/bomberclone-0.11.8-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils autotools
+
+DESCRIPTION="BomberMan clone with network game support"
+HOMEPAGE="https://www.bomberclone.de/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc64 ~x86"
+IUSE="X"
+
+DEPEND=">=media-libs/libsdl-1.1.0[video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[mod]
+	X? ( x11-libs/libXt )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc52.patch
+	"${FILESDIR}"/${P}-underlink.patch
+)
+
+src_prepare() {
+	default
+
+	ecvs_clean
+	mv configure.{in,ac} || die
+	sed -i -e 's/configure.in/configure.ac/' configure.ac || die
+	sed -i \
+		-e "s:/share/games/:share/:" \
+		configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with X x) \
+		--datadir=/usr/share
+	sed -i \
+		-e "/PACKAGE_DATA_DIR/ s:/usr/games/share/games/:/usr/share:" \
+		config.h || die
+}
+
+src_install() {
+	default
+
+	dobin src/${PN}
+
+	insinto /usr/share/${PN}
+	doins -r data/{gfx,maps,player,tileset,music}
+	find "${D}" -name "Makefile*" -exec rm -f '{}' +
+
+	doicon data/pixmaps/bomberclone.png
+	make_desktop_entry bomberclone Bomberclone
+}
diff --git a/games-action/bomberclone/files/bomberclone-0.11.8-gcc52.patch b/games-action/bomberclone/files/bomberclone-0.11.8-gcc52.patch
new file mode 100644
index 000000000000..fd77e1b7b1d6
--- /dev/null
+++ b/games-action/bomberclone/files/bomberclone-0.11.8-gcc52.patch
@@ -0,0 +1,11 @@
+--- a/src/single.c	2015-09-17 09:21:57.826930680 +0200
++++ b/src/single.c	2015-09-17 09:22:04.315824372 +0200
+@@ -476,7 +476,7 @@
+ };
+ 
+ 
+-inline int
++static inline int
+ ai_checknewpos (_point pos, int d)
+ {
+     _point m;
diff --git a/games-action/bomberclone/files/bomberclone-0.11.8-underlink.patch b/games-action/bomberclone/files/bomberclone-0.11.8-underlink.patch
new file mode 100644
index 000000000000..18c063b56db9
--- /dev/null
+++ b/games-action/bomberclone/files/bomberclone-0.11.8-underlink.patch
@@ -0,0 +1,20 @@
+--- a/configure.in	2011-06-18 18:23:48.633605738 +0200
++++ b/configure.in	2011-06-18 18:26:26.910628408 +0200
+@@ -33,7 +33,7 @@
+     )
+     
+     CFLAGS="$SDL_CFLAGS $CFLAGS"
+-    LIBS="$SDL_LIBS $LIBS"
++    LIBS="$SDL_LIBS $LIBS -lm"
+ 
+ 
+ dnl Checks for header files.
+@@ -84,7 +84,7 @@
+ 	CFLAGS="$CFLAGS -Wall"
+ 	AC_MSG_WARN(Disable Warning as Error Treatment)
+ else
+-	CFLAGS="$CFLAGS -Wall -Werror"
++	CFLAGS="$CFLAGS -Wall"
+ fi
+ 
+ 
diff --git a/games-action/bomberclone/metadata.xml b/games-action/bomberclone/metadata.xml
new file mode 100644
index 000000000000..3948f34d5eb8
--- /dev/null
+++ b/games-action/bomberclone/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">bomberclone</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/brutal-legend-20130615-r2 b/games-action/brutal-legend-20130615-r2
deleted file mode 100644
index 55e8288badf0..000000000000
--- a/games-action/brutal-legend-20130615-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst unpack
-DEPEND=app-arch/unzip >=sys-apps/sed-4
-DESCRIPTION=Unleash the power of Heavy Metal to reign down fire from the sky
-EAPI=6
-HOMEPAGE=https://www.ea.com/de/brutal-legend
-KEYWORDS=~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=amd64? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libxcb-1.9.1[abi_x86_32(-)] ) x86? ( sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libxcb )
-RESTRICT=bindist fetch splitdebug
-SLOT=0
-SRC_URI=BrutalLegend-Linux-2013-06-15-setup.bin
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2fef19a9a93041038b652f1e1e242d5e
diff --git a/games-action/brutal-legend/Manifest b/games-action/brutal-legend/Manifest
new file mode 100644
index 000000000000..dfab1cb7fd4f
--- /dev/null
+++ b/games-action/brutal-legend/Manifest
@@ -0,0 +1,3 @@
+DIST BrutalLegend-Linux-2013-06-15-setup.bin 8999631895 BLAKE2B 08b9db194412f61618f318e63b7e94fd789e84fa4c8ca695b59c6b3afc511945075cf0916a806a0af71dab093038bddda15667d75e4f100275a5ab676fb69123 SHA512 4099ed07cf78d62617eeac7de396aa01e4e9b0514861a1b0e8988f383b458281be0b3c84c33e2a2e85f80fbbacf8a4b381fc880b138af2e73a226a492cf9620a
+EBUILD brutal-legend-20130615-r2.ebuild 1761 BLAKE2B 4d4cf8d884b9f05c5e2f90e3ffc35b61ac93871e5d73a7e6c96a1e8520384d70034e75a3eb43f4c9d0eecfc66119053fd7ce2b6f4a66a4eb089743f4d5c8b5f9 SHA512 ab5598c321cd1d99b5a119c3bd3c60ad9700c9d2aeec36d388d326a467fc9dbe8271aabdca52c45fc7299e47ee3867aecad9a4bcdbc7a5011c8ddb1da8f19be6
+MISC metadata.xml 1120 BLAKE2B 075f54c7e50c918a907006c99ecb331d2cef8b848fad0313282126bd65248666f4dc74fde7c04c17216681aa281c80816633b2e92ff279b96cdaf3ddfa03232c SHA512 63b8868817c396e7708aaf65da803cd26eb1fb55fb5bdd9b0a9f92bcf0e5c6bb1a3488287949098b587991541eef6c595395fdfcecddff0b0d91a5686654a296
diff --git a/games-action/brutal-legend/brutal-legend-20130615-r2.ebuild b/games-action/brutal-legend/brutal-legend-20130615-r2.ebuild
new file mode 100644
index 000000000000..b9c0096e1456
--- /dev/null
+++ b/games-action/brutal-legend/brutal-legend-20130615-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: unbundle libsdl-2
+
+EAPI=6
+
+inherit eutils unpacker gnome2-utils
+
+TIMESTAMP=${PV:0:4}-${PV:4:2}-${PV:6:2}
+DESCRIPTION="Unleash the power of Heavy Metal to reign down fire from the sky"
+HOMEPAGE="https://www.ea.com/de/brutal-legend"
+SRC_URI="BrutalLegend-Linux-${TIMESTAMP}-setup.bin"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="bindist fetch splitdebug"
+
+MYGAMEDIR="/opt/${PN}"
+QA_PREBUILT="${MYGAMEDIR#/}/lib/*
+	${MYGAMEDIR#/}/Buddha.bin.x86"
+
+RDEPEND="
+	amd64? (
+		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+		>=virtual/glu-9.0-r1[abi_x86_32(-)]
+		>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+		>=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)]
+		>=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)]
+		>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+		>=x11-libs/libxcb-1.9.1[abi_x86_32(-)]
+	)
+	x86? (
+		sys-libs/zlib
+		virtual/glu
+		virtual/opengl
+		x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libXext
+		x11-libs/libxcb
+
+	)"
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/data
+
+pkg_nofetch() {
+	einfo "Please buy & download ${SRC_URI} from:"
+	einfo "  https://www.humblebundle.com/store"
+	einfo "and move it to ${DISTDIR}"
+}
+
+src_unpack() {
+	unpack_zip ${A}
+}
+
+src_install() {
+	newicon -s 256 Buddha.png ${PN}.png
+	make_wrapper ${PN} "./Buddha.bin.x86" "${MYGAMEDIR}" "${MYGAMEDIR}/lib"
+	make_desktop_entry ${PN}
+
+	dodir "${MYGAMEDIR}"
+	# this is over 9000!!!! ...eh, 8GB data
+	mv * "${D%/}/${MYGAMEDIR}" || die
+
+	fperms +x "${MYGAMEDIR}/Buddha.bin.x86"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-action/brutal-legend/metadata.xml b/games-action/brutal-legend/metadata.xml
new file mode 100644
index 000000000000..336d0fe7cf2a
--- /dev/null
+++ b/games-action/brutal-legend/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>
+	<longdescription lang="en">
+		Jack Black stars as Eddie Riggs, a roadie who’s sucked into a
+		mythical Age of Rock to fight evil, liberate an army of headbangers
+		from a life of oppression, find love, and discover his life’s
+		purpose. Heavy stuff until one realizes the universe of Brütal
+		Legend has sprung up from the mind of legendary game director Tim
+		Schafer.
+
+		Enter the world of Heavy Metal where mountains are made of
+		amplifiers, killer spiders spin guitar strings, druids want to
+		kill you, and Rock Legends roam the landscape.
+
+		Armed with a massive battle-axe, guitar, and his hot-rod, Eddie
+		will rip the faces off of demons. As Eddie, expect to crush skulls,
+		ravage the road in the Deuce, and unleash the power of Heavy Metal
+		to reign down fire from the sky — all to save humanity and become
+		a brutal legend.
+	</longdescription>
+</pkgmetadata>
diff --git a/games-action/btanks-0.9.8083 b/games-action/btanks-0.9.8083
deleted file mode 100644
index 301cdf3da966..000000000000
--- a/games-action/btanks-0.9.8083
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=dev-lang/lua-5.1:0 media-libs/libsdl[joystick,video] media-libs/libvorbis virtual/opengl dev-libs/expat media-libs/smpeg media-libs/sdl-image[jpeg,png] media-libs/sdl-gfx virtual/pkgconfig dev-util/scons[python_targets_python2_7]
-DESCRIPTION=Fast 2D tank arcade game with multiplayer and split-screen modes
-EAPI=5
-HOMEPAGE=http://btanks.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/lua-5.1:0 media-libs/libsdl[joystick,video] media-libs/libvorbis virtual/opengl dev-libs/expat media-libs/smpeg media-libs/sdl-image[jpeg,png] media-libs/sdl-gfx games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/btanks/btanks-0.9.8083.tar.bz2
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0be0face3b53169c6094bc47fb7f3e87
diff --git a/games-action/btanks/Manifest b/games-action/btanks/Manifest
new file mode 100644
index 000000000000..c437f173ab2c
--- /dev/null
+++ b/games-action/btanks/Manifest
@@ -0,0 +1,7 @@
+AUX btanks-0.9.8083-gcc46.patch 284 BLAKE2B 140b21a6ab7147e4ca2906324268270c9ce84421e76a42c27795965807d2023a91d358fabab4cdb7fde6bcc2bc8dbd8a048db3e7f966522ff14615b65ebe8399 SHA512 114ddc0b5bbe0125389dee88ed3eef27b3ec260edc6d50eb04a86f93157f3b2f613cd1ba58f915ca7f8255d2cdc5d341a0a70bf22d5210160dba7604fd90c83d
+AUX btanks-0.9.8083-gcc47.patch 5679 BLAKE2B 01b241dc102d17cffdc64e0967e4d072ecee814e3af2d8b8e12d52d1f4dbbf70fd2fb11858680a472c43336d5ea94a4029d8ddf6645543216755d9b9f5e89b76 SHA512 226869ef3031ddd4629bdd98880c85a4c0ff9f1619fd45372e60ccb2ebb50f0cd7b0ad60befa1859e475705d236144b1fd6e2286513cfbafaa0eba8c02918c9a
+AUX btanks-0.9.8083-gcc6.patch 712 BLAKE2B 4dabb62b61a5fdcde6c2c7e697e96561fb244d3330a38c2a989800869a309e38322ab0f54af1d33350b579181949465e2b78f51be6cd6490f9b57c8bdb8faf83 SHA512 1efbac6ed17aa9d3cfc1c6e85a94eb4f83b6d37ce81d2f6db8190ee8d70e09ba156e50861bbeb4a8a3867db33e6b2427e996e2d1421a2f2ef2216946a42fda8a
+AUX btanks-0.9.8083-scons-blows.patch 3146 BLAKE2B 37ec6f2304344bd4cc0bf8d116c0a960cc487bd44848ab651b192918da8220b93f60627c920d714b1cb322b37b8fcc5b883d806e7de8df5d9cef0919657227ec SHA512 de42054c599d808ca1fb3491346602b4055157973f8138a2c258e64fb596d87d67b24ffe30edffbab30fec4b0e71bc541cbd2fb7d7866d079595b54af763a856
+DIST btanks-0.9.8083.tar.bz2 28754069 BLAKE2B c187fe1deca9cdb5efcbb279215c369542e1e5e1ce93b0cecac077733a1b56359caa9dd49629305c566d8c86da1f05a6f4f61d1e41888c6c8076c9494fe5df03 SHA512 beef8f480e4c20c4f3d29aaa63fd52b370b89cceb8a7dda92f0d0fa5517969abf1fce6b0109782300f1b5bb92cf3c599677b168cd66f3b44c2d2dd1742ce0241
+EBUILD btanks-0.9.8083.ebuild 1313 BLAKE2B a4dfec8f35233ac4b0fde95e5179bb58856276945b4235be34c98b9e36bd4450fefd986e3b8897736b815a46bb9eff5a07baefc6900a8a4d1d28b698009f6cdb SHA512 c6bf4810dcea4dc9e8aeca58a3e8465576e00ca053d42b0213370241cd13f1a11390ffb2099e9dc0b1b08a38ccdb605f4504e7f5614dcdfc046af8ff589cbc94
+MISC metadata.xml 774 BLAKE2B a7c262e86fba1b67ed19dd1050885e8bf5b0dd9f9502a086d0e702e59317d34133a303f33dbfdd4fb41dd72d52a508393b6f3d0a798df51721d8b859e5e87b76 SHA512 f5b571ea902f863958151df0746dcbe2bd59f4c286e81ae6d4b3c2a298b1288379ec8e88e0ba59e06fdc4188e1dbd5fccb158e37707065556db241588420bcc2
diff --git a/games-action/btanks/btanks-0.9.8083.ebuild b/games-action/btanks/btanks-0.9.8083.ebuild
new file mode 100644
index 000000000000..6036ed703dea
--- /dev/null
+++ b/games-action/btanks/btanks-0.9.8083.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils scons-utils games
+
+DESCRIPTION="Fast 2D tank arcade game with multiplayer and split-screen modes"
+HOMEPAGE="http://btanks.sourceforge.net/"
+SRC_URI="mirror://sourceforge/btanks/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/lua-5.1:0
+	media-libs/libsdl[joystick,video]
+	media-libs/libvorbis
+	virtual/opengl
+	dev-libs/expat
+	media-libs/smpeg
+	media-libs/sdl-image[jpeg,png]
+	media-libs/sdl-gfx"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	rm -rf sdlx/gfx
+	epatch "${FILESDIR}"/${P}-scons-blows.patch \
+		"${FILESDIR}"/${P}-gcc46.patch \
+		"${FILESDIR}"/${P}-gcc47.patch \
+		"${FILESDIR}"/${P}-gcc6.patch
+}
+
+src_compile() {
+	escons \
+		prefix="${GAMES_PREFIX}" \
+		lib_dir="$(games_get_libdir)"/${PN} \
+		plugins_dir="$(games_get_libdir)"/${PN} \
+		resources_dir="${GAMES_DATADIR}"/${PN}
+}
+
+src_install() {
+	dogamesbin build/release/engine/btanks
+	newgamesbin build/release/editor/bted btanksed
+	exeinto "$(games_get_libdir)"/${PN}
+	doexe build/release/*/*.so
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r data
+	newicon engine/src/bt.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "Battle Tanks"
+	dodoc ChangeLog *.txt
+	prepgamesdirs
+}
diff --git a/games-action/btanks/files/btanks-0.9.8083-gcc46.patch b/games-action/btanks/files/btanks-0.9.8083-gcc46.patch
new file mode 100644
index 000000000000..367c33cc6f24
--- /dev/null
+++ b/games-action/btanks/files/btanks-0.9.8083-gcc46.patch
@@ -0,0 +1,10 @@
+--- engine/sl08/sl08.h.old	2011-04-19 17:20:34.055776870 +0200
++++ engine/sl08/sl08.h	2011-04-19 17:20:59.471398921 +0200
+@@ -22,6 +22,7 @@
+ /* DO NOT MODIFY THIS FILE: IT'S AUTOGENERATED */ 
+ 
+ #include <list>
++#include <cstddef>
+ 
+ #ifndef NULL
+ #define NULL            ((void*) 0)
diff --git a/games-action/btanks/files/btanks-0.9.8083-gcc47.patch b/games-action/btanks/files/btanks-0.9.8083-gcc47.patch
new file mode 100644
index 000000000000..13a4cf3723ae
--- /dev/null
+++ b/games-action/btanks/files/btanks-0.9.8083-gcc47.patch
@@ -0,0 +1,103 @@
+--- mrt/base_file.h.old	2012-10-08 10:16:43.941487723 +0200
++++ mrt/base_file.h	2012-10-08 10:18:55.788771445 +0200
+@@ -20,6 +20,7 @@
+ */
+ 
+ #include <string>
++#include <unistd.h>
+ #include "export_mrt.h"
+ 
+ namespace mrt {
+--- math/range_list.h.old	2012-10-08 09:49:34.283887937 +0200
++++ math/range_list.h	2012-10-08 09:50:36.258212096 +0200
+@@ -53,14 +53,14 @@
+ 			return;
+ 		}
+ 	
+-		typename parent_type::iterator i = lower_bound(value);
++		typename parent_type::iterator i = this->lower_bound(value);
+ 		if (i != parent_type::end()) {
+ 			if (i->first == value)
+ 				return;
+ 
+ 			if (value + 1 == i->first) {
+ 				T e = i->second;
+-				erase(i);
++				this->erase(i);
+ 				i = parent_type::insert(typename parent_type::value_type(value, e)).first; //expand beginning
+ 				i = pack_left(i);
+ 			}
+--- engine/sl08/sl08.h.old	2012-10-04 09:50:37.845681514 +0200
++++ engine/sl08/sl08.h	2012-10-08 09:58:32.873166723 +0200
+@@ -272,7 +272,7 @@
+ 			inline slot1(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
+ 
+ 			inline void assign(object_type *o, func_t f) { object = o; func = f; }
+-			inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
++			inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); }
+ 	
+ 			inline return_type operator() (arg1_type a1) const { 
+ 				return (object->*func) (a1) ;
+@@ -293,7 +293,7 @@
+ 			inline slot1 () : object(NULL), func(NULL) {}
+ 			inline slot1 (object_type *object, func_t func) : object(object), func(func) {}
+ 			inline void assign(object_type *o, func_t f) { object = o; func = f; }
+-			inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
++			inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); }
+ 	
+ 			inline void operator() (arg1_type a1) const { 
+ 				(object->*func) (a1); 
+@@ -447,7 +447,7 @@
+ 			inline slot2(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
+ 
+ 			inline void assign(object_type *o, func_t f) { object = o; func = f; }
+-			inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
++			inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); }
+ 	
+ 			inline return_type operator() (arg1_type a1, arg2_type a2) const { 
+ 				return (object->*func) (a1, a2) ;
+@@ -468,7 +468,7 @@
+ 			inline slot2 () : object(NULL), func(NULL) {}
+ 			inline slot2 (object_type *object, func_t func) : object(object), func(func) {}
+ 			inline void assign(object_type *o, func_t f) { object = o; func = f; }
+-			inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
++			inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); }
+ 	
+ 			inline void operator() (arg1_type a1, arg2_type a2) const { 
+ 				(object->*func) (a1, a2); 
+@@ -643,7 +643,7 @@
+ 			inline slot3 () : object(NULL), func(NULL) {}
+ 			inline slot3 (object_type *object, func_t func) : object(object), func(func) {}
+ 			inline void assign(object_type *o, func_t f) { object = o; func = f; }
+-			inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
++			inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); }
+ 	
+ 			inline void operator() (arg1_type a1, arg2_type a2, arg3_type a3) const { 
+ 				(object->*func) (a1, a2, a3); 
+@@ -797,7 +797,7 @@
+ 			inline slot4(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
+ 
+ 			inline void assign(object_type *o, func_t f) { object = o; func = f; }
+-			inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
++			inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); }
+ 	
+ 			inline return_type operator() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4) const { 
+ 				return (object->*func) (a1, a2, a3, a4) ;
+@@ -818,7 +818,7 @@
+ 			inline slot4 () : object(NULL), func(NULL) {}
+ 			inline slot4 (object_type *object, func_t func) : object(object), func(func) {}
+ 			inline void assign(object_type *o, func_t f) { object = o; func = f; }
+-			inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
++			inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); }
+ 	
+ 			inline void operator() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4) const { 
+ 				(object->*func) (a1, a2, a3, a4); 
+@@ -972,7 +972,7 @@
+ 			inline slot5(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
+ 
+ 			inline void assign(object_type *o, func_t f) { object = o; func = f; }
+-			inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
++			inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); }
+ 	
+ 			inline return_type operator() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4, arg5_type a5) const { 
+ 				return (object->*func) (a1, a2, a3, a4, a5) ;
diff --git a/games-action/btanks/files/btanks-0.9.8083-gcc6.patch b/games-action/btanks/files/btanks-0.9.8083-gcc6.patch
new file mode 100644
index 000000000000..5f11379d8056
--- /dev/null
+++ b/games-action/btanks/files/btanks-0.9.8083-gcc6.patch
@@ -0,0 +1,34 @@
+Bug: https://bugs.gentoo.org/609692
+
+--- a/mrt/timespy.cpp
++++ b/mrt/timespy.cpp
+@@ -43,7 +43,7 @@
+ 		throw_io(("gettimeofday"));
+ }
+ 
+-TimeSpy::~TimeSpy() {
++TimeSpy::~TimeSpy() DTOR_NOEXCEPT {
+ 	struct timeval now;
+ 	if (gettimeofday(&now, NULL) == -1)
+ 		throw_io(("gettimeofday"));
+--- a/mrt/timespy.h
++++ b/mrt/timespy.h
+@@ -37,11 +37,17 @@
+ #include "fmt.h"
+ #include "export_mrt.h"
+ 
++#if __cplusplus >= 201103L
++#define DTOR_NOEXCEPT noexcept(false)
++#else
++#define DTOR_NOEXCEPT
++#endif
++
+ namespace mrt {
+ class MRTAPI TimeSpy {
+ public: 
+ 	TimeSpy(const std::string &message);
+-	~TimeSpy();
++	~TimeSpy() DTOR_NOEXCEPT;
+ private: 
+ 	TimeSpy(const TimeSpy&);
+ 	const TimeSpy& operator=(const TimeSpy&);
diff --git a/games-action/btanks/files/btanks-0.9.8083-scons-blows.patch b/games-action/btanks/files/btanks-0.9.8083-scons-blows.patch
new file mode 100644
index 000000000000..47ce410f0bf8
--- /dev/null
+++ b/games-action/btanks/files/btanks-0.9.8083-scons-blows.patch
@@ -0,0 +1,93 @@
+--- mrt/export_base.h.old	2010-01-09 17:38:47.000000000 +0100
++++ mrt/export_base.h	2010-01-09 17:39:23.000000000 +0100
+@@ -1,7 +1,7 @@
+ #ifndef MRT_EXPORT_MACRO_H__
+ #define MRT_EXPORT_MACRO_H__
+ 
+-// Shared library support
++/* Shared library support */
+ #ifdef _WINDOWS
+ 
+ #	pragma warning(disable:4251)  /* needs to have dll-interface used by client */
+--- SConstruct.old	2010-01-09 17:43:36.000000000 +0100
++++ SConstruct	2010-01-09 17:45:25.000000000 +0100
+@@ -50,7 +50,7 @@
+ if os.environ.has_key('CC'):
+ 	env['CC'] = os.environ['CC']
+ if os.environ.has_key('CFLAGS'):
+-	env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
++	env['CFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
+ if os.environ.has_key('CXX'):
+ 	env['CXX'] = os.environ['CXX']
+ if os.environ.has_key('CXXFLAGS'):
+@@ -91,19 +91,9 @@
+ 		#env.Append(CPPDEFINES = ['NDEBUG']) 
+ 
+ else:
+-	if env['gcc_visibility']: 
+-		env.Append(CCFLAGS=['-fvisibility=hidden']);
+-		env.Append(CXXFLAGS=['-fvisibility-inlines-hidden', '-fvisibility=hidden']);
+-
+-	if debug:
+-		env.Append(CCFLAGS=['-ggdb', '-D_FORTIFY_SOURCE=2'])
+-		env.Append(CPPFLAGS=['-ggdb', '-D_FORTIFY_SOURCE=2'])
+-	else: 
+-		env.Append(CCFLAGS=['-O3'])
+-		env.Append(CPPFLAGS=['-O3'])
+ 		
+-	env.Append(CPPFLAGS=['-Wall', '-Wno-deprecated', '-pedantic', '-Wno-long-long', '-pipe', '-pthread'])
+-	env.Append(CCFLAGS=['-Wall', '-Wno-deprecated', '-pedantic', '-Wno-long-long', '-pipe', '-pthread'])
++	env.Append(CPPFLAGS=['-Wall', '-Wno-deprecated', '-pedantic', '-Wno-long-long', '-pthread'])
++	env.Append(CCFLAGS=['-Wall', '-Wno-deprecated', '-pedantic', '-Wno-long-long', '-pthread'])
+ 
+ 
+ conf_env = env.Clone()
+--- sdlx/SConscript.old	2010-01-09 17:46:05.000000000 +0100
++++ sdlx/SConscript	2010-01-09 17:46:55.000000000 +0100
+@@ -12,7 +12,7 @@
+ 
+ env.MergeFlags(sdl_cflags, sdl_libs)
+ 
+-libs = ['mrt', 'SDL', 'SDL_image']
++libs = ['mrt', 'SDL', 'SDL_image', 'SDL_gfx']
+ 
+ if sys.platform != "win32":
+ 	c_map_env= env.Clone()
+@@ -35,7 +35,6 @@
+ sdlx_sources = 	['cursor.cpp', 'sdl_ex.cpp', 'surface.cpp', 'system.cpp', 'joystick.cpp',
+ 	'thread.cpp', 'mutex.cpp', 'semaphore.cpp', 'color.cpp',
+ 	c_map, 'font.cpp', 'timer.cpp', 'module.cpp', 'file_rw.cpp', 
+-	'gfx/SDL_rotozoom.c', 
+ 	] #  'ttf.cpp', 
+ 
+ if sys.platform == 'win32': 
+--- sdlx/surface.cpp.old	2010-01-09 17:47:33.000000000 +0100
++++ sdlx/surface.cpp	2010-01-09 17:48:19.000000000 +0100
+@@ -425,7 +425,7 @@
+ 		throw_sdl(("SDL_SetColorKey"));
+ }
+ 
+-#include "gfx/SDL_rotozoom.h"
++#include <SDL_rotozoom.h>
+ 
+ void Surface::rotozoom(const sdlx::Surface &src, double angle, double zoom, bool smooth) {
+ 	if (src.isNull())
+--- sdlx/wrappers/glSDL.c.old	2010-01-09 17:48:50.000000000 +0100
++++ sdlx/wrappers/glSDL.c	2010-01-09 17:49:23.000000000 +0100
+@@ -11,8 +11,6 @@
+ 
+ #ifdef HAVE_OPENGL
+ 
+-//#define LEAK_TRACKING
+-
+ #define	DBG(x)		/*error messages, warnings*/
+ #define	DBG2(x)		/*texture allocation*/
+ #define	DBG3(x)		/*chopping/tiling*/
+@@ -951,7 +949,6 @@
+ 	}
+ 	gl_doublebuf = flags & SDL_DOUBLEBUF;
+ 	SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, gl_doublebuf);
+-	//SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, gl_doublebuf ? 1: 0);
+ 
+ 	scale = 1;
+ 
diff --git a/games-action/btanks/metadata.xml b/games-action/btanks/metadata.xml
new file mode 100644
index 000000000000..3574b919826a
--- /dev/null
+++ b/games-action/btanks/metadata.xml
@@ -0,0 +1,19 @@
+<?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">
+"Battle Tanks" is a funny battle on your desk, where you can choose one of three
+vehicles and eliminate your enemy using the whole arsenal of weapons. It has
+original cartoon-like graphics and cool music, it's fun and dynamic, it has
+several network modes for deathmatch and cooperative --- what else is needed to
+have fun with your friends? And all is packed and ready for you in "Battle
+Tanks".
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">btanks</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/bzflag-2.4.12 b/games-action/bzflag-2.4.12
deleted file mode 100644
index 7c37abe0a3f1..000000000000
--- a/games-action/bzflag-2.4.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=net-dns/c-ares >=net-misc/curl-7.15.0 sys-libs/ncurses:0 sys-libs/zlib !dedicated? ( media-libs/libsdl2[joystick,sound,video] virtual/glu virtual/opengl ) upnp? ( net-libs/miniupnpc ) 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=3D tank combat simulator game
-EAPI=6
-HOMEPAGE=https://www.bzflag.org/
-IUSE=dedicated upnp
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=net-dns/c-ares >=net-misc/curl-7.15.0 sys-libs/ncurses:0 sys-libs/zlib !dedicated? ( media-libs/libsdl2[joystick,sound,video] virtual/glu virtual/opengl ) upnp? ( net-libs/miniupnpc )
-SLOT=0
-SRC_URI=https://download.bzflag.org/bzflag/source/2.4.12/bzflag-2.4.12.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d3dd44f9e7ef25a238c0ba57c8cba35a
diff --git a/games-action/bzflag-2.4.14 b/games-action/bzflag-2.4.14
deleted file mode 100644
index 2200a1358aad..000000000000
--- a/games-action/bzflag-2.4.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=net-dns/c-ares >=net-misc/curl-7.15.0 sys-libs/ncurses:0 sys-libs/zlib !dedicated? ( media-libs/libsdl2[joystick,sound,video] virtual/glu virtual/opengl ) upnp? ( net-libs/miniupnpc ) 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=3D tank combat simulator game
-EAPI=6
-HOMEPAGE=https://www.bzflag.org/
-IUSE=dedicated upnp
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=net-dns/c-ares >=net-misc/curl-7.15.0 sys-libs/ncurses:0 sys-libs/zlib !dedicated? ( media-libs/libsdl2[joystick,sound,video] virtual/glu virtual/opengl ) upnp? ( net-libs/miniupnpc )
-SLOT=0
-SRC_URI=https://download.bzflag.org/bzflag/source/2.4.14/bzflag-2.4.14.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=40515afb4a34ed48721e2c96182beb2d
diff --git a/games-action/bzflag/Manifest b/games-action/bzflag/Manifest
new file mode 100644
index 000000000000..171c3ec8b98b
--- /dev/null
+++ b/games-action/bzflag/Manifest
@@ -0,0 +1,8 @@
+AUX bzflag-2.4.12-configure.patch 1113 BLAKE2B 922feac9bb501d21a0b5decbc3ae8aff96f8f5d6747868bc46e25145d8908a238dbfa406238f5d023e6c72bf4daf3bc5ff8d1dbeb384aef65d9cf034ea5ab26e SHA512 f3b6cc3422c3d4f0c4b39fa58e440f4a4cc1b2e0a56a4cad41eae3cbaf1d23e153b711246420143bb3132fa5e87538d814653131e0adf5cfe752b68ff4d82f05
+AUX bzflag-2.4.12-sdl2-cppflags.patch 437 BLAKE2B e7abcaf318a67f9252e32be1215b1e80edfbe0926bdf5533849f39b5366a3acaf19bec88428bb700a7be2fe2a63053006c69d1284e4050adbf71e0f34d853394 SHA512 eb59f965b716869168cc5dc40f8b4e55d27abe997e83f2434de5e54802b6b29410e43b3fb00e5ede7da56e631bb4e0daaabd3072b4577e14127e54aa2fab9428
+AUX bzflag-2.4.12-tinfo.patch 683 BLAKE2B 720a6b5aa97a474c2e37bb2927cd9680a55249e732f6f07cc894e114c745b15886325a2d56a7731d397580a1dedba6be1acb71086e146bb8af2f983c908b3bb0 SHA512 f670e7362fc81055d3996a16c213746fa55338aed0756c36565c856eae4e7f9ed8bed3b2b2955b659f83bf03d4b4249b53a7ea02e614409fe38dbcd215c805da
+DIST bzflag-2.4.12.tar.bz2 14042357 BLAKE2B eb18072f459549b18bf99fbe0b635aea24568ad39494082f443e8eb7a604db0341aa18f1d458a950b5344f34278599215b351bcad35bd88f33f01449b89489b8 SHA512 9b5fa6b7ab7eb13043242defcc86cbed083e98306b2f611932b48d6d833a37bbe2ab05a0a3d1a2c9b861bfbd834fc6e86783ba82d8a841527d0eedb06f3bde9f
+DIST bzflag-2.4.14.tar.bz2 14066129 BLAKE2B 7ec44bc9b7ccb644b98dac0b99770471b488b9e34b12a34e4fa76cdc22a4e7b14324915b83db76a69bb4b8ebd928018e69145aa6b87e48a379d37c23ce84c575 SHA512 c092a869813bd300e5eff5bf17ea46708b566a9e4f56cb6c4ccd92346ab1e87c8837efb8295d3b4485cd8d4de5b0d92b079c70390d06a481cfee693d393aca21
+EBUILD bzflag-2.4.12.ebuild 1214 BLAKE2B 479c7b6f185e2ef76eb1a609e7a95920e1a2a026892af6f1800a9a68bdfbf065488a1a54d0a3fe84afc2bc05131a9396906386c0d57d8c5cd6f9644bbff8456c SHA512 2d4737201bad699ebde6b2e9175d10672016e3c895bb3e9d9c4a125752935796ae25a11011e1aae1af1aca9ff3b229a319d0847cb4d1bd6735dd56b4acfd3b18
+EBUILD bzflag-2.4.14.ebuild 1346 BLAKE2B 35937e3904679a061ac44200876fff419b64c83f6ae14bd8a22438d898e4f425df83a90e8d835d73a721a8bf619d7f7462989ecca92175fbc387c425427098bd SHA512 cb27d9b6ed99c028f4caf462b43cd6a92e67c6a7a5bfe1818969e8a4c4c7004e5e3a7214bb0d155cc4eff43c7bf93f25dc7a3ebca096fd7dc6b9095fa9a24627
+MISC metadata.xml 329 BLAKE2B 045c2426f059b10e768ba5764ec7c26ad95f98ca1754358df18faa4ec58d3b26c02d905222c877c6d508eeb47f3ae3f22dd319b1d719f169e91ab31d824ab30d SHA512 4f9e157aef5067fb6a97fd7d7e68f758a280a37b8093c7291b45ada10169ca8c79ee0e7770fdbcc4d2de517b7bf05f1e3585585c72c1fdf7692d4e568f5d8301
diff --git a/games-action/bzflag/bzflag-2.4.12.ebuild b/games-action/bzflag/bzflag-2.4.12.ebuild
new file mode 100644
index 000000000000..0f6e8a8722e5
--- /dev/null
+++ b/games-action/bzflag/bzflag-2.4.12.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="3D tank combat simulator game"
+HOMEPAGE="https://www.bzflag.org/"
+SRC_URI="https://download.bzflag.org/bzflag/source/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated upnp"
+
+RDEPEND="
+	net-dns/c-ares
+	>=net-misc/curl-7.15.0
+	sys-libs/ncurses:0
+	sys-libs/zlib
+	!dedicated? (
+		media-libs/libsdl2[joystick,sound,video]
+		virtual/glu
+		virtual/opengl )
+	upnp? ( net-libs/miniupnpc )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-configure.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use dedicated ; then
+		ewarn
+		ewarn "You are building a server-only copy of BZFlag"
+		ewarn
+		myconf="--disable-client --without-SDL"
+	fi
+
+	econf \
+		$(use_enable upnp UPnP) \
+		${myconf}
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog DEVINFO PORTING README README.Linux" \
+		default
+
+	if ! use dedicated ; then
+		newicon data/bzflag-48x48.png ${PN}.png
+		make_desktop_entry ${PN} "BZFlag"
+	fi
+
+	prune_libtool_files --modules
+}
diff --git a/games-action/bzflag/bzflag-2.4.14.ebuild b/games-action/bzflag/bzflag-2.4.14.ebuild
new file mode 100644
index 000000000000..290ef54d300a
--- /dev/null
+++ b/games-action/bzflag/bzflag-2.4.14.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="3D tank combat simulator game"
+HOMEPAGE="https://www.bzflag.org/"
+SRC_URI="https://download.bzflag.org/bzflag/source/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated upnp"
+
+RDEPEND="
+	net-dns/c-ares
+	>=net-misc/curl-7.15.0
+	sys-libs/ncurses:0
+	sys-libs/zlib
+	!dedicated? (
+		media-libs/libsdl2[joystick,sound,video]
+		virtual/glu
+		virtual/opengl )
+	upnp? ( net-libs/miniupnpc )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.12-configure.patch
+	"${FILESDIR}"/${PN}-2.4.12-tinfo.patch
+	"${FILESDIR}"/${PN}-2.4.12-sdl2-cppflags.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use dedicated ; then
+		ewarn
+		ewarn "You are building a server-only copy of BZFlag"
+		ewarn
+		myconf="--disable-client --without-SDL"
+	else
+		myconf="--with-SDL=2"
+	fi
+
+	econf \
+		$(use_enable upnp UPnP) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		${myconf}
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog DEVINFO PORTING README README.Linux" \
+		default
+
+	if ! use dedicated ; then
+		newicon data/bzflag-48x48.png ${PN}.png
+		make_desktop_entry ${PN} "BZFlag"
+	fi
+
+	prune_libtool_files --modules
+}
diff --git a/games-action/bzflag/files/bzflag-2.4.12-configure.patch b/games-action/bzflag/files/bzflag-2.4.12-configure.patch
new file mode 100644
index 000000000000..e1c546f37a34
--- /dev/null
+++ b/games-action/bzflag/files/bzflag-2.4.12-configure.patch
@@ -0,0 +1,36 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -215,7 +215,7 @@
+ AC_SUBST(AR)
+ AC_SUBST(AR_FLAGS)
+ 
+-AC_PATH_PROG(CCACHE, ccache)
++AC_PATH_PROG(CCACHE, ccachex)
+ if test "$CCACHE" ; then
+     CC="ccache $CC"
+     CXX="ccache $CXX"
+@@ -747,13 +747,13 @@
+ #
+ # the GCC version is known to be at least 4.3 because it has C++0x support
+ # possible future warnings: -Wconversion (1894) -Wfloat-equal (317)
+-FLAGS="-Wall -Wextra -Wcast-qual -Wredundant-decls -Wshadow -Wundef -pedantic"
++FLAGSx="-Wall -Wextra -Wcast-qual -Wredundant-decls -Wshadow -Wundef -pedantic"
+ case $host_os in
+      linux*)
+ 	AC_DEFINE(HALF_RATE_AUDIO, 1, [Half rate Audio])
+ 	CONF_CFLAGS="$CONF_CFLAGS $FLAGS"
+ 	CONF_CXXFLAGS="$CONF_CXXFLAGS $FLAGS"
+-	case $host_vendor in
++	case $host_vendorx in
+ 	     pc)
+ 	       if expr `$CC -dumpversion` \>= "3.4" > /dev/null ; then
+ 		 FLAGS=-mtune
+@@ -836,7 +836,7 @@
+     CXXFLAGS="$user_CXXFLAGS"
+     AC_DEFINE(DEBUG, 1, [Debugging enabled])
+ else
+-    if test "$GCC" = yes ; then
++    if test "$GCC" = yesx ; then
+ 	case "`$CC --version 2>&1`" in
+ 	    *LLVM*)
+ 		# Apple LLVM falsely claims to be GCC
diff --git a/games-action/bzflag/files/bzflag-2.4.12-sdl2-cppflags.patch b/games-action/bzflag/files/bzflag-2.4.12-sdl2-cppflags.patch
new file mode 100644
index 000000000000..f7f6dfd7f14c
--- /dev/null
+++ b/games-action/bzflag/files/bzflag-2.4.12-sdl2-cppflags.patch
@@ -0,0 +1,19 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -236,6 +236,7 @@
+ AC_PROG_CC
+ AC_PROG_LN_S
+ AC_CHECK_PROG(AR, ar, ar)
++PKG_PROG_PKG_CONFIG
+ AC_SUBST(AR)
+ AC_SUBST(AR_FLAGS)
+ 
+@@ -716,6 +717,8 @@
+ fi
+ if test "x$with_SDL" = "x2"; then
+     AC_DEFINE(HAVE_SDL2, 1, [Using SDL2])
++    PKG_CHECK_MODULES(sdl2, sdl2,
++        [CONF_CPPFLAGS="$CONF_CPPFLAGS $sdl2_CFLAGS"],[])
+ fi
+ 
+ AM_CONDITIONAL(HAVE_SDL, test x$with_SDL = x1 -o x$with_SDL = x2)
diff --git a/games-action/bzflag/files/bzflag-2.4.12-tinfo.patch b/games-action/bzflag/files/bzflag-2.4.12-tinfo.patch
new file mode 100644
index 000000000000..aa43980b9b67
--- /dev/null
+++ b/games-action/bzflag/files/bzflag-2.4.12-tinfo.patch
@@ -0,0 +1,15 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -125,7 +125,11 @@
+ BZ_CONFIGURE_STAGE([arguments], [1 of 9])
+ 
+ # provide a with-curses option, test for curses
+-MP_WITH_CURSES
++PKG_CHECK_MODULES(ncurses, ncurses,
++	[CURSES_LIB="$ncurses_LIBS"]
++	AC_DEFINE(HAVE_NCURSES_H, , [Use the header file ncurses.h]),
++	AC_MSG_ERROR([Could not find ncurses]))
++AC_SUBST(CURSES_LIB)
+ 
+ # check for SDL option (enabled by default now)
+ AC_ARG_WITH(SDL, AS_HELP_STRING([--without-SDL | --with-SDL={1,2}],[Do not use Simple DirectMedia Layer or force using a specific version (by default tries 2, then 1, then resorts to native platform code if available]), sdl_version="$withval", sdl_version="detect")
diff --git a/games-action/bzflag/metadata.xml b/games-action/bzflag/metadata.xml
new file mode 100644
index 000000000000..66090a0275ee
--- /dev/null
+++ b/games-action/bzflag/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">bzflag</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/chickens-0.2.4-r1 b/games-action/chickens-0.2.4-r1
deleted file mode 100644
index 657282871ab5..000000000000
--- a/games-action/chickens-0.2.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=<media-libs/allegro-5
-DESCRIPTION=Target chickens with rockets and shotguns. Funny
-EAPI=6
-HOMEPAGE=http://www.chickensforlinux.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=<media-libs/allegro-5
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=http://www.chickensforlinux.com/ChickensForLinux-Linux-0.2.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=00eceea5dc4c67cb320a8d766e1869b4
diff --git a/games-action/chickens/Manifest b/games-action/chickens/Manifest
new file mode 100644
index 000000000000..6480162e0a70
--- /dev/null
+++ b/games-action/chickens/Manifest
@@ -0,0 +1,3 @@
+DIST ChickensForLinux-Linux-0.2.4.tar.gz 1455207 BLAKE2B a1388d49ee6291df0cb7f015928fbb2db4e86d611f1beb5513e9152b431991aeb9f0198a371c8391e1b69e2333916809f44000be7d132588f1af265fffd91186 SHA512 d94a70818a766fde443e86184418990d789246c239da01c6c1a2c9e7d8c1d6bb52ed28efbb4ecdb6b079c585e1ba18bc8efcd4f1cbf718ff39757831265c7a78
+EBUILD chickens-0.2.4-r1.ebuild 1468 BLAKE2B 21d52836d7ede8680a5d0ea3530bd69bba922fe523f60ad511ba58026701063be64d354f34304f5ad4c4ac2946e1313c21b8e9dd26d1286bed1f4724da845762 SHA512 20715e652c0c8554eb6a443f689e0074f2f964ad327c16a8aab466aac5e969b22c8c6745101c1eec338a0daa8969a9996a6fbf276019aa68d08900d06d7add55
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/chickens/chickens-0.2.4-r1.ebuild b/games-action/chickens/chickens-0.2.4-r1.ebuild
new file mode 100644
index 000000000000..258e87e5303c
--- /dev/null
+++ b/games-action/chickens/chickens-0.2.4-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils user
+
+MY_P="ChickensForLinux-Linux-${PV}"
+DESCRIPTION="Target chickens with rockets and shotguns. Funny"
+HOMEPAGE="http://www.chickensforlinux.com/"
+SRC_URI="http://www.chickensforlinux.com/${MY_P}.tar.gz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="mirror bindist"
+
+DEPEND="<media-libs/allegro-5"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup(){
+	enewgroup gamestat 36
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s:HighScores:/var/games//${PN}/HighScores:" \
+		-e "s:....\(.\)\(_\)\(.*.4x0\)\(.\):M\4\2\x42\x6Fn\1s\2:" \
+		highscore.cpp HighScores || die
+	sed -i \
+		-e "s:options.cfg:/etc/${PN}/options.cfg:" \
+		-e "s:\"sound/:\"/usr/share/${PN}/sound/:" \
+		-e "s:\"dat/:\"/usr/share/${PN}/dat/:" \
+		main.cpp README || die
+	sed -i \
+		-e '/^CPPFLAGS/d' \
+		-e 's:g++:\\$(CXX) \\$(CXXFLAGS) \\$(LDFLAGS):' \
+		configure || die
+}
+
+src_configure() {
+	# econf (sometimes) fails, see https://bugs.gentoo.org/588544
+	bash ./configure || die
+}
+
+src_install() {
+	dobin ${PN}
+	insinto /usr/share/${PN}
+	doins -r dat sound
+	dodoc AUTHOR README
+	insinto /var/games/${PN}
+	doins HighScores
+	insinto /etc/${PN}
+	doins options.cfg
+	make_desktop_entry ${PN} Chickens
+
+	fowners root:gamestat /usr/bin/${PN} /var/games/${PN}/HighScores
+	fperms 2755 /usr/bin/${PN}
+	fperms 660  /var/games/${PN}/HighScores
+}
diff --git a/games-action/chickens/metadata.xml b/games-action/chickens/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-action/chickens/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-action/chromium-bsu-0.9.15.1-r1 b/games-action/chromium-bsu-0.9.15.1-r1
deleted file mode 100644
index 6b3ef0ff8500..000000000000
--- a/games-action/chromium-bsu-0.9.15.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst
-DEPEND=media-fonts/dejavu media-libs/quesoglc media-libs/glpng virtual/opengl virtual/glu x11-libs/libXmu mixer? ( media-libs/sdl-mixer ) !mixer? ( media-libs/freealut media-libs/openal ) nls? ( virtual/libintl ) sdl? ( media-libs/libsdl[X] media-libs/sdl-image[png] ) !sdl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) >=sys-apps/sed-4
-DESCRIPTION=Chromium B.S.U. - an arcade game
-EAPI=6
-HOMEPAGE=http://chromium-bsu.sourceforge.net/
-IUSE=mixer nls +sdl
-KEYWORDS=~amd64 ~x86
-LICENSE=Clarified-Artistic
-RDEPEND=media-fonts/dejavu media-libs/quesoglc media-libs/glpng virtual/opengl virtual/glu x11-libs/libXmu mixer? ( media-libs/sdl-mixer ) !mixer? ( media-libs/freealut media-libs/openal ) nls? ( virtual/libintl ) sdl? ( media-libs/libsdl[X] media-libs/sdl-image[png] ) !sdl? ( media-libs/freeglut )
-SLOT=0
-SRC_URI=mirror://sourceforge/chromium-bsu/chromium-bsu-0.9.15.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f755a7ef9763727bdd52c3febfe32626
diff --git a/games-action/chromium-bsu/Manifest b/games-action/chromium-bsu/Manifest
new file mode 100644
index 000000000000..86afce6bde06
--- /dev/null
+++ b/games-action/chromium-bsu/Manifest
@@ -0,0 +1,4 @@
+AUX chromium-bsu-0.9.15.1-gcc6.patch 4183 BLAKE2B 33c6bbb1f3a21c62b6f693714ad215c7561637bbb9bc45172a89e8254a04b3346452ac2b7fa4e0b6c2460a05ad68d78c5011910f71bdf28ba4483d66465780c1 SHA512 dd6c35feba99ae8654840cbe433961f054412bc40b0221aa0bc0709723dd4f0ed91b35f82ed74f652ce2f9848093c861f79cefecae147a84be1705a16e1cdc2e
+DIST chromium-bsu-0.9.15.1.tar.gz 1689634 BLAKE2B c834cb5b962031a1b8d187df9a58104896a53188907e5c3e7776aa129be3ff9287c6750af3f3df2a447b86f9f67f7dc5db21dca7d6f6cdaf2a8faad619723c75 SHA512 1e62161a10a5eb4246c0e04a13e7d8b521218aa709cced5bed1440055bb91bbcff45a85e544bdc6854f1ed727ea15257d34a3c988c65818bfbfe8004ac76c104
+EBUILD chromium-bsu-0.9.15.1-r1.ebuild 1284 BLAKE2B 2f309bb8591a46e5dc25baa840116cd1c3630f3bef3b4f4652b619847ac9744a087e345aa6daf5d6ce3f478ee24bcb5d80d4f6b381a31fee31feb9ad92f13196 SHA512 4e348982b7778d2b0e0aba25f1747fd820c66432850d4fc134dc98ce2d114b094ee0508d2e4bfce72970712961201dacf7cf8217ab9ad4ef23eaa9c4c0174d4b
+MISC metadata.xml 484 BLAKE2B ad101206b1434b2030e28ad1c2c756c81b37613b9231f1354bb9ab329d7ecde001db56042963280333df042b8ef8c19e433737269169fe27a337cdcfc59d218c SHA512 7695d9d521352e0147da5357117ddf30ca854c2bd78948f79a6dbf5151ca482302f56a9ecc7e0384ca11d54b95623309011392bfa61753f0a17966f7bedda86f
diff --git a/games-action/chromium-bsu/chromium-bsu-0.9.15.1-r1.ebuild b/games-action/chromium-bsu/chromium-bsu-0.9.15.1-r1.ebuild
new file mode 100644
index 000000000000..578f593bf3df
--- /dev/null
+++ b/games-action/chromium-bsu/chromium-bsu-0.9.15.1-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils
+
+DESCRIPTION="Chromium B.S.U. - an arcade game"
+HOMEPAGE="http://chromium-bsu.sourceforge.net/"
+SRC_URI="mirror://sourceforge/chromium-bsu/${P}.tar.gz"
+
+LICENSE="Clarified-Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mixer nls +sdl"
+
+RDEPEND="
+	media-fonts/dejavu
+	media-libs/quesoglc
+	media-libs/glpng
+	virtual/opengl
+	virtual/glu
+	x11-libs/libXmu
+	mixer? ( media-libs/sdl-mixer )
+	!mixer? (
+		media-libs/freealut
+		media-libs/openal
+	)
+	nls? ( virtual/libintl )
+	sdl? (
+		media-libs/libsdl[X]
+		media-libs/sdl-image[png]
+	)
+	!sdl? ( media-libs/freeglut )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+PATCHES=( "${FILESDIR}"/${P}-gcc6.patch )
+
+src_configure() {
+	econf \
+		--disable-ftgl \
+		--enable-glc \
+		$(use_enable mixer sdlmixer) \
+		$(use_enable !mixer openal) \
+		$(use_enable nls) \
+		$(use_enable sdl) \
+		$(use_enable sdl sdlimage) \
+		$(use_enable !sdl glut)
+}
+
+src_install() {
+	default
+	dodoc data/doc/*.htm
+
+	newicon -s 64 misc/${PN}.png ${PN}.png
+	domenu misc/chromium-bsu.desktop
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-action/chromium-bsu/files/chromium-bsu-0.9.15.1-gcc6.patch b/games-action/chromium-bsu/files/chromium-bsu-0.9.15.1-gcc6.patch
new file mode 100644
index 000000000000..5d3b919adf3f
--- /dev/null
+++ b/games-action/chromium-bsu/files/chromium-bsu-0.9.15.1-gcc6.patch
@@ -0,0 +1,100 @@
+--- a/src/AudioOpenAL.cpp
++++ b/src/AudioOpenAL.cpp
+@@ -711,7 +711,7 @@
+ 	if(!file)
+ 	{
+ 		char	configOldFilename[256];
+-		sprintf(configOldFilename, "%s/.chromium-music"CONFIG_EXT, homeDir);
++		sprintf(configOldFilename, "%s/.chromium-music" CONFIG_EXT, homeDir);
+ 		alterPathForPlatform(configOldFilename);
+ 		rename(configOldFilename,configFilename);
+ 		file = fopen(configFilename, "r");
+--- a/src/Config.cpp
++++ b/src/Config.cpp
+@@ -161,7 +161,7 @@
+ 	if(!homeDir)
+ 		homeDir = "./";
+ 
+-	sprintf(configFilename, "%s/.chromium"CONFIG_EXT, homeDir);
++	sprintf(configFilename, "%s/.chromium" CONFIG_EXT, homeDir);
+ 	alterPathForPlatform(configFilename);
+ 	return configFilename;
+ }
+--- a/src/define.h
++++ b/src/define.h
+@@ -34,14 +34,14 @@
+ 
+ #ifdef macintosh
+ #define CONFIG_EXT			".cfg"
+-#define CONFIG_FILE			PACKAGE".cfg"
+-#define CONFIG_SCORE_FILE	PACKAGE"-score.cfg"
+-#define CONFIG_MUSIC_FILE	PACKAGE"-music.cfg"
++#define CONFIG_FILE			PACKAGE ".cfg"
++#define CONFIG_SCORE_FILE	PACKAGE "-score.cfg"
++#define CONFIG_MUSIC_FILE	PACKAGE "-music.cfg"
+ #else
+ #define CONFIG_EXT
+-#define CONFIG_FILE			"."PACKAGE
+-#define CONFIG_SCORE_FILE	"."PACKAGE"-score"
+-#define CONFIG_MUSIC_FILE	"."PACKAGE"-music"
++#define CONFIG_FILE			"." PACKAGE
++#define CONFIG_SCORE_FILE	"." PACKAGE "-score"
++#define CONFIG_MUSIC_FILE	"." PACKAGE "-music"
+ #endif //macintosh
+ 
+ #define HI_SCORE_HIST 5
+--- a/src/HiScore.cpp
++++ b/src/HiScore.cpp
+@@ -187,7 +187,7 @@
+ 	const char *homeDir = getenv("HOME");
+ 	if(!homeDir)
+ 		homeDir = "./";
+-	sprintf(configFilename, "%s/.chromium-score"CONFIG_EXT, homeDir);
++	sprintf(configFilename, "%s/.chromium-score" CONFIG_EXT, homeDir);
+ 	alterPathForPlatform(configFilename);
+ 	return configFilename;
+ }
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -198,7 +198,7 @@
+ 
+ 	if(getenv("HOME") != NULL && ((strlen(getenv("HOME"))+strlen(filename)) < 239) )
+ 	{
+-		sprintf(buffer, "%s/."PACKAGE"-data/%s", getenv("HOME"), filename);
++		sprintf(buffer, "%s/." PACKAGE "-data/%s", getenv("HOME"), filename);
+ 		if(stat(buffer, &sbuf) == 0) return buffer;
+ 	}
+ 
+--- a/src/MainSDL_Event.cpp
++++ b/src/MainSDL_Event.cpp
+@@ -19,6 +19,7 @@
+ #include <cstdlib>
+ #include <cstdio>
+ #include <cstring>
++#include <cmath>
+ 
+ #include "Config.h"
+ 
+@@ -417,14 +418,14 @@
+ #else
+ 		Uint8 *keystate = SDL_GetKeyState(NULL);
+ #endif
+-		if( keystate[SDLK_LEFT]  || keystate[SDLK_KP4] ) key_speed_x -= 2.0 + abs(key_speed_x)*0.4;
+-		if( keystate[SDLK_RIGHT] || keystate[SDLK_KP6] ) key_speed_x += 2.0 + abs(key_speed_x)*0.4;
+-		if( keystate[SDLK_UP]    || keystate[SDLK_KP8] ) key_speed_y -= 2.0 + abs(key_speed_y)*0.4;
+-		if( keystate[SDLK_DOWN]  || keystate[SDLK_KP2] ) key_speed_y += 2.0 + abs(key_speed_y)*0.4;
+-		if( keystate[SDLK_KP7] ){ key_speed_x -= 2.0 + abs(key_speed_x)*0.4; key_speed_y -= 2.0 + abs(key_speed_y)*0.4; }
+-		if( keystate[SDLK_KP9] ){ key_speed_x += 2.0 + abs(key_speed_x)*0.4; key_speed_y -= 2.0 + abs(key_speed_y)*0.4; }
+-		if( keystate[SDLK_KP3] ){ key_speed_x += 2.0 + abs(key_speed_x)*0.4; key_speed_y += 2.0 + abs(key_speed_y)*0.4; }
+-		if( keystate[SDLK_KP1] ){ key_speed_x -= 2.0 + abs(key_speed_x)*0.4; key_speed_y += 2.0 + abs(key_speed_y)*0.4; }
++		if( keystate[SDLK_LEFT]  || keystate[SDLK_KP4] ) key_speed_x -= 2.0 + abs((int)key_speed_x)*0.4;
++		if( keystate[SDLK_RIGHT] || keystate[SDLK_KP6] ) key_speed_x += 2.0 + abs((int)key_speed_x)*0.4;
++		if( keystate[SDLK_UP]    || keystate[SDLK_KP8] ) key_speed_y -= 2.0 + abs((int)key_speed_y)*0.4;
++		if( keystate[SDLK_DOWN]  || keystate[SDLK_KP2] ) key_speed_y += 2.0 + abs((int)key_speed_y)*0.4;
++		if( keystate[SDLK_KP7] ){ key_speed_x -= 2.0 + abs((int)key_speed_x)*0.4; key_speed_y -= 2.0 + abs((int)key_speed_y)*0.4; }
++		if( keystate[SDLK_KP9] ){ key_speed_x += 2.0 + abs((int)key_speed_x)*0.4; key_speed_y -= 2.0 + abs((int)key_speed_y)*0.4; }
++		if( keystate[SDLK_KP3] ){ key_speed_x += 2.0 + abs((int)key_speed_x)*0.4; key_speed_y += 2.0 + abs((int)key_speed_y)*0.4; }
++		if( keystate[SDLK_KP1] ){ key_speed_x -= 2.0 + abs((int)key_speed_x)*0.4; key_speed_y += 2.0 + abs((int)key_speed_y)*0.4; }
+ 		//float s = (1.0-game->speedAdj)+(game->speedAdj*0.7);
+ 		float s = 0.7;
+ 		key_speed_x *= s;
diff --git a/games-action/chromium-bsu/metadata.xml b/games-action/chromium-bsu/metadata.xml
new file mode 100644
index 000000000000..a8145e90454d
--- /dev/null
+++ b/games-action/chromium-bsu/metadata.xml
@@ -0,0 +1,17 @@
+<?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="mixer">
+		Enables <pkg>media-libs/sdl-mixer</pkg> sound backend instead of
+		<pkg>media-libs/openal</pkg> one.
+	</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">chromium-bsu</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/clanbomber-2.1.1-r1 b/games-action/clanbomber-2.1.1-r1
deleted file mode 100644
index 0017277944f1..000000000000
--- a/games-action/clanbomber-2.1.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-libs/boost media-fonts/dejavu media-libs/libsdl[sound,joystick,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer media-libs/sdl-ttf 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=Bomberman-like multiplayer game
-EAPI=6
-HOMEPAGE=https://savannah.nongnu.org/projects/clanbomber/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/boost media-fonts/dejavu media-libs/libsdl[sound,joystick,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer media-libs/sdl-ttf
-SLOT=0
-SRC_URI=http://download.savannah.gnu.org/releases/clanbomber/clanbomber-2.1.1.tar.lzma
-_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_=22aa112aa9f3abf526e58fa5ae21a22e
diff --git a/games-action/clanbomber/Manifest b/games-action/clanbomber/Manifest
new file mode 100644
index 000000000000..388e17d48c63
--- /dev/null
+++ b/games-action/clanbomber/Manifest
@@ -0,0 +1,6 @@
+AUX clanbomber-2.1.1-automake112.patch 373 BLAKE2B 1ab75583820147ea9e61293b46ab7e8e4eadd2c8b2ff2438543878d980f1f15fc6ec61c8c2d6b2f8aff48dcbe39088a25066896060147cc37744a0d8cc343a01 SHA512 65b4ea53e098daea63f5cf5cb5da98bfa712e16f8346a38f06389329b80c3180f68da1b08bec422b712bd79e5911480094f6a6f446673022e10846b4995aa755
+AUX clanbomber-2.1.1-boost150.patch 1140 BLAKE2B 9e398fb8a6c40df8f6e5d604c34c9ed268143d096a1f90dccc8942bdd5492b59ce6ced3c1a26fa5ab72ed8ee5bf2aefd590ced38166cb1a6726e34c6ab8a8d7f SHA512 cdd0b5ca38d6cee6f4e8afbccca956fb0dd8d2b84aef714cd2c8499a6b53e62016c51d58d389adcde95dd06b08b7b749428677d414ef792123d04e6cc8493806
+AUX clanbomber-2.1.1-gcc6.patch 408 BLAKE2B a8e542f845cb1ff06ea9fc3ae19346a61a7ff0a450719fd95b9ee532ad0fe6f1434626553f5ac9a815e91ae798cad891f7ef37ac9a2848ff814eaa0f8b4360c6 SHA512 8f51ea2b0b9dc7323710b7a5e91b3622ac728f035c19d7e5c01731d87f0cce3f5c6d54905f42811f46b0a68e899aad0ad23d099039b9fa329c7245e27e2fadfd
+DIST clanbomber-2.1.1.tar.lzma 2070392 BLAKE2B ba6e183a5469a30949a4441f9f40df8f87271c741110ddcc17f584f0f59564a041e5b74214b53ccddbae7df46ffc573a866e1089db0a782e7c73dda1c2d4ac6f SHA512 b2d634c20d60cd7c080263a8ebea931bd623342c32380494c0076441021719135ca7861e0467e0c71cd46bb4ed85d3ce364dbfa2c8399eaf058f62f294a21c32
+EBUILD clanbomber-2.1.1-r1.ebuild 1140 BLAKE2B 8523e57f860752d2383428752795daec71a2726c1901ab1d92251a659d35f513cee8afbcc51d9497fc939e6b6c4078815c5eec0f5a94e9aeea5eb51d1272ee3b SHA512 ddb8593ec63f1ba04dfd954e5bd394685ad28c5ca91483415a8a82e27316527845521ceb078b5d8914eb2f0b59f284b7024f5334fca8b60520ad37637164da01
+MISC metadata.xml 755 BLAKE2B 6d1d3b5426723f6b8f98d4fb59a2bc098323f34bb1b0ad99b7296debdd3e216075fc4ee8b38c29ff78e1cdb0dfb877d205f14a97ba66348a3dde51afa5255245 SHA512 b46a19a5ba071d38cc18c23019d0077893ac8f1303aba357343afe129ad4f7f6e3b194f765485945712cef788291c93a105ba59c9e94dc507937d9f78f28b387
diff --git a/games-action/clanbomber/clanbomber-2.1.1-r1.ebuild b/games-action/clanbomber/clanbomber-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..b6f4ba83831f
--- /dev/null
+++ b/games-action/clanbomber/clanbomber-2.1.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils
+
+DESCRIPTION="Bomberman-like multiplayer game"
+HOMEPAGE="https://savannah.nongnu.org/projects/clanbomber/"
+SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.lzma"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost
+	media-fonts/dejavu
+	media-libs/libsdl[sound,joystick,video]
+	media-libs/sdl-gfx
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer
+	media-libs/sdl-ttf"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog ChangeLog.hg IDEAS NEWS QUOTES README TODO )
+
+PATCHES=(
+		"${FILESDIR}"/${P}-automake112.patch
+		"${FILESDIR}"/${P}-boost150.patch
+		"${FILESDIR}"/${P}-gcc6.patch
+)
+
+src_prepare() {
+	default
+	sed -i -e 's/menuentry//' src/Makefile.am || die
+	eautoreconf
+}
+
+src_install() {
+	default
+	newicon src/pics/cup2.png ${PN}.png
+	make_desktop_entry ${PN}2 ClanBomber2
+	rm -f "${D}/usr/share/${PN}/fonts/DejaVuSans-Bold.ttf" || die
+	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf \
+		/usr/share/${PN}/fonts/DejaVuSans-Bold.ttf
+}
diff --git a/games-action/clanbomber/files/clanbomber-2.1.1-automake112.patch b/games-action/clanbomber/files/clanbomber-2.1.1-automake112.patch
new file mode 100644
index 000000000000..5fce5be335aa
--- /dev/null
+++ b/games-action/clanbomber/files/clanbomber-2.1.1-automake112.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac	2012-11-15 09:35:24.682199511 +0100
++++ b/configure.ac	2012-11-15 09:36:02.367839076 +0100
+@@ -2,7 +2,7 @@
+ AC_PREREQ([2.63])
+ AC_INIT([ClanBomber], [2.1.1], [rsl@members.fsf.org])
+ #AM_INIT_AUTOMAKE([-Wall -Werror foreign])#foreign is for NEWS COPYING ETC
+-AM_INIT_AUTOMAKE([dist-lzma -Wall -Werror])
++AM_INIT_AUTOMAKE([-Wall])
+ 
+ 
+ #CXXFLAGS="-O6 -g3"
diff --git a/games-action/clanbomber/files/clanbomber-2.1.1-boost150.patch b/games-action/clanbomber/files/clanbomber-2.1.1-boost150.patch
new file mode 100644
index 000000000000..f3e67666a22d
--- /dev/null
+++ b/games-action/clanbomber/files/clanbomber-2.1.1-boost150.patch
@@ -0,0 +1,31 @@
+--- a/src/MapEntry.cpp	2012-11-15 10:55:40.123259605 +0100
++++ b/src/MapEntry.cpp	2012-11-15 10:57:35.217379211 +0100
+@@ -50,7 +50,7 @@
+   enabled = true;
+ 
+   // extract map name
+-  map_name = filename.stem();
++  map_name = filename.stem().string();
+ 
+   // is the file writable?
+   if (access(path / filename, W_OK) == 0) {
+--- a/src/Map.cpp	2012-11-15 10:52:56.884424228 +0100
++++ b/src/Map.cpp	2012-11-15 10:54:16.334992079 +0100
+@@ -116,7 +116,7 @@
+     for (boost::filesystem::directory_iterator dir_iter(path);
+          dir_iter != end_iter; dir_iter++) {
+       if (dir_iter->path().extension() == ".map") {
+-        map_list.push_back(new MapEntry(path, dir_iter->filename()));
++        map_list.push_back(new MapEntry(path, dir_iter->path().filename()));
+       }
+     }
+   }
+@@ -126,7 +126,7 @@
+     for (boost::filesystem::directory_iterator dir_iter(path);
+          dir_iter != end_iter; dir_iter++) {
+       if (dir_iter->path().extension() == ".map") {
+-        map_list.push_back(new MapEntry(path, dir_iter->filename()));
++        map_list.push_back(new MapEntry(path, dir_iter->path().filename()));
+       }
+     }
+   }
diff --git a/games-action/clanbomber/files/clanbomber-2.1.1-gcc6.patch b/games-action/clanbomber/files/clanbomber-2.1.1-gcc6.patch
new file mode 100644
index 000000000000..714e9de85fa2
--- /dev/null
+++ b/games-action/clanbomber/files/clanbomber-2.1.1-gcc6.patch
@@ -0,0 +1,19 @@
+--- a/src/Credits.h
++++ b/src/Credits.h
+@@ -47,7 +47,7 @@
+ 	int   speed;
+ 	bool  stopped;
+  private:
+-	static const float yoffset_start = 50;
++	static const float yoffset_start;
+ 	static const int normal_speed = 40;
+ 	static const int text_height = 40;
+ 	
+--- a/src/Credits.cpp
++++ b/src/Credits.cpp
+@@ -273,3 +273,5 @@
+       (*draw_list_iter)->show();
+     }
+ }
++
++const float Credits::yoffset_start = 50;
diff --git a/games-action/clanbomber/metadata.xml b/games-action/clanbomber/metadata.xml
new file mode 100644
index 000000000000..f8deca247ba9
--- /dev/null
+++ b/games-action/clanbomber/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="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+<longdescription>
+ClanBomber is a free (GPL) Bomberman-like multiplayer game that uses ClanLib, a free multi 
+platform C++ game SDK. First "ClanBomber" was only a working title for a small game started in 
+September 1998, that has only been started to learn how to use ClanLib. But the ClanBomber 
+project has grown into a real game. It is fully playable and features Computer controlled 
+bombers, however, it is recommended to play ClanBomber with friends (3-8 players are really fun).
+</longdescription>
+</pkgmetadata>
diff --git a/games-action/cs2d-1002-r1 b/games-action/cs2d-1002-r1
deleted file mode 100644
index e8ae02d1cf42..000000000000
--- a/games-action/cs2d-1002-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=app-arch/unzip
-DESCRIPTION=A freeware clone of Counter-Strike with some added features in gameplay
-EAPI=6
-HOMEPAGE=http://www.cs2d.com/
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=freedist
-RDEPEND=x86? ( media-libs/freetype:2 media-libs/openal x11-libs/libX11 x11-libs/libXxf86vm virtual/opengl ) amd64? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~maksbotan/cs2d/cs2d_1002_linux.zip https://dev.gentoo.org/~maksbotan/cs2d/cs2d_1002_win.zip https://dev.gentoo.org/~maksbotan/cs2d/cs2d.png
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=85d1ddf3d1a70f3e1ee027fc95bc35f9
diff --git a/games-action/cs2d/Manifest b/games-action/cs2d/Manifest
new file mode 100644
index 000000000000..41ae8cfad422
--- /dev/null
+++ b/games-action/cs2d/Manifest
@@ -0,0 +1,5 @@
+DIST cs2d.png 479 BLAKE2B 4992cf21a29b4ce95d263eaf4bc057540baaeac86fe9e084064ebb8a77686663f14c415ff38d03114ccb3c5c62f5bed7f36b24f0fb38389aafbef3939e44fabf SHA512 e8894771deedb8e5018d0be986a53920e8f37fe10485df499e4c271d14014701cf345858ba7904ab6db4178f2cb2244684620a6c5ceacba26f62a29c3bd0463b
+DIST cs2d_1002_linux.zip 1035579 BLAKE2B 6e1553922be2d59a9e188cc6c162c18b38e8dbe32dc7bd959c36a818f28335f311c8a8555fb40f9b9b28306e6b07e4bfdd92e3524d6bf8b355930a4358a7fc4c SHA512 f385a6558f40a01324884a8b765f0fcb8dddcfb59bf983be110234a16cf937ba8c0089dce269fd1cec6b51a380810c5e1676e14a95112364b59cbb07e290a8bc
+DIST cs2d_1002_win.zip 11039631 BLAKE2B 102649ab1d30c683cf9bab03b156f786c00d1f46961112bb8eefda43476ed7a1ea7d466458a1780b257bfd2d9bd9425de30fcf36ce3da69d4f802c267d8a1ffb SHA512 b387cd7172fa35c6e66d7457cd4ca457d5bab795944fa9b53a0879301d72d6e5f2c76b760c119df32ae4e69f158e6c593bf921a83e54e25f79cb4e3d2650965c
+EBUILD cs2d-1002-r1.ebuild 1680 BLAKE2B b0829ec1523732ab1bf2bd258aaf2beb568e65d7237b3bba63dcffffbb3aac834b631a5f717b6846e4cfabca1444476e248aa9baf475f03f7d9c71cf7f8c4b35 SHA512 041340c4407f46f2a8b7d459d943ff7d67e45496347a2a2e0b7dafdb94b7cfda726bd8564c65e980f3d93a760cadb98eb16492caa157613ea83de346849749d0
+MISC metadata.xml 595 BLAKE2B 46c3d8cbd752024a0cbc5a5ad35116aacb6af3b6960d29af349791ca86500b202f6e52a61f8e7119f40e40648b136a44eaa981b57a41e2da7e9ba519894891c2 SHA512 3b8ec9065990d0d53c7c04d7926b30c1632cee411a6165a7a8ee408111d49d21d06069b3e1e1bbfee021a24018171c65101907151a95bca5abef4dc29a54fb1c
diff --git a/games-action/cs2d/cs2d-1002-r1.ebuild b/games-action/cs2d/cs2d-1002-r1.ebuild
new file mode 100644
index 000000000000..46b4c3b59d80
--- /dev/null
+++ b/games-action/cs2d/cs2d-1002-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="A freeware clone of Counter-Strike with some added features in gameplay"
+HOMEPAGE="http://www.cs2d.com/"
+SRC_URI="https://dev.gentoo.org/~maksbotan/cs2d/cs2d_${PV}_linux.zip
+	https://dev.gentoo.org/~maksbotan/cs2d/cs2d_${PV}_win.zip
+	https://dev.gentoo.org/~maksbotan/cs2d/cs2d.png"
+LICENSE="freedist"
+
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND="
+	x86? (
+		media-libs/freetype:2
+		media-libs/openal
+		x11-libs/libX11
+		x11-libs/libXxf86vm
+		virtual/opengl
+	)
+	amd64? (
+		>=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)]
+		>=media-libs/openal-1.15.1[abi_x86_32(-)]
+		>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+		>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+	)"
+
+QA_PREBUILT="opt/cs2d/CounterStrike2D"
+
+S=${WORKDIR}
+
+src_prepare() {
+	default
+
+	# removing windows files
+	rm -f *.exe *.bat || die
+
+	# OpenAL is default sound driver
+	sed -i \
+		-e 's:^sounddriver.*$:sounddriver OpenAL Default:' \
+		sys/config.cfg || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r .
+
+	# avoid file collision with untracked file
+	rm -f "${ED%/}/opt/${PN}/sys/core/started.cfg"
+
+	make_desktop_entry CounterStrike2D "Counter Strike 2D"
+	make_desktop_entry "CounterStrike2D -fullscreen -24bit" "Counter Strike 2D - FULLSCREEN"
+	make_wrapper CounterStrike2D ./CounterStrike2D /opt/${PN} /opt/${PN}
+	doicon "${DISTDIR}"/${PN}.png
+
+	# fixing permissions
+	fperms -R g+w /opt/${PN}/maps
+	fperms -R g+w /opt/${PN}/screens
+	fperms -R g+w /opt/${PN}/sys
+	fperms o+x /opt/${PN}/CounterStrike2D
+}
diff --git a/games-action/cs2d/metadata.xml b/games-action/cs2d/metadata.xml
new file mode 100644
index 000000000000..31a8e7784a81
--- /dev/null
+++ b/games-action/cs2d/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>maksbotan@gentoo.org</email>
+		<name>Maxim Koltsov</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>oleg@kaa.org.ua</email>
+		<name>Oleg Kravchenko</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/games-action/d1x-rebirth-0.58.1 b/games-action/d1x-rebirth-0.58.1
deleted file mode 100644
index ba0d8d674e5e..000000000000
--- a/games-action/d1x-rebirth-0.58.1
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-games/physfs[hog,zip] media-libs/libsdl[X,sound,joystick,opengl?,video] cdinstall? ( !games-action/descent1-demodata ) music? ( media-libs/sdl-mixer[timidity] ) opengl? ( virtual/opengl virtual/glu ) app-arch/unzip dev-util/scons[python_targets_python2_7]
-DESCRIPTION=Descent Rebirth - enhanced Descent 1 engine
-EAPI=5
-HOMEPAGE=https://www.dxx-rebirth.com/
-IUSE=cdinstall debug demo ipv6 l10n_de +music opengl opl3-musicpack sc55-musicpack cdinstall
-KEYWORDS=~amd64 ~x86
-LICENSE=D1X GPL-2 public-domain
-PDEPEND=demo? ( games-action/descent1-demodata )
-PROPERTIES=cdinstall? ( interactive )
-RDEPEND=dev-games/physfs[hog,zip] media-libs/libsdl[X,sound,joystick,opengl?,video] cdinstall? ( !games-action/descent1-demodata ) music? ( media-libs/sdl-mixer[timidity] ) opengl? ( virtual/opengl virtual/glu ) games-misc/games-envd
-REQUIRED_USE=?? ( cdinstall demo ) ?? ( opl3-musicpack sc55-musicpack ) opl3-musicpack? ( music ) sc55-musicpack? ( music )
-SLOT=0
-SRC_URI=https://www.dxx-rebirth.com/download/dxx/d1x-rebirth_v0.58.1-src.tar.gz https://www.dxx-rebirth.com/download/dxx/res/d1xrdata.zip https://www.dxx-rebirth.com/download/dxx/res/dxx-rebirth_icons.zip opl3-musicpack? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-opl3-music.zip ) sc55-musicpack? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-sc55-music.zip ) cdinstall? ( https://www.dxx-rebirth.com/download/dxx/res/d1datapt.zip ) l10n_de? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-briefings-ger.zip )
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0309c659cee14354d79ae02e80b43a4a
diff --git a/games-action/d1x-rebirth/Manifest b/games-action/d1x-rebirth/Manifest
new file mode 100644
index 000000000000..aa2c13c8adcb
--- /dev/null
+++ b/games-action/d1x-rebirth/Manifest
@@ -0,0 +1,10 @@
+AUX d1x-rebirth-0.58.1-flags.patch 447 BLAKE2B 1a20e8de3e6fd064238b6c44716cdf72b3e4133baf86c57e6ca4898eb5e0ec5a268a6de36b8a972168750ac1b73f953b55d648716aaac3cb3984911e0c574b06 SHA512 2d3406a61deea19ea741fdf39963013342e88d69323a1929592fd2f909985ad2e63d2677863a50be7882cce30fec082cbcd5d114f326b638c16331ac3dabcae8
+DIST d1datapt.zip 439942 BLAKE2B dbe0c0fc4aeb25d7ea01296e78680a5388aed622452ee7d7ce163eb1e60741216e998730a30da0404963561a78ffb28e12d154efa3654c40cfca49d2a3451b5d SHA512 41b7777ef679ed0904a5e64534ef0b145e9c49546c9449a569cf0ac75ada3d6095a603136211f939daaf97aa7f09511db85416fefea7ce1447cfe8df7a16b555
+DIST d1x-rebirth_v0.58.1-src.tar.gz 1247599 BLAKE2B 813b971e695a5376129991424ec349b448bf9fda21dfc04f2665a7aa344ecefbd48d7c44cd6e474d3ff8648e13aa9c09498034c19d447f526ac4cfbf8afecefb SHA512 d1bdaeee07c5ac34b2e6839fea1449344d206f76f1eb2ba3fd4fa7cbe6acd82c2e8d7140b2d6297add3d5e8fb7fe4ca2b1c22c900def94603c218f6660644c80
+DIST d1xr-briefings-ger.zip 16798 BLAKE2B f5e1f4f91cb3464b3d356fab1e3993700cc19f3f2db8682f5194e59aa5d2623efa427db4135c3595534e5dac0f2589b53aac7df3610501b759407e1ead342458 SHA512 956a3ef1fe7379b71d5f651fdcb1f26b786883a35193a0a22009204e885a12fceb3a69c6accbeb2bd20be65afe087d23532d7ef3439edd97cc8904968bf519e3
+DIST d1xr-opl3-music.zip 81503503 BLAKE2B b560597e0f08139109a6dc4ee7996c05010561686029d1fd754375278b8a11e6df0f6106c797d524e92d4998683d6e1e07b6cfc982ea3ff167a0b9ca92ba0dc2 SHA512 4ac82c4bc2ddb02e2941746921443e38b698c6e54cfcab317fc9108f84ada7b868ec2ee3c70b28c1dfe9f41e2aadab4124c8daa65a409905cba5d674f0aab8a8
+DIST d1xr-sc55-music.zip 72803408 BLAKE2B eb52491f5c43e9f04aea5715cffc0a47d029dda0b8e5ae1a79ec36122a17c01e3b2a731f369d72fe0e069e1188bdaf03f82d0845b574d76b6798be33481e3b84 SHA512 3cdce5b6535e28397b3216cc9ca05cccf7194349c62d64c54300f02f39248b98598d170599e5c61b6900d780e4917f905c3c31eb814fbb8429221c804cbd8bf9
+DIST d1xrdata.zip 1364601 BLAKE2B b17f76cf9a0f967d4462275d48113ca0161df09053c98eb6031766ce424632b5fb190386f852887242d1e709fc18ec5fad93490a610b754f047b9482c2e9de95 SHA512 9ca4ac459367476250bef6eb7f3fccdb4070f4ed5c00dad318c1d63e7bcb2c61ef8cb8233f3f2156f46ed4ba57232033f2b456078f883a96ab7ebd5b5df84c59
+DIST dxx-rebirth_icons.zip 137392 BLAKE2B 34b975cd0b1ada2d7ba6f8b39bf2e4b753462b5876be18dbc2fb6e19767814b61af850533f575bb12446e4f6b42d1bd1960f19cc1af26e0d96a18cb7f0571a99 SHA512 d13edc1897cf047a1fa0bf23c2b64334f095d9a28255fb500f7f0ffb6122559eb10fea372b02c52c71ac467d8276ece4c7dff4069585ab74dfa9ebb8bda2deb2
+EBUILD d1x-rebirth-0.58.1.ebuild 3093 BLAKE2B 45ee7144b1435ef8d5b1251dac04138cb9778debb8495fe37dcd080c3b969bec4622bedcd1f64d878dde385b3455fb0f8e2073d152d358dce7b30503327d6cab SHA512 339f353c55c02b9b9a0a029cab990f24316ffa1829a79be3238bbf537ed7fecc74105982cc47a6588b25320ca0c82dedf6910e41ac051e6ceeea1d117e6b9174
+MISC metadata.xml 1149 BLAKE2B 9407595ea1b3fc4113809e994be96dd9ee91a119855b10cc50d9d639baa7201c587f71c6274c3c7fdcedc3cd68e0618b8360acb7d9a1c18102e90d8cc819711a SHA512 e7624d4b93a002ec39ada63ae54e23f1ce46c2bdf8a1c4b15a2ffe2a71558379ebf357aea2a66a470419e191ff751fa0c6db0a0ce1bd8964d5d05ba1ae87edb0
diff --git a/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild b/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild
new file mode 100644
index 000000000000..04e178288320
--- /dev/null
+++ b/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CDROM_OPTIONAL="yes"
+inherit eutils cdrom scons-utils games
+
+DV=1
+MY_P=${PN}_v${PV}-src
+DESCRIPTION="Descent Rebirth - enhanced Descent ${DV} engine"
+HOMEPAGE="https://www.dxx-rebirth.com/"
+SRC_URI="https://www.dxx-rebirth.com/download/dxx/${MY_P}.tar.gz
+	https://www.dxx-rebirth.com/download/dxx/res/d1xrdata.zip
+	https://www.dxx-rebirth.com/download/dxx/res/dxx-rebirth_icons.zip
+	opl3-musicpack? ( https://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-opl3-music.zip )
+	sc55-musicpack? ( https://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-sc55-music.zip )
+	cdinstall? ( https://www.dxx-rebirth.com/download/dxx/res/d1datapt.zip )
+	l10n_de? ( https://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-briefings-ger.zip )"
+
+LICENSE="D1X GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdinstall debug demo ipv6 l10n_de +music opengl opl3-musicpack sc55-musicpack"
+REQUIRED_USE="?? ( cdinstall demo )
+	?? ( opl3-musicpack sc55-musicpack )
+	opl3-musicpack? ( music )
+	sc55-musicpack? ( music )"
+
+RDEPEND="dev-games/physfs[hog,zip]
+	media-libs/libsdl[X,sound,joystick,opengl?,video]
+	cdinstall? ( !games-action/descent1-demodata )
+	music? (
+		media-libs/sdl-mixer[timidity]
+	)
+	opengl? (
+		virtual/opengl
+		virtual/glu
+	)"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+PDEPEND="demo? ( games-action/descent1-demodata )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz dxx-rebirth_icons.zip
+	if use cdinstall ; then
+		unpack d1datapt.zip
+		cdrom_get_cds descent/descent.hog
+		mkdir "${S}"/Data
+		cp \
+			${CDROM_ROOT}/descent/descent.{hog,pig} \
+			${CDROM_ROOT}/descent/chaos.{hog,msn} \
+			"${S}"/Data || die
+	fi
+}
+
+src_prepare() {
+	if use cdinstall ; then
+		cd Data
+		patch -p0 < "${WORKDIR}"/d1datapt/descent.hog.diff descent.hog
+		patch -p0 < "${WORKDIR}"/d1datapt/descent.pig.diff descent.pig
+	fi
+	epatch "${FILESDIR}"/${P}-flags.patch
+}
+
+src_compile() {
+	escons \
+		verbosebuild=1 \
+		sharepath="${GAMES_DATADIR}/d${DV}x" \
+		$(use_scons ipv6) \
+		$(use_scons music sdlmixer) \
+		$(use_scons debug) \
+		$(use_scons opengl) || die
+}
+
+src_install() {
+	dodoc {CHANGELOG,INSTALL,README,RELEASE-NOTES}.txt
+
+	insinto "${GAMES_DATADIR}/d${DV}x"
+	doins "${DISTDIR}"/d1xrdata.zip
+	# None of the following zip files need to be extracted.
+	use l10n_de && doins "${DISTDIR}"/d${DV}xr-briefings-ger.zip
+	use opl3-musicpack && doins "${DISTDIR}"/d${DV}xr-opl3-music.zip
+	use sc55-musicpack && doins "${DISTDIR}"/d${DV}xr-sc55-music.zip
+
+	if use cdinstall ; then
+		doins Data/descent.{hog,pig}
+		insinto "${GAMES_DATADIR}"/d${DV}x/missions
+		doins Data/chaos.{hog,msn}
+	fi
+	doicon "${WORKDIR}/${PN}.xpm"
+
+	dogamesbin d${DV}x-rebirth
+	make_desktop_entry d${DV}x-rebirth "Descent ${DV} Rebirth"
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	if ! use cdinstall ; then
+		echo
+		elog "To play the full game enable USE=\"cdinstall\" or manually "
+		elog "copy the files to ${GAMES_DATADIR}/d${DV}x."
+		elog "See /usr/share/doc/${PF}/INSTALL.txt for details."
+		echo
+	fi
+}
diff --git a/games-action/d1x-rebirth/files/d1x-rebirth-0.58.1-flags.patch b/games-action/d1x-rebirth/files/d1x-rebirth-0.58.1-flags.patch
new file mode 100644
index 000000000000..51723ffb137b
--- /dev/null
+++ b/games-action/d1x-rebirth/files/d1x-rebirth-0.58.1-flags.patch
@@ -0,0 +1,11 @@
+diff -ru d1x-rebirth_v0.58.1-src.orig/SConstruct d1x-rebirth_v0.58.1-src/SConstruct
+--- d1x-rebirth_v0.58.1-src.orig/SConstruct	2013-08-03 08:13:39.000000000 -0400
++++ d1x-rebirth_v0.58.1-src/SConstruct	2015-01-27 02:38:03.847800615 -0500
+@@ -218,7 +218,6 @@
+ 			env.Append(CPPFLAGS = ['-g'])
+ 		else:
+ 			env.Append(CPPDEFINES = ['NDEBUG', 'RELEASE'])
+-			env.Append(CPPFLAGS = ['-O2'])
+ 
+ 		# profiler?
+ 		if (self.user_settings.profiler == 1):
diff --git a/games-action/d1x-rebirth/metadata.xml b/games-action/d1x-rebirth/metadata.xml
new file mode 100644
index 000000000000..23d592266dfb
--- /dev/null
+++ b/games-action/d1x-rebirth/metadata.xml
@@ -0,0 +1,21 @@
+<?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>
+		Descent 1 is a classic first-person shooter released in 1995 by Interplay
+		and Parallax.  It was one of the first games with true 3-dimensional
+		graphics, movement, and light sourcing.  D1X-Rebirth is a modification of the
+		Descent 1 source that was released by Parallax and is based on the D1X source.
+	</longdescription>
+	<use>
+		<flag name="demo">Use the demo data instead of the full game</flag>
+		<flag name="music">Support for ingame music</flag>
+		<flag name="l10n_de">Provides German translations for the game's briefings, robot descriptions, and outro of the original campaign</flag>
+		<flag name="opl3-musicpack">Include alternate version of the game's music, recorded with the Yamaha YMF262 OPL3 soundchip</flag>
+		<flag name="sc55-musicpack">Include alternate version of the game's music, recorded with the Roland Sound Canvas SC-55 MIDI module</flag>
+	</use>
+</pkgmetadata>
diff --git a/games-action/deathchase3d-0.9-r1 b/games-action/deathchase3d-0.9-r1
deleted file mode 100644
index df14a9995869..000000000000
--- a/games-action/deathchase3d-0.9-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=media-libs/libsdl[video]
-DESCRIPTION=A remake of the Sinclair Spectrum game of the same name
-EAPI=6
-HOMEPAGE=http://www.autismuk.freeserve.co.uk/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[video]
-SLOT=0
-SRC_URI=http://www.autismuk.freeserve.co.uk/deathchase3d-0.9.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_=a2d78e9f6b046710ef0960c1a8ceb074
diff --git a/games-action/deathchase3d/Manifest b/games-action/deathchase3d/Manifest
new file mode 100644
index 000000000000..63ccc7554699
--- /dev/null
+++ b/games-action/deathchase3d/Manifest
@@ -0,0 +1,4 @@
+AUX deathchase3d-0.9-underlink.patch 362 BLAKE2B 37e7f99a739a3882b9b68354850f840b61cbb1b771f6075fbbc129b2cb80b416ddcc795226427401a6e5e9372523f69290ada2a700dc8834f82feb9528f46004 SHA512 4a255f6bb158baff2651815a83fa22b01a1ec21b91a1990db14c26ad30c1ef62441556bce3cdaea39edcac9c4fba30f95957ccccf2e4b1a110d23993c0606f58
+DIST deathchase3d-0.9.tar.gz 587888 BLAKE2B 1d2afba5687a7f4d3044ad65ddaaa7eae59e1d517c50e4d10c87db1f292eebe56ab9b83d2093de9d0fe646c9f25919a4af36183eb1511076bfe7d4ef78643602 SHA512 21e382ec389ff64e11562f9715ab53662d6f2150af7f7f940311acd0abad76da3904f4bae849479a04af99b0001fefe77509755975636de81767a9faa4487d90
+EBUILD deathchase3d-0.9-r1.ebuild 545 BLAKE2B 9684db3eaec05c75daf8d954233b04cb072e4615d1996701e4a7dc316ea6653a9f75ae1f2ff6e09de5aa325502849a9cf132b08ad0c2466031ec9f3fa22e9053 SHA512 7822d908a3fe0c69178e5bf6f7e7ddd44fba236da4f850dc88122281e61deec0e866aa469f8c74e488c34e4ec68c5bba7608e6f59be83741494031476d85622e
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/deathchase3d/deathchase3d-0.9-r1.ebuild b/games-action/deathchase3d/deathchase3d-0.9-r1.ebuild
new file mode 100644
index 000000000000..f063ab7c3d10
--- /dev/null
+++ b/games-action/deathchase3d/deathchase3d-0.9-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="A remake of the Sinclair Spectrum game of the same name"
+HOMEPAGE="http://www.autismuk.freeserve.co.uk/"
+SRC_URI="http://www.autismuk.freeserve.co.uk/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl[video]"
+RDEPEND=${DEPEND}
+
+PATCHES=(
+	"${FILESDIR}/${P}-underlink.patch"
+)
+
+src_install() {
+	dobin "${PN}/${PN}"
+	dodoc README ${PN}/docs/en/index.html
+}
diff --git a/games-action/deathchase3d/files/deathchase3d-0.9-underlink.patch b/games-action/deathchase3d/files/deathchase3d-0.9-underlink.patch
new file mode 100644
index 000000000000..ac20e1ff3800
--- /dev/null
+++ b/games-action/deathchase3d/files/deathchase3d-0.9-underlink.patch
@@ -0,0 +1,11 @@
+--- a/deathchase3d/Makefile.in	2011-06-13 09:22:44.140587725 +0200
++++ b/deathchase3d/Makefile.in	2011-06-13 09:22:49.932942379 +0200
+@@ -248,7 +248,7 @@
+ bin_PROGRAMS = deathchase3d
+ 
+ deathchase3d_SOURCES = treedraw.c tree.c sprites.c objects.c level.c io.c globals.c font.c draw.c main.c 
+-deathchase3d_LDADD = 
++deathchase3d_LDADD = -lm
+ 
+ SUBDIRS = docs 
+ 
diff --git a/games-action/deathchase3d/metadata.xml b/games-action/deathchase3d/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-action/deathchase3d/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-action/descent1-data-1.4a b/games-action/descent1-data-1.4a
deleted file mode 100644
index b637d11faea3..000000000000
--- a/games-action/descent1-data-1.4a
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install nofetch postinst prepare unpack
-DEPEND=cdinstall? ( app-arch/unzip ) !cdinstall? ( app-arch/innoextract )
-DESCRIPTION=Data files for Descent 1
-EAPI=6
-HOMEPAGE=http://www.interplay.com/games/descent.php
-IUSE=doc cdinstall
-KEYWORDS=~amd64 ~x86
-LICENSE=descent-data
-PROPERTIES=cdinstall? ( interactive )
-RDEPEND=!games-action/descent1-demodata
-RESTRICT=bindist !cdinstall? ( fetch )
-SLOT=0
-SRC_URI=cdinstall? ( http://www.dxx-rebirth.com/download/dxx/misc/descent-game-content-10to14a-patch.zip ) !cdinstall? ( setup_descent_2.1.0.8.exe )
-_eclasses_=cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f6f5ea6af60958e7a1be2b3f94808d81
diff --git a/games-action/descent1-data/Manifest b/games-action/descent1-data/Manifest
new file mode 100644
index 000000000000..d43089b00c93
--- /dev/null
+++ b/games-action/descent1-data/Manifest
@@ -0,0 +1,4 @@
+DIST descent-game-content-10to14a-patch.zip 439853 BLAKE2B 75f90bbbf664237bbbfbe1aed3ff500c24b72b45beee1361b7823c6758c5dd5daf2693de8c4f3bc8deb77e915811237f28464628caf17c58478cfb111524354c SHA512 b71ec888509c77dc8ebc94d5a172a27ab0b16ddfdcb47ac243cefe33b87bbca82df843d9a4bffad8c6f345bfefd89e9e3564353922b00c81ef993e409950eb59
+DIST setup_descent_2.1.0.8.exe 25876928 BLAKE2B 84cb4fddde5308c4e88f7733f0706f2a2ed57b64396d4174d655290aa17886bb99cf8eabff5647ad8518aa76b3821afb3561bcd9a8475e3723bc802ec8fbe8a3 SHA512 bab4269900b7ff0808d4495d5e01d2ebe987b5c37544e3651ff215fe8632b31ad4880ef3f968bd551b1462b9c5d1d392317f1ffec26c5314c76d8341800da876
+EBUILD descent1-data-1.4a.ebuild 2697 BLAKE2B e72b5c240842c218975c5f7198e473bc8786c331e1055d00f92ba249974fbee46132ff6b415effc5e003958bac510a44c841719529eed8e12c4881183e6fb443 SHA512 dabc8465ad7a923601442ed42a30c32f9c55a9dbbfe890fbf62cca4324bc628ec2e9eb38c80075f7e6ed222cbffa1c57ae071853d3316105e1648f70a3db236e
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-action/descent1-data/descent1-data-1.4a.ebuild b/games-action/descent1-data/descent1-data-1.4a.ebuild
new file mode 100644
index 000000000000..85cf48cd3a03
--- /dev/null
+++ b/games-action/descent1-data/descent1-data-1.4a.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CDROM_OPTIONAL="yes"
+inherit cdrom eutils
+
+# For GOG install
+MY_EXE="setup_descent_2.1.0.8.exe"
+
+DESCRIPTION="Data files for Descent 1"
+HOMEPAGE="http://www.interplay.com/games/descent.php"
+SRC_URI="cdinstall? ( http://www.dxx-rebirth.com/download/dxx/misc/descent-game-content-10to14a-patch.zip )
+	!cdinstall? ( ${MY_EXE} )"
+LICENSE="descent-data"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+RESTRICT="bindist !cdinstall? ( fetch )"
+
+RDEPEND="!games-action/descent1-demodata"
+
+DEPEND="cdinstall? ( app-arch/unzip )
+	!cdinstall? ( app-arch/innoextract )"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	elog "You must place a copy of, or symlink to, the GOG setup package here:"
+	elog "${DISTDIR}/${MY_EXE}"
+	echo
+	elog "If you wish to install from CD-ROM instead, please enable the cdinstall flag."
+}
+
+src_unpack() {
+	if use cdinstall; then
+		default
+		cdrom_get_cds descent/descent.hog:descent.hog
+
+		case ${CDROM_SET} in
+			0) einfo "Found Descent 1 CD" ;;
+			1) einfo "Found Descent 1 installation" ;;
+		esac
+
+		cd "${CDROM_ABSMATCH%/*}" || die
+	else
+		innoextract -e -s -p0 -L -I app -d gog "${DISTDIR}/${MY_EXE}" || die
+		cd "${WORKDIR}/gog/app" || die
+	fi
+
+	eshopts_push -s globstar nocaseglob nullglob
+
+	# Strip directories
+	# Lowercase
+	# chaos.* into data/missions
+	# *.dem into data/demos
+	# Documentation into doc
+	# Remainder into data
+
+	tar c \
+		--mode=u+w \
+		--ignore-case \
+		--xform='s:.*/::xg' \
+		--xform='s:.*:\L\0:x' \
+		--xform='s:^chaos\.:data/missions/\0:x' \
+		--xform='s:.*\.dem$:data/demos/\0:x' \
+		--xform='s:.*\.(faq|pdf|txt)$:doc/\0:x' \
+		--xform='s:^[^/]+$:data/\0:x' \
+		--exclude="$(use doc || echo '*.pdf')" \
+		*.{faq,txt,pdf} **/*.{dem,hog,msn,pig} \
+		| tar x -C "${WORKDIR}"
+
+	assert "tar failed"
+	eshopts_pop
+}
+
+src_prepare() {
+	if use cdinstall; then
+		case $(md5sum data/descent.hog || die) in
+			8adfff2e5205486cd5574ac3dd0b4381*)
+				patch -p0 data/descent.hog < descent.hog.diff || die ;;
+			c792a21a30b869b1ec6d31ad64e9557e*)
+				einfo "descent.hog already patched" ;;
+			*)
+				ewarn "Unknown descent.hog detected, cannot patch" ;;
+		esac
+
+		case $(md5sum data/descent.pig || die) in
+			7916448ae69bcc0dd4f3b057a961285f*)
+				patch -p0 data/descent.pig < descent.pig.diff || die ;;
+			fa7e48b7b1495399af838e31ac13b7da*)
+				einfo "descent.pig already patched" ;;
+			*)
+				ewarn "Unknown descent.pig detected, cannot patch" ;;
+		esac
+	fi
+
+	default
+}
+
+src_install() {
+	insinto /usr/share/games/d1x
+	doins -r data/*
+	[[ -d doc ]] && dodoc doc/*
+}
+
+pkg_postinst() {
+	elog "A client is needed to run the game, e.g. games-action/dxx-rebirth."
+	echo
+}
diff --git a/games-action/descent1-data/metadata.xml b/games-action/descent1-data/metadata.xml
new file mode 100644
index 000000000000..26079e608bed
--- /dev/null
+++ b/games-action/descent1-data/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-action/descent1-demodata-1.4-r1 b/games-action/descent1-demodata-1.4-r1
deleted file mode 100644
index a57b9581bb71..000000000000
--- a/games-action/descent1-demodata-1.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst unpack
-DEPEND=app-arch/unzip app-arch/unarj
-DESCRIPTION=Demo data files for Descent 1
-EAPI=6
-HOMEPAGE=http://www.interplay.com/games/descent.php
-KEYWORDS=~amd64 ~x86
-LICENSE=free-noncomm
-RDEPEND=!games-action/descent1-data
-SLOT=0
-SRC_URI=http://icculus.org/d2x/data/desc14sw.exe ftp://ftp.funet.fi/pub/msdos/games/interplay/desc14sw.exe
-_eclasses_=unpacker	87633b2194cdb56adaa1f5a5c8862c44
-_md5_=eccd090b8ffa2f31c6dfd19a3a50b6bf
diff --git a/games-action/descent1-demodata/Manifest b/games-action/descent1-demodata/Manifest
new file mode 100644
index 000000000000..e6506d67e07d
--- /dev/null
+++ b/games-action/descent1-demodata/Manifest
@@ -0,0 +1,3 @@
+DIST desc14sw.exe 2892216 BLAKE2B c07751c6e8b59c0980f409d1fe8a5cee68bb0a4ff83d3a18723185c7228f43546f8dba90da1cdce1e698badcea4f29d06c1d0be5e6732f25fcc2a0587cadf0d4 SHA512 121bd909285138eef3009af4a46174a4af241b139230eda5c232fe710b17419e385ffeb97e13678c253390e6393615006c739a8dd4b0e14b375678491629ab3e
+EBUILD descent1-demodata-1.4-r1.ebuild 935 BLAKE2B 2e4c47864e114f285c30fc8cda8ea4b76a5e125d99228719011c36996e705c33b65c61843baf2ae0f4fafa7c97b350f1c19762b5b77b774513101f290d71d62b SHA512 4c05b12a4bb66acac9c9446f77e0f500f27e6081ab1436736143ba3f1a840762c88bb73c1f8041a62215802010f5009d201d01753f94887ce08b5f8d1f8b32a6
+MISC metadata.xml 560 BLAKE2B 3a025185ecaf1e128628edb9cf941d61019ce6a79e91807240ee4996738f0e491de62a0ba5cb5503413eb03dfa6b2318c701cc32455bf04be607df374daf6a19 SHA512 0f5457290e5c7f6d5abdd6d9b42ef06c8c6cd3c85032cc4c3aa90c67beb33d467bea45b8371cbb182e2d89bd27bc409c36ed27b438fc41c09825cdff1060c543
diff --git a/games-action/descent1-demodata/descent1-demodata-1.4-r1.ebuild b/games-action/descent1-demodata/descent1-demodata-1.4-r1.ebuild
new file mode 100644
index 000000000000..8a61ba5c2977
--- /dev/null
+++ b/games-action/descent1-demodata/descent1-demodata-1.4-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit unpacker
+
+DEMO="desc${PV//.}sw.exe"
+
+DESCRIPTION="Demo data files for Descent 1"
+HOMEPAGE="http://www.interplay.com/games/descent.php"
+SRC_URI="http://icculus.org/d2x/data/${DEMO}
+	ftp://ftp.funet.fi/pub/msdos/games/interplay/${DEMO}"
+LICENSE="free-noncomm"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="!games-action/descent1-data"
+
+DEPEND="app-arch/unzip
+	app-arch/unarj"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack_zip ${A}
+
+	unarj e DESCENT1.SOW || die
+	mv descent.pig{,1} || die
+	unarj e DESCENT2.SOW || die
+	mv descent.pig{,2} || die
+
+	# From the sows, big porkie pies shall grow
+	cat descent.pig{1,2} > descent.pig || die
+}
+
+src_install() {
+	insinto /usr/share/games/d1x
+	doins descent.{hog,pig}
+	dodoc *.txt
+}
+
+pkg_postinst() {
+	elog "A client is needed to run the game, e.g. games-action/dxx-rebirth."
+	echo
+}
diff --git a/games-action/descent1-demodata/metadata.xml b/games-action/descent1-demodata/metadata.xml
new file mode 100644
index 000000000000..d14136fc9672
--- /dev/null
+++ b/games-action/descent1-demodata/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>
+Descent 1 is a classic first-person shooter released in 1995 by Interplay 
+and Parallax.  It was one of the first games with true 3-dimensional 
+graphics, movement, and light sourcing.  This is the demo data for the game
+which is used by the various Descent 1 source ports.
+</longdescription>
+</pkgmetadata>
diff --git a/games-action/descent2-data-1.2 b/games-action/descent2-data-1.2
deleted file mode 100644
index e0c3a9b396b1..000000000000
--- a/games-action/descent2-data-1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install nofetch postinst prepare unpack
-DEPEND=cdinstall? ( app-arch/unarj dev-util/xdelta:3 ) !cdinstall? ( app-arch/innoextract )
-DESCRIPTION=Data files for Descent 2
-EAPI=6
-HOMEPAGE=http://www.interplay.com/games/descent.php
-IUSE=doc videos cdinstall
-KEYWORDS=~amd64 ~x86
-LICENSE=descent-data
-PROPERTIES=cdinstall? ( interactive )
-RDEPEND=!<games-action/d2x-0.2.5-r3 !games-action/descent2-demodata
-RESTRICT=bindist !cdinstall? ( fetch )
-SLOT=0
-SRC_URI=cdinstall? ( http://www.dxx-rebirth.com/download/dxx/misc/d2xptch12.tgz ) !cdinstall? ( setup_descent2_2.1.0.10.exe )
-_eclasses_=cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=eb08f4a705614e35f573df706df9c464
diff --git a/games-action/descent2-data/Manifest b/games-action/descent2-data/Manifest
new file mode 100644
index 000000000000..51769f7318e2
--- /dev/null
+++ b/games-action/descent2-data/Manifest
@@ -0,0 +1,4 @@
+DIST d2xptch12.tgz 158419 BLAKE2B e4bd0d33fa8912b87f8018673c2f9fa9d965f96787b7af76da5473e0c6b06ca78303977cdb6e1f85affefe187b2f1e947eb477313b379bf2464e2a0ba95b74bf SHA512 14d59280e685a9c3d5e23e1d535f37f89768e022b795067793a994c5150685addfcacbd2dc52231804240d01d17d57b1db04335d41bc5930e3c8a845ebbb396b
+DIST setup_descent2_2.1.0.10.exe 554371624 BLAKE2B fb05302652c7ba46c06d314453a03430850404c05fb8d43681b7505bdf1a3901d0875f0a63379b121c7338d9b3092410cfa77c5d98690c98b27b0bffaf00ae3d SHA512 0db1935864eb59002cc995dfe9c40badd72d0a3dcec61092b0760481cd3d1316db17631c05043b938e4b958d696c508ce379face9baa260dcc598c77b4460618
+EBUILD descent2-data-1.2.ebuild 2892 BLAKE2B b101311a0d5d880f068c90cb3cd70d2277bce1ef351c94a598c4247ccd2062cb4dad4d67a32c0f9c3d398891c6c5c517ce2baad61140c6dbd7e7f66f61221fd6 SHA512 81a9717dd2ace1af3852a2324bfbfe5226642fba07d9ce14906cb278d80385f6be77b73b58a9907364acfc45b2d38b70cc9a57fd0aa77f39cfed90edcf30ae26
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/descent2-data/descent2-data-1.2.ebuild b/games-action/descent2-data/descent2-data-1.2.ebuild
new file mode 100644
index 000000000000..947680089288
--- /dev/null
+++ b/games-action/descent2-data/descent2-data-1.2.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CDROM_OPTIONAL="yes"
+inherit cdrom eutils
+
+# Not possible to apply official 1.2 patch under Linux. A Gentoo user
+# created Xdelta patches and the DXX-Rebirth project kindly hosted them.
+MY_PATCH="http://www.dxx-rebirth.com/download/dxx/misc/d2xptch12.tgz"
+
+# For GOG install
+MY_EXE="setup_descent2_2.1.0.10.exe"
+
+DESCRIPTION="Data files for Descent 2"
+HOMEPAGE="http://www.interplay.com/games/descent.php"
+SRC_URI="cdinstall? ( ${MY_PATCH} )
+	!cdinstall? ( ${MY_EXE} )"
+LICENSE="descent-data"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc videos"
+RESTRICT="bindist !cdinstall? ( fetch )"
+
+# <d2x-0.2.5-r3 may include the data.
+RDEPEND="!<games-action/d2x-0.2.5-r3
+	!games-action/descent2-demodata"
+
+DEPEND="cdinstall? (
+		app-arch/unarj
+		dev-util/xdelta:3
+	)
+	!cdinstall? (
+		app-arch/innoextract
+	)"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	elog "You must place a copy of, or symlink to, the GOG setup package here:"
+	elog "${DISTDIR}/${MY_EXE}"
+	echo
+	elog "If you wish to install from CD-ROM instead, please enable the cdinstall flag."
+}
+
+src_unpack() {
+	if use cdinstall; then
+		default
+		cdrom_get_cds d2data/descent2.sow:descent2.hog
+
+		case ${CDROM_SET} in
+			0)
+				einfo "Found Descent 2 CD"
+				unarj e "${CDROM_ABSMATCH}" || die ;;
+			1)
+				einfo "Found Descent 2 installation"
+				cd "${CDROM_ABSMATCH%/*}" || die ;;
+		esac
+	else
+		einfo "Unpacking ${MY_EXE}. This will take a while..."
+		innoextract -e -s -p1 -L -I app -d gog "${DISTDIR}/${MY_EXE}" || die
+		cd "${WORKDIR}/gog/app" || die
+	fi
+
+	eshopts_push -s globstar nocaseglob nullglob
+
+	# Strip directories
+	# Lowercase
+	# d2{-2plyr,chaos}.* into data/missions
+	# *.dem into data/demos
+	# Documentation into doc
+	# Remainder into data
+	# Exclude Vertigo files
+
+	tar c \
+		--mode=u+w \
+		--ignore-case \
+		--xform='s:.*/::xg' \
+		--xform='s:.*:\L\0:x' \
+		--xform='s:^d2(-2plyr|chaos)\.:data/missions/\0:x' \
+		--xform='s:.*\.dem$:data/demos/\0:x' \
+		--xform='s:.*\.(pdf|txt)$:doc/\0:x' \
+		--xform='s:^[^/]+$:data/\0:x' \
+		--exclude='d2x*' \
+		--exclude='hoard.ham' \
+		--exclude='panic.*' \
+		--exclude="$(use doc || echo '*.pdf')" \
+		--exclude="$(use videos || echo '*.mvl')" \
+		*.{txt,pdf} *-h.mvl **/*.{ham,hog,mn2,pig,s11,s22} \
+		| tar x -C "${WORKDIR}"
+
+	assert "tar failed"
+	eshopts_pop
+}
+
+src_prepare() {
+	# Patch to 1.2 if necessary
+	if use cdinstall; then
+		if [[ $(md5sum data/descent2.ham) != 7f30c3d7d4087b8584b49012a53ce022* ]]; then
+			local i
+			for i in *.xdelta; do
+				xdelta3 -d -s data/"${i%.*}" "${i}" data/"${i%.*}".new || die
+				mv data/"${i%.*}"{.new,} || die
+			done
+		fi
+	fi
+
+	default
+}
+
+src_install() {
+	insinto /usr/share/games/d2x
+	doins -r data/*
+	[[ -d doc ]] && dodoc doc/*
+}
+
+pkg_postinst() {
+	elog "A client is needed to run the game, e.g. games-action/dxx-rebirth."
+	echo
+}
diff --git a/games-action/descent2-data/metadata.xml b/games-action/descent2-data/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-action/descent2-data/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-action/descent2-demodata-1.0-r1 b/games-action/descent2-demodata-1.0-r1
deleted file mode 100644
index 79751a0337b6..000000000000
--- a/games-action/descent2-demodata-1.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst unpack
-DEPEND=app-arch/unzip app-arch/unarj
-DESCRIPTION=Demo data files for Descent 2
-EAPI=6
-HOMEPAGE=http://www.interplay.com/games/descent.php
-KEYWORDS=~amd64 ~x86
-LICENSE=free-noncomm
-RDEPEND=!<games-action/d2x-0.2.5-r3 !games-action/descent2-data
-SLOT=0
-SRC_URI=ftp://ftp.funet.fi/pub/msdos/games/interplay/d2demo10.zip
-_md5_=7435af78d7602ac458f2149fec19a437
diff --git a/games-action/descent2-demodata/Manifest b/games-action/descent2-demodata/Manifest
new file mode 100644
index 000000000000..5fe6e56e9546
--- /dev/null
+++ b/games-action/descent2-demodata/Manifest
@@ -0,0 +1,3 @@
+DIST d2demo10.zip 4306833 BLAKE2B ae075d0c3d46fc262696e9ec0a7c70cb676295e5fa95c357f81235f46bc00e686de0cf2f611571f215601683a72fc4c41d5abd525e3de46e208c5fe4c34b2c87 SHA512 a4229be701a4b2fc28d3c71591a477d242c1c784dc233c1e9ca6b798b3774de9744d8a91b0b80904b3fe63e1285b79234bf48681cddaeca702b3d9ce4c2b6fab
+EBUILD descent2-demodata-1.0-r1.ebuild 1225 BLAKE2B 13dd6e43e86ed44aed116c0ea11b99d528f37f6427c767325c426dea8d39d67949b320f60aa0b7c584fba6928bb8da31f176439c51fa65dfc235d37b0b1e245b SHA512 a4120c6394aadd9c0f9b3b3e2362b8cfce66114dbff76226770edd35247efcfb6827b0d25b720eca376ed96f872b8bb79748ab24138c2e408d0dc814086cd0fc
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/descent2-demodata/descent2-demodata-1.0-r1.ebuild b/games-action/descent2-demodata/descent2-demodata-1.0-r1.ebuild
new file mode 100644
index 000000000000..79abcc78e76d
--- /dev/null
+++ b/games-action/descent2-demodata/descent2-demodata-1.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="d2demo"
+DEMO="${MY_PN}${PV//.}.zip"
+
+DESCRIPTION="Demo data files for Descent 2"
+HOMEPAGE="http://www.interplay.com/games/descent.php"
+SRC_URI="ftp://ftp.funet.fi/pub/msdos/games/interplay/${DEMO}"
+LICENSE="free-noncomm"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# <d2x-0.2.5-r3 may include the data.
+RDEPEND="!<games-action/d2x-0.2.5-r3
+	!games-action/descent2-data"
+
+DEPEND="app-arch/unzip
+	app-arch/unarj"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	default
+
+	# This is much more fun than simply downloading
+	# http://www.icculus.org/d2x/data/d2shar10.tar.gz
+	unarj e D2_1.SOW || die
+	mv ${MY_PN}.ham{,1} || die
+	unarj e D2_2.SOW || die
+	mv ${MY_PN}.ham{,2} || die
+	mv ${MY_PN}.pig{,2} || die
+	unarj e D2_3.SOW || die
+	mv ${MY_PN}.pig{,3} || die
+
+	# From the sows, big porkie pies shall grow
+	cat ${MY_PN}.ham{1,2} > ${MY_PN}.ham || die
+	cat ${MY_PN}.pig{2,3} > ${MY_PN}.pig || die
+}
+
+src_install() {
+	insinto /usr/share/games/d2x
+	doins *.{ham,hog,pig}
+	insinto /usr/share/games/d2x/demos
+	doins *.dem
+	dodoc *.txt
+}
+
+pkg_postinst() {
+	elog "A client is needed to run the game, e.g. games-action/dxx-rebirth."
+	echo
+}
diff --git a/games-action/descent2-demodata/metadata.xml b/games-action/descent2-demodata/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-action/descent2-demodata/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-action/descent2-vertigo-1.0 b/games-action/descent2-vertigo-1.0
deleted file mode 100644
index eb8a8e2c83b1..000000000000
--- a/games-action/descent2-vertigo-1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst unpack
-DESCRIPTION=Data files for Descent 2: The Vertigo Series
-EAPI=6
-HOMEPAGE=http://www.interplay.com/games/descent.php
-IUSE=videos
-KEYWORDS=~amd64 ~x86
-LICENSE=descent-data
-PROPERTIES=interactive
-RESTRICT=bindist
-SLOT=0
-_eclasses_=cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=876f36a9664f888dbdfae19ccbc9d62e
diff --git a/games-action/descent2-vertigo/Manifest b/games-action/descent2-vertigo/Manifest
new file mode 100644
index 000000000000..58c57d3cd478
--- /dev/null
+++ b/games-action/descent2-vertigo/Manifest
@@ -0,0 +1,2 @@
+EBUILD descent2-vertigo-1.0.ebuild 1229 BLAKE2B dee8ad22a6b82e791a04aa684003153264263890fa359621f20d2e8e3ed922accbf949d16e8031ce62f138f1db06015d57cdf684e33e7b48c3950928c0af12fe SHA512 0a87a258fd54843a54cf2eefbdef662edd7c42a9d58e804b49b0f696d3cdb0e7e70160cdbf467814c0d1bec422e1ea9b3e700d636ca8cf79473ea92e65734a79
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-action/descent2-vertigo/descent2-vertigo-1.0.ebuild b/games-action/descent2-vertigo/descent2-vertigo-1.0.ebuild
new file mode 100644
index 000000000000..d49ee60b99d0
--- /dev/null
+++ b/games-action/descent2-vertigo/descent2-vertigo-1.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cdrom eutils
+
+DESCRIPTION="Data files for Descent 2: The Vertigo Series"
+HOMEPAGE="http://www.interplay.com/games/descent.php"
+LICENSE="descent-data"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="videos"
+RESTRICT="bindist"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cdrom_get_cds vertigo/d2x.hog:hoard.ham
+
+	case ${CDROM_SET} in
+		0) einfo "Found Descent 2 Vertigo Series CD" ;;
+		1) einfo "Found Descent 2 Vertigo Series installation" ;;
+	esac
+
+	cd "${CDROM_ABSMATCH%/*}" || die
+	eshopts_push -s globstar nocaseglob nullglob
+
+	# Strip directories
+	# Lowercase
+	# *.{hog,mn2} into data/missions
+	# Remainder into data
+
+	tar c \
+		--mode=u+w \
+		--ignore-case \
+		--xform='s:.*/::xg' \
+		--xform='s:.*:\L\0:x' \
+		--xform='s:.*\.(hog|mn2)$:data/missions/\0:x' \
+		--xform='s:^[^/]+$:data/\0:x' \
+		--exclude="$(use videos || echo '*.mvl')" \
+		**/{hoard.ham,d2x-h.mvl,{d2x,panic}.{hog,mn2}}* \
+		| tar x -C "${WORKDIR}"
+
+	assert "tar failed"
+	eshopts_pop
+}
+
+src_install() {
+	insinto /usr/share/games/d2x
+	doins -r data/*
+}
+
+pkg_postinst() {
+	elog "A client is needed to run the game, e.g. games-action/dxx-rebirth."
+	echo
+}
diff --git a/games-action/descent2-vertigo/metadata.xml b/games-action/descent2-vertigo/metadata.xml
new file mode 100644
index 000000000000..26079e608bed
--- /dev/null
+++ b/games-action/descent2-vertigo/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-action/descent3-1.4.0b-r2 b/games-action/descent3-1.4.0b-r2
deleted file mode 100644
index c7e07ca30719..000000000000
--- a/games-action/descent3-1.4.0b-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DESCRIPTION=Descent 3 - 3-Dimensional indoor/outdoor spaceship combat
-EAPI=5
-HOMEPAGE=http://www.lokigames.com/products/descent3/
-IUSE=nocd videos
-KEYWORDS=~amd64 ~x86
-LICENSE=LOKI-EULA
-PROPERTIES=interactive
-RDEPEND=sys-libs/glibc media-libs/libsdl[abi_x86_32(-)] media-libs/smpeg[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] games-misc/games-envd
-RESTRICT=strip
-SLOT=0
-SRC_URI=mirror://lokigames/descent3/descent3-1.4.0a-x86.run mirror://lokigames/descent3/descent3-1.4.0b-x86.run
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a1821063d044737b4f5a786ed553873d
diff --git a/games-action/descent3-demo-1.4.0a-r1 b/games-action/descent3-demo-1.4.0a-r1
deleted file mode 100644
index 4a4c82cbf483..000000000000
--- a/games-action/descent3-demo-1.4.0a-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=games-util/loki_patch dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Indoor/outdoor 3D combat with evil robotic mining spacecraft
-EAPI=6
-HOMEPAGE=http://www.lokigames.com/products/descent3/
-IUSE=alsa pulseaudio
-KEYWORDS=~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=sys-libs/glibc >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] alsa? ( media-libs/alsa-oss[abi_x86_32(-)] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)] )
-REQUIRED_USE=?? ( alsa pulseaudio )
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=mirror://lokigames/loki_demos/descent3-demo.run
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6f1fc01fd5124ca01e690636251f2631
diff --git a/games-action/descent3-demo/Manifest b/games-action/descent3-demo/Manifest
new file mode 100644
index 000000000000..fd55865aaa8b
--- /dev/null
+++ b/games-action/descent3-demo/Manifest
@@ -0,0 +1,3 @@
+DIST descent3-demo.run 45118289 BLAKE2B 7e64f03aa6cf75839d1eddf0116686c9d2a121f69a764cf416695455008b608579449ab7458177a2be11910ad361f707501153749d5c8b58dacc36e338251c1c SHA512 8f5e790257d0477e4238aae8fb5b4b1f21e23f188775cb53a5197baf0c174017d821e3a8dd696f9c0fd27838e08cff4bde0d6f5a9dca87a7e8af29cdc627d29c
+EBUILD descent3-demo-1.4.0a-r1.ebuild 1702 BLAKE2B 0fb7d751f7599d12f08311951e40eed34a6fd37c6a403bf98f77b6f685c0b23d7dbeba535f9cceb10c925fe2de2f992e36b974d023f0c4b2de312f5a9507617a SHA512 38e25044e6afc983f0e3ee4762b2f6c1b623362c2c87d72c54cb6af7c7e95c23394dd14126bde41ce5bdd08e0c68690cb173cb48d62c5fa71e12a7ff5c8371c9
+MISC metadata.xml 674 BLAKE2B 55ee8a8a4dddfca143c66a762de971984fcea130d085eb0f1d97d51eaa41e439cbbba1787a8700cf1018dd065a7126e1e206a7ea079bf6ed650905cd6c61580a SHA512 44cd0adf66a791a20af8eda38f8a7adef9aaeaf74b5a3db388d33efaec4bc14781ad9c8697fdbd18a2ff2188f848601409631b02537589bbae9eb9d8d0c5792f
diff --git a/games-action/descent3-demo/descent3-demo-1.4.0a-r1.ebuild b/games-action/descent3-demo/descent3-demo-1.4.0a-r1.ebuild
new file mode 100644
index 000000000000..cad5192149ca
--- /dev/null
+++ b/games-action/descent3-demo/descent3-demo-1.4.0a-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils unpacker xdg
+
+DESCRIPTION="Indoor/outdoor 3D combat with evil robotic mining spacecraft"
+HOMEPAGE="http://www.lokigames.com/products/descent3/"
+SRC_URI="mirror://lokigames/loki_demos/${PN}.run"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa pulseaudio"
+REQUIRED_USE="?? ( alsa pulseaudio )"
+RESTRICT="bindist mirror strip"
+
+DEPEND="games-util/loki_patch"
+RDEPEND="sys-libs/glibc
+	>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+	alsa? ( media-libs/alsa-oss[abi_x86_32(-)] )
+	pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)] )"
+
+dir="/opt/${PN}"
+QA_PREBUILT="${dir:1}/descent3_demo.x86
+	${dir:1}/netgames/*.d3m"
+
+S="${WORKDIR}"
+
+src_install() {
+	local \
+		snd= \
+		demo="data/demos/descent3_demo" \
+		exe="descent3_demo.x86"
+
+	loki_patch patch.dat data/ || die
+
+	insinto "${dir}"
+	exeinto "${dir}"
+	doins -r "${demo}"/*
+	doexe "${demo}/${exe}"
+
+	# Required directory
+	keepdir "${dir}"/missions
+
+	# Fix for 2.6 kernel crash, bug #151148
+	dosym ppics.hog "${dir}"/PPics.Hog
+
+	if use alsa; then
+		snd="aoss "
+	elif use pulseaudio; then
+		snd="env LD_PRELOAD=\"${EPREFIX}/usr/$(ABI=x86 get_libdir)/pulseaudio/libpulsedsp.so\" "
+	fi
+
+	make_wrapper ${PN} "${snd}./${exe} -G -o" "${dir}"
+	newicon "${demo}"/launch/box.png ${PN}.png
+	make_desktop_entry ${PN} "Descent 3 (Demo)"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	echo
+	elog "To play the game run:"
+	elog " descent3-demo"
+	elog
+	elog "If the game appears blank, then run it windowed with:"
+	elog " descent3-demo -w"
+	echo
+}
diff --git a/games-action/descent3-demo/metadata.xml b/games-action/descent3-demo/metadata.xml
new file mode 100644
index 000000000000..27cdd4f34a28
--- /dev/null
+++ b/games-action/descent3-demo/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="project">
+	<email>games@gentoo.org</email>
+	<name>Gentoo Games Project</name>
+</maintainer>
+<longdescription>
+Descent 3 is a first-person 3-D action flight-sim which takes place in both
+indoor and outdoor arenas.  The game was ported to Linux by the now defunct Loki
+Entertainment and is commercial software.  You can still pick up a copy from
+Tuxgames (http://www.tuxgames.com), but supplies are limited, as the publisher
+is no longer in business.  This is the free demo version of the full game.
+</longdescription>
+</pkgmetadata>
diff --git a/games-action/descent3/Manifest b/games-action/descent3/Manifest
new file mode 100644
index 000000000000..d9c208619dfa
--- /dev/null
+++ b/games-action/descent3/Manifest
@@ -0,0 +1,4 @@
+DIST descent3-1.4.0a-x86.run 2736956 BLAKE2B 23ea2042404308ff6d9b1b3fca688b1b59c9a774017ed0ca0a1e95166c698a41f7453addf6af043bb5faed8866ce590692dc8c708de01fb5464b0c456863c50e SHA512 e6c5d6a678c46374c5d5d40589d40906378fd17ebb658778a2d052a71cd069877a43eb83b344b41473fe443e886c3b07283ea9de908df4ab8584638670114ecc
+DIST descent3-1.4.0b-x86.run 4504631 BLAKE2B e6e807b8e1bc511a612a7b217ec9b86bb75cebfee3b30f636f7b668a651c09e61b13679d332e92708e8adc926033c4abe9b270e0357673d4026f934f31287de2 SHA512 912afcf51a2f4f8cacb231e318d4837c64b2f762109244c083760b5e580298d4166fea0878ee2d344b841c788d673896a09d0052ebea59dead637d834e826db3
+EBUILD descent3-1.4.0b-r2.ebuild 2648 BLAKE2B 081a45cb4d741de3d086fda9f32425d3e14385ec5c2ac96e8608a41cf35d6fef6e9c696c9f51329d2ef1a38f8d0012f6ce2a379f2639634dcec1954f0e340a1d SHA512 3c7aff0955aeac46ae72f89b993b78922a5450dce9f5d7270a42461c32cefef4795b48eddcae13405d4f35c71fd27adecfc922dfedfdff2a2773f0c364f37566
+MISC metadata.xml 625 BLAKE2B 5fd68ba049724b77f21760b68d7a2a755dbf7b8caa159d629cd19bac4c7500b02a867bd999d87cafa96f2895ab068c1ae37890021f2de1be52a377dde4f4ac20 SHA512 a72428b67ed26503112a398643a53230dd80f0b48a0ffa53a4ade00647302147aa042acc91cc6b49fef0d23efeafef2e33d4caea4bb845de7f6d08e8c943d71c
diff --git a/games-action/descent3/descent3-1.4.0b-r2.ebuild b/games-action/descent3/descent3-1.4.0b-r2.ebuild
new file mode 100644
index 000000000000..d663b28ab8f5
--- /dev/null
+++ b/games-action/descent3/descent3-1.4.0b-r2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils unpacker cdrom multilib games
+
+IUSE="nocd videos"
+DESCRIPTION="Descent 3 - 3-Dimensional indoor/outdoor spaceship combat"
+HOMEPAGE="http://www.lokigames.com/products/descent3/"
+SRC_URI="mirror://lokigames/${PN}/${PN}-1.4.0a-x86.run
+	mirror://lokigames/${PN}/${P}-x86.run"
+
+LICENSE="LOKI-EULA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="strip"
+
+RDEPEND="sys-libs/glibc
+	media-libs/libsdl[abi_x86_32(-)]
+	media-libs/smpeg[abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]"
+
+dir=${GAMES_PREFIX_OPT}/${PN}
+Ddir=${D}/${dir}
+
+pkg_setup() {
+	games_pkg_setup
+	if use videos ; then
+		ewarn "The installed game takes about 1.2GB of space!"
+	elif use nocd ; then
+		ewarn "The installed game takes about 510MB of space!"
+	else
+		ewarn "The installed game takes about 220MB of space!"
+	fi
+}
+
+src_unpack() {
+	if use videos ; then
+		cdrom_get_cds missions/d3.mn3 movies/level1.mve
+	else
+		cdrom_get_cds missions/d3.mn3
+	fi
+	mkdir -p "${S}"/{a,b} || die
+	cd "${S}"/a || die
+	unpack_makeself ${PN}-1.4.0a-x86.run
+	cd "${S}"/b || die
+	unpack_makeself ${P}-x86.run
+}
+
+src_install() {
+	einfo "Copying files... this may take a while..."
+	exeinto "${dir}"
+	doexe ${CDROM_ROOT}/bin/x86/glibc-2.1/{${PN},nettest}
+	insinto "${dir}"
+	doins ${CDROM_ROOT}/{FAQ.txt,README{,.mercenary},d3.hog,icon.{bmp,xpm}}
+
+	cd "${Ddir}" || die
+	# TODO: move this to src_unpack where it belongs
+	tar xzf ${CDROM_ROOT}/data.tar.gz || die
+	tar xzf ${CDROM_ROOT}/shared.tar.gz || die
+
+	if use nocd; then
+		doins -r ${CDROM_ROOT}/missions
+	fi
+
+	if use videos ; then
+		cdrom_load_next_cd
+		doins -r ${CDROM_ROOT}/movies
+	fi
+
+	cd "${S}"/a || die
+	bin/Linux/x86/loki_patch --verify patch.dat || die
+	bin/Linux/x86/loki_patch patch.dat "${Ddir}" >& /dev/null || die
+	cd "${S}"/b || die
+	bin/Linux/x86/loki_patch --verify patch.dat || die
+	bin/Linux/x86/loki_patch patch.dat "${Ddir}" >& /dev/null || die
+
+	# now, since these files are coming off a cd, the times/sizes/md5sums wont
+	# be different ... that means portage will try to unmerge some files (!)
+	# we run touch on ${D} so as to make sure portage doesnt do any such thing
+	find "${Ddir}" -exec touch '{}' +
+
+	games_make_wrapper descent3 ./descent3.dynamic "${dir}" "${dir}"
+	newicon ${CDROM_ROOT}/icon.xpm ${PN}.xpm
+
+	# Fix for 2.6 kernel crash
+	cd "${Ddir}" || die
+	ln -sf ppics.hog PPics.Hog
+
+	prepgamesdirs
+	make_desktop_entry ${PN} "Descent 3" ${PN}
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	elog "To play the game run:"
+	elog " descent3"
+	echo
+}
diff --git a/games-action/descent3/metadata.xml b/games-action/descent3/metadata.xml
new file mode 100644
index 000000000000..bdbb1bdaaee9
--- /dev/null
+++ b/games-action/descent3/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>
+<longdescription>
+Descent 3 is a first-person 3-D action flight-sim which takes place in both indoor and outdoor arenas.  The game was ported to Linux by the now defunct Loki Entertainment and is commercial software.  You can still pick up a copy from Tuxgames (http://www.tuxgames.com), but supplies are limited, as the publisher is no longer in business.
+</longdescription>
+</pkgmetadata>
diff --git a/games-action/dxx-rebirth-0.59.100 b/games-action/dxx-rebirth-0.59.100
deleted file mode 100644
index 844d37b0fbc3..000000000000
--- a/games-action/dxx-rebirth-0.59.100
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare
-DEPEND=dev-games/physfs:0=[hog,mvl,zip] media-libs/libsdl:0=[joystick,opengl?,sound,video] music? ( media-libs/sdl-mixer:0= ) opengl? ( virtual/opengl virtual/glu ) dev-util/scons[python_targets_python2_7] dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Descent Rebirth - enhanced Descent 1 & 2 engine
-EAPI=6
-HOMEPAGE=https://www.dxx-rebirth.com/
-IUSE=+data debug +descent1 +descent2 ipv6 l10n_de +music +opengl opl3-musicpack sc55-musicpack +textures
-KEYWORDS=~amd64 ~x86
-LICENSE=DXX-Rebirth GPL-3 public-domain
-RDEPEND=dev-games/physfs:0=[hog,mvl,zip] media-libs/libsdl:0=[joystick,opengl?,sound,video] music? ( media-libs/sdl-mixer:0= ) opengl? ( virtual/opengl virtual/glu ) data? ( descent1? ( || ( games-action/descent1-data games-action/descent1-demodata ) ) descent2? ( || ( games-action/descent2-data games-action/descent2-demodata ) ) ) music? ( !opl3-musicpack? ( !sc55-musicpack? ( media-libs/sdl-mixer:0=[midi] ) ) opl3-musicpack? ( media-libs/sdl-mixer:0=[vorbis] ) sc55-musicpack? ( media-libs/sdl-mixer:0=[vorbis] ) ) !games-action/d1x-rebirth !games-action/d2x-rebirth
-REQUIRED_USE=|| ( descent1 descent2 ) ?? ( opl3-musicpack sc55-musicpack ) opl3-musicpack? ( music ) sc55-musicpack? ( music )
-SLOT=0
-SRC_URI=https://www.dxx-rebirth.com/download/dxx/dxx-rebirth_v0.59.100-src.tar.gz opl3-musicpack? ( descent1? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-opl3-music.dxa ) descent2? ( https://www.dxx-rebirth.com/download/dxx/res/d2xr-opl3-music.dxa ) ) sc55-musicpack? ( descent1? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-sc55-music.dxa ) descent2? ( https://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.dxa ) ) l10n_de? ( descent1? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-briefings-ger.dxa ) descent2? ( https://www.dxx-rebirth.com/download/dxx/res/d2xr-briefings-ger.dxa ) ) textures? ( descent1? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-hires.dxa ) )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c0865e5009077d1ec4befbe1d87d85c1
diff --git a/games-action/dxx-rebirth/Manifest b/games-action/dxx-rebirth/Manifest
new file mode 100644
index 000000000000..f2fde940546b
--- /dev/null
+++ b/games-action/dxx-rebirth/Manifest
@@ -0,0 +1,12 @@
+AUX dxx-rebirth-0.59.100-flags.patch 371 BLAKE2B 7902a9375b9f6782eb1cdaba1d0e27ede3476149554a711473631eb652d953828a67836515c097c459b2e3ea31014a71e3ee5d2c46d1ed25dce97ac0cde6f88e SHA512 c8bb575a172845b2643838c95ccbe3fac4509a3b5c24178816ea5a1a46a0fa2721d3fae841641950e97dec0e3a9fb74d8ddac493183df8834caca7d8d9ce11b4
+AUX dxx-rebirth-0.59.100-sharepath.patch 553 BLAKE2B 651db97d70b177754d7053c400a99a79c5ff7cd82af7743ef4588f0981ac2e17143fc0b41cbc62670d896e7f51cfc21e96f0b77d0a4994b4e2b56853ee29b28b SHA512 6f57832df96b6c927ea6f1d93f57662df24c0127b8a22ee08c73c3ecd21ab027fa7367070d0bec09250042e716409b258373e54c9189de68d41b799f785498b8
+DIST d1xr-briefings-ger.dxa 16798 BLAKE2B f5e1f4f91cb3464b3d356fab1e3993700cc19f3f2db8682f5194e59aa5d2623efa427db4135c3595534e5dac0f2589b53aac7df3610501b759407e1ead342458 SHA512 956a3ef1fe7379b71d5f651fdcb1f26b786883a35193a0a22009204e885a12fceb3a69c6accbeb2bd20be65afe087d23532d7ef3439edd97cc8904968bf519e3
+DIST d1xr-hires.dxa 1426884 BLAKE2B c4d9b950353fc450c64568779bc3d2e93a46e17980c8df08a2ef06bff5b9709869fdbbaf4fb6698be994b3faae7a75036a53357743d47b728bb3ef9df126afd8 SHA512 3fc84d5610ba40ee383c1720f80513a21b4644ff8b6da4b84ebca13b11c1131deb4897ded6324b54845b6c847dfc0f16700535e16afdd7ebe83bfff042892302
+DIST d1xr-opl3-music.dxa 81503503 BLAKE2B b560597e0f08139109a6dc4ee7996c05010561686029d1fd754375278b8a11e6df0f6106c797d524e92d4998683d6e1e07b6cfc982ea3ff167a0b9ca92ba0dc2 SHA512 4ac82c4bc2ddb02e2941746921443e38b698c6e54cfcab317fc9108f84ada7b868ec2ee3c70b28c1dfe9f41e2aadab4124c8daa65a409905cba5d674f0aab8a8
+DIST d1xr-sc55-music.dxa 72803408 BLAKE2B eb52491f5c43e9f04aea5715cffc0a47d029dda0b8e5ae1a79ec36122a17c01e3b2a731f369d72fe0e069e1188bdaf03f82d0845b574d76b6798be33481e3b84 SHA512 3cdce5b6535e28397b3216cc9ca05cccf7194349c62d64c54300f02f39248b98598d170599e5c61b6900d780e4917f905c3c31eb814fbb8429221c804cbd8bf9
+DIST d2xr-briefings-ger.dxa 11717 BLAKE2B 27af93656ac91bf5490195d2aebc9c9f252cb730094cccb53298b07f2e2031935033b8db765b40fdad93fb55b157a2be07906ea45185b754e5ec7c205803cc92 SHA512 479aa577dc65271c705e80404ec46e6c59ee3a5122d6e9705dbdd16b71b16c0d3447426e3e74937aa20eb7026f67a3896c5e814fbfcede9164bd557b6eb8423c
+DIST d2xr-opl3-music.dxa 22710919 BLAKE2B 82bdf29b6afe88305d4c7b69bb8b094efcf33ad23becec223311775cd50600ed399c207ee3a05da3800bcc5e123d00f9f8fa7d2d4f4d4be57bbf71e1c2482a9c SHA512 876321a9a16403f6e9d12e10bb73c9cdc57e1a106fa64833a1be8cc17b74f6f13e57e40f051a1b40e7bc88b95bfe86cff181c93c8619383dfdeb74f36f5cce86
+DIST d2xr-sc55-music.dxa 19579531 BLAKE2B 16091e24477a49319f2685884a7538a3597a9132707ac1d59405fa08ce7492158075df4ee680a5c7ba44aa0bd0b16170057f6a8956eab4b56913d00ee2f1f339 SHA512 290713b05627bf65bdc55fc6631a0c86e50f484a167f3fd20b3fe2bc5b772437939b5bf32eea852874dd983fbd47f160cae2412a2d6c5319f0d1583a33d28da6
+DIST dxx-rebirth_v0.59.100-src.tar.gz 1809614 BLAKE2B 6826380312fa23dbc99459db9272cf7ffb5a00a14cfdd777339633fbd943a288af00f182692ebc3078e4c39bf6b6cc9fb05cc6a533ec126b8c881eb22c465868 SHA512 dc9b7ad263e189e779756b62613d4bc62371cb5fec2176a4013395fc18c9d03ab0c9ddc5ccf2668b87e4a77b25d500bdef373126f176bfce49f73b5a98de23d7
+EBUILD dxx-rebirth-0.59.100.ebuild 3276 BLAKE2B 2fb4ede8bc77e37d698f776cdf2aceb7a969ee821d61f7a9ac06e512b8c504fcb911928588686580bad91b15cebee9d6f4a87a17f777e4e5dd82d93caf6cc596 SHA512 ce48361403cc3696ee8d19b33f9546b41867e2eef330bef6dc821a1995bdb6b2ec10328fc15997942ffa1e0908abf810a0bb479192495a4b84fcc891363895a6
+MISC metadata.xml 1974 BLAKE2B 654588e63aa9b45daa812b1a79cedc5992ec6a083d37f7abc13643ea49c5e2679ff967af6f5d3f309f832a0d0a8c8877a6b0b3984f2515aeea95a0750fab6b3a SHA512 4c6bcb9366d27b943b5b0e0e77ce4fc3a9424cf7bee7f76a33b33da803fa86440a2ddf2359996871953ebb3e1c51451032f920b73e3d9fe918415a2fca3f5c09
diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild b/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild
new file mode 100644
index 000000000000..048eb3cb263c
--- /dev/null
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils scons-utils toolchain-funcs xdg
+
+MY_P="${PN}_v${PV}-src"
+DESCRIPTION="Descent Rebirth - enhanced Descent 1 & 2 engine"
+HOMEPAGE="https://www.dxx-rebirth.com/"
+SRC_URI="https://www.dxx-rebirth.com/download/dxx/${MY_P}.tar.gz
+	opl3-musicpack? (
+		descent1? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-opl3-music.dxa )
+		descent2? ( https://www.dxx-rebirth.com/download/dxx/res/d2xr-opl3-music.dxa ) )
+	sc55-musicpack? (
+		descent1? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-sc55-music.dxa )
+		descent2? ( https://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.dxa ) )
+	l10n_de? (
+		descent1? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-briefings-ger.dxa )
+		descent2? ( https://www.dxx-rebirth.com/download/dxx/res/d2xr-briefings-ger.dxa ) )
+	textures? (
+		descent1? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-hires.dxa ) )"
+
+LICENSE="DXX-Rebirth GPL-3 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+data debug +descent1 +descent2 ipv6 l10n_de +music +opengl opl3-musicpack sc55-musicpack +textures"
+
+REQUIRED_USE="|| ( descent1 descent2 )
+	?? ( opl3-musicpack sc55-musicpack )
+	opl3-musicpack? ( music )
+	sc55-musicpack? ( music )"
+
+DEPEND="dev-games/physfs:0=[hog,mvl,zip]
+	media-libs/libsdl:0=[joystick,opengl?,sound,video]
+	music? ( media-libs/sdl-mixer:0= )
+	opengl? (
+		virtual/opengl
+		virtual/glu )"
+
+RDEPEND="${DEPEND}
+	data? (
+		descent1? ( || ( games-action/descent1-data games-action/descent1-demodata ) )
+		descent2? ( || ( games-action/descent2-data games-action/descent2-demodata ) ) )
+	music? (
+		!opl3-musicpack? ( !sc55-musicpack? ( media-libs/sdl-mixer:0=[midi] ) )
+		opl3-musicpack? ( media-libs/sdl-mixer:0=[vorbis] )
+		sc55-musicpack? ( media-libs/sdl-mixer:0=[vorbis] ) )
+	!games-action/d1x-rebirth
+	!games-action/d2x-rebirth"
+
+S="${WORKDIR}/${MY_P}"
+
+# Remove hardcoded optimisation flags.
+# Change share path to use old d1x/d2x locations.
+PATCHES=( "${FILESDIR}"/${P}-{flags,sharepath}.patch )
+
+src_compile() {
+	tc-export CXX
+	escons \
+		prefix="${EPREFIX}"/usr \
+		d1x=$(usex descent1 1 0) \
+		d2x=$(usex descent2 1 0) \
+		debug=$(usex debug 1 0) \
+		ipv6=$(usex ipv6 1 0) \
+		opengl=$(usex opengl 1 0) \
+		sdlmixer=$(usex music 1 0) \
+		verbosebuild=1
+}
+
+src_install() {
+	local DV PROGRAM
+
+	for DV in 1 2; do
+		use descent${DV} || continue
+		PROGRAM=d${DV}x-rebirth
+
+		docinto ${PROGRAM}
+		edos2unix ${PROGRAM}/*.txt
+		dodoc ${PROGRAM}/*.txt
+
+		insinto /usr/share/games/d${DV}x
+		use opl3-musicpack && doins "${DISTDIR}"/d${DV}xr-opl3-music.dxa
+		use sc55-musicpack && doins "${DISTDIR}"/d${DV}xr-sc55-music.dxa
+		use l10n_de && doins "${DISTDIR}"/d${DV}xr-briefings-ger.dxa
+
+		dobin ${PROGRAM}/${PROGRAM}
+		make_desktop_entry ${PROGRAM} "Descent ${DV} Rebirth" ${PROGRAM}
+		doicon ${PROGRAM}/${PROGRAM}.xpm
+	done
+
+	if use textures && use descent1; then
+		insinto /usr/share/games/d1x
+		doins "${DISTDIR}"/d1xr-hires.dxa
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use data; then
+		elog "To play the game enable USE=\"data\" or manually "
+		elog "copy the files to ${EPREFIX}/usr/share/games/{d1x,d2x}."
+		elog "See each game's INSTALL.txt for details."
+		echo
+	fi
+}
diff --git a/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-flags.patch b/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-flags.patch
new file mode 100644
index 000000000000..75c3a64f893b
--- /dev/null
+++ b/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-flags.patch
@@ -0,0 +1,10 @@
+--- dxx-rebirth_v0.59.100-src/SConstruct	2016-12-12 02:47:40.000000000 +0300
++++ dxx-rebirth_v0.59.100-src/SConstruct	2016-12-28 02:11:16.657874914 +0300
+@@ -3488,7 +3488,6 @@
+ 		env = self.env
+ 		user_settings = self.user_settings
+ 
+-		env.Prepend(CXXFLAGS = ['-g', '-O2'])
+ 		# Raspberry Pi?
+ 		if user_settings.raspberrypi:
+ 			rpi_vc_path = user_settings.rpi_vc_path
diff --git a/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-sharepath.patch b/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-sharepath.patch
new file mode 100644
index 000000000000..ee1b6bb9ea05
--- /dev/null
+++ b/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-sharepath.patch
@@ -0,0 +1,11 @@
+--- dxx-rebirth_v0.59.100-src/SConstruct	2016-12-12 02:47:40.000000000 +0300
++++ dxx-rebirth_v0.59.100-src/SConstruct	2016-12-29 19:26:58.987760410 +0300
+@@ -2875,7 +2875,7 @@
+ 				return 'GLESv2'
+ 			return self.default_OGLES_LIB
+ 		def __default_DATA_DIR(self):
+-			return '%s/share/games/%s' % (self.prefix, self._program.target)
++			return '%s/share/games/%s' % (self.prefix, self._program.shortname)
+ 		def _generic_variable(key,help,default):
+ 			return (key, help, default)
+ 		def __get_configure_tests(tests,_filter=lambda s: s.name[0] != '_'):
diff --git a/games-action/dxx-rebirth/metadata.xml b/games-action/dxx-rebirth/metadata.xml
new file mode 100644
index 000000000000..b2765a3b0291
--- /dev/null
+++ b/games-action/dxx-rebirth/metadata.xml
@@ -0,0 +1,39 @@
+<?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>totktonada.ru@gmail.com</email>
+		<name>Alexander Turenko</name>
+	</maintainer>
+	<longdescription>
+		Descent 1 is a classic first-person shooter released in 1995
+		by Interplay and Parallax. Descent 2 released for the PC in
+		1996. It, along with its predecessor, was one of the first
+		games with true 3-dimensional graphics, 6 degrees of freedom
+		in movement, light sourcing, and the capability to join
+		multiplayer games on-the-fly. D1X-Rebirth and DXX-Rebirth are
+		modifications of the original Descent 1 and 2 sources that was
+		released by Parallax (and are based on the D1X and D2X
+		sources). It offering OpenGL graphics, advanced multiplayer,
+		new features, and cross-platform compatibility. Now code bases
+		of D1X-Rebirth and DXX-Rebirth merged and released as
+		DXX-Rebirth.
+	</longdescription>
+	<use>
+		<flag name="data">Install data files</flag>
+		<flag name="descent1">Install Descent 1 resources and executable</flag>
+		<flag name="descent2">Install Descent 2 resources and executable</flag>
+		<flag name="l10n_de">Provides German translations for the game's briefings, robot descriptions, and outro of the original campaign</flag>
+		<flag name="music">Enable music support</flag>
+		<flag name="opl3-musicpack">Include alternate version of the game's music, recorded with the Yamaha YMF262 OPL3 soundchip</flag>
+		<flag name="sc55-musicpack">Include alternate version of the game's music, recorded with the Roland Sound Canvas SC-55 MIDI module</flag>
+		<flag name="textures">Include high resolution (640x480) backgrounds, briefing images and fonts (Descent 1)</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">dxx-rebirth/dxx-rebirth</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/extreme-tuxracer-0.7.4 b/games-action/extreme-tuxracer-0.7.4
deleted file mode 100644
index 13e2a38ba7cd..000000000000
--- a/games-action/extreme-tuxracer-0.7.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=>=media-libs/libsfml-2.2:0= virtual/glu virtual/opengl 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 >=sys-apps/sed-4
-DESCRIPTION=High speed arctic racing game based on Tux Racer
-EAPI=6
-HOMEPAGE=http://extremetuxracer.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=media-libs/libsfml-2.2:0= virtual/glu virtual/opengl
-SLOT=0
-SRC_URI=mirror://sourceforge/extremetuxracer/etr-0.7.4.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f0e7460c0a1c4f4f4dc9ef4cf9b8cf36
diff --git a/games-action/extreme-tuxracer/Manifest b/games-action/extreme-tuxracer/Manifest
new file mode 100644
index 000000000000..3428084d1de9
--- /dev/null
+++ b/games-action/extreme-tuxracer/Manifest
@@ -0,0 +1,3 @@
+DIST etr-0.7.4.tar.xz 44179876 BLAKE2B 040554b8053e7f513526b539479dddd3740e002348e169453dcbd1cec28fa15e1abff13c1b02cbd61552d04974e3ec508b0d9b24e1162e4d113f284103b877d9 SHA512 780263859ee3510b0c421f10c190b479db62a1268def14f18ecf7ff84c470cf28f1a2b077fcb21d8bd447cde8b3a7f280aced5cd830eb3aa174b3e461e9efae1
+EBUILD extreme-tuxracer-0.7.4.ebuild 997 BLAKE2B 16fd074db622fde0032f88056bfaee43e171304e021cc9df8fce2ac3e99ca61de46add332b1327fed86dd4811977b08f1c6f3b91321cae8892ee3785ee1cd82e SHA512 c04bd93aeeb8a13726ebda37639627a3a8a20bb72f2252db17b3cadd715d0af60bed9a5d23467289193edbfd663ab76a9585aabd69275407c4c284ecac84c145
+MISC metadata.xml 527 BLAKE2B 3512706041a2f8e35680d809119af7f52e648094801a6451806317e220df0a8e64143ddb6041991e1590df4b89ab1e63b853e2ec91ac94a05bc10afb4e74d872 SHA512 b384907967acf80208014d768908547687f0820495fabdb71e938fb07521ab6f7ec017857e92b3cd2f46c8ffd8ff4634bf1bdc6beaa789329c5b5302f2cdc0cf
diff --git a/games-action/extreme-tuxracer/extreme-tuxracer-0.7.4.ebuild b/games-action/extreme-tuxracer/extreme-tuxracer-0.7.4.ebuild
new file mode 100644
index 000000000000..f6ca77b5dc89
--- /dev/null
+++ b/games-action/extreme-tuxracer/extreme-tuxracer-0.7.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils autotools gnome2-utils
+
+DESCRIPTION="High speed arctic racing game based on Tux Racer"
+HOMEPAGE="http://extremetuxracer.sourceforge.net/"
+SRC_URI="mirror://sourceforge/extremetuxracer/etr-${PV/_/}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/libsfml-2.2:0=
+	virtual/glu
+	virtual/opengl
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/etr-${PV/_/}"
+
+src_prepare() {
+	default
+	# kind of ugly in there so we'll do it ourselves
+	sed -i -e '/SUBDIRS/s/resources doc//' Makefile.am || die
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc doc/{code,courses_events,guide,score_algorithm}
+	doicon -s 48 resources/etr.png
+	doicon -s scalable resources/etr.svg
+	domenu resources/etr.desktop
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-action/extreme-tuxracer/metadata.xml b/games-action/extreme-tuxracer/metadata.xml
new file mode 100644
index 000000000000..d2f791335717
--- /dev/null
+++ b/games-action/extreme-tuxracer/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="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<longdescription lang="en">
+Extreme Tux Racer is an open source racing game featuring Tux the Linux Penguin.
+ETRacer continues in the tracks of Tux Racer and its forks.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">extremetuxracer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/fakk2-1.02-r1 b/games-action/fakk2-1.02-r1
deleted file mode 100644
index 7aa7c0f40ca3..000000000000
--- a/games-action/fakk2-1.02-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst setup
-DESCRIPTION=3D third-person action shooter based on the Heavy Metal comics/movies
-EAPI=6
-HOMEPAGE=http://www.lokigames.com/products/fakk2/
-IUSE=nocd
-KEYWORDS=~x86
-LICENSE=LOKI-EULA
-PROPERTIES=interactive
-RDEPEND=virtual/opengl
-RESTRICT=strip
-SLOT=0
-_eclasses_=cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=267f43ea65dc4373e42a43bd2e49fe4d
diff --git a/games-action/fakk2/Manifest b/games-action/fakk2/Manifest
new file mode 100644
index 000000000000..e626e8c64035
--- /dev/null
+++ b/games-action/fakk2/Manifest
@@ -0,0 +1,2 @@
+EBUILD fakk2-1.02-r1.ebuild 1662 BLAKE2B a5f89834da712fbc95fbce9934a08b51c806937042e0d8df372427e6a24293455c7335bc1b3f354ce0140630b5ce2086904032c718a60c924e699137755727ea SHA512 60f1588dec82c4bfce2c02ed0ee8668d32aeaacee540084611f2b85aec46c1964cfb3d73e604b6bc7ee2187ddd6c3ec5a8cc0b4ed1921aee42f14181f9a336c8
+MISC metadata.xml 1206 BLAKE2B a3c0be20590459e2401b791c4c1211f7155d4e76f34757ad180c9626729f431ee77a00a30b25076cef69705e64cd54ca581d147132f2c8323b9053013255d5a8 SHA512 786927f7a429e4ff1f1097144f41b832b7d8bd8fd1423dd5587d3c496a2ed4be66aa34702e360c702f536429ceed38082475529392c5e0ef389aa431d2595432
diff --git a/games-action/fakk2/fakk2-1.02-r1.ebuild b/games-action/fakk2/fakk2-1.02-r1.ebuild
new file mode 100644
index 000000000000..b038c25d14ee
--- /dev/null
+++ b/games-action/fakk2/fakk2-1.02-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils cdrom
+
+DESCRIPTION="3D third-person action shooter based on the Heavy Metal comics/movies"
+HOMEPAGE="http://www.lokigames.com/products/fakk2/"
+SRC_URI=""
+
+LICENSE="LOKI-EULA"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="nocd"
+RESTRICT="strip"
+
+RDEPEND="virtual/opengl"
+
+S=${WORKDIR}
+
+dir=/opt/${PN}
+Ddir=${D}/${dir}
+
+pkg_setup() {
+	if use nocd ; then
+		ewarn "The installed game takes about 378MB of space!"
+	fi
+}
+
+src_install() {
+	cdrom_get_cds fakk
+	einfo "Copying files... this may take a while..."
+	exeinto "${dir}"
+	doexe ${CDROM_ROOT}/bin/x86/glibc-2.1/${PN}
+	insinto "${dir}"
+	doins ${CDROM_ROOT}/{README,icon.{bmp,xpm}}
+	exeinto "${dir}"/fakk
+	doexe ${CDROM_ROOT}/bin/x86/glibc-2.1/fakk/{c,f}game.so
+	if use nocd ; then
+		insinto "${dir}"/fakk
+		doins ${CDROM_ROOT}/fakk/pak{0,1,2,3}.pk3
+		doins ${CDROM_ROOT}/fakk/default.cfg
+	fi
+
+	# Now, since these files are coming off a cd, the times/sizes/md5sums won't
+	# be different ... that means portage will try to unmerge some files (!)
+	# So, we run touch on ${D} to make sure portage doesn't do any such thing
+	find "${Ddir}" -exec touch '{}' \;
+
+	make_wrapper ${PN} ./${PN} "${dir}" "${dir}"
+	newicon ${CDROM_ROOT}/icon.xpm ${PN}.xpm
+
+	make_desktop_entry ${PN} "FAKK2" ${PN}
+}
+
+pkg_postinst() {
+	echo
+	ewarn "There are two possible security bugs in this package, both causing a denial of"
+	ewarn "service.  One affects the game when running a server, the other when running as"
+	ewarn "a client.  For more information, see bug #82149."
+	echo
+	elog "To play the game run:"
+	elog " fakk2"
+}
diff --git a/games-action/fakk2/metadata.xml b/games-action/fakk2/metadata.xml
new file mode 100644
index 000000000000..07964f9113c6
--- /dev/null
+++ b/games-action/fakk2/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>
+<longdescription>
+Heavy Metal: F.A.K.K.2 is a third-person 3-D action game based on characters from the Heavy Metal comics and movies.  Years have passed since Julie Strain (a.k.a. F.A.K.K.2) defeated the would-be God Lord Tyler on the bloody battlefields of the Holy Land. She has long since put the pain of those days behind her and brought her homeworld of Eden to a perfect natural balance. But far away in the deepest nebulas of space, the greatest evil of all stirs, ready to make its final move -- to take control of the entire universe. A lone beacon hurtles toward Eden, hoping to summon the god-slayer F.A.K.K.2 one last time. It bears nothing more than an onimous warning: "GITH IS COMING."  The game was ported to Linux by the now defunct Loki Entertainment and is commercial software.  You can still pick up a copy from Tuxgames (http://www.tuxgames.com), but supplies are limited, as the publisher is no longer in business.
+</longdescription>
+</pkgmetadata>
diff --git a/games-action/formido-1.0.1-r1 b/games-action/formido-1.0.1-r1
deleted file mode 100644
index d4164b7d1075..000000000000
--- a/games-action/formido-1.0.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image media-libs/sdl-mixer
-DESCRIPTION=A shooting game in the spirit of Phobia games
-EAPI=6
-HOMEPAGE=http://www.mhgames.org/oldies/formido/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image media-libs/sdl-mixer
-SLOT=0
-SRC_URI=http://noe.falzon.free.fr/prog/formido-1.0.1.tar.gz http://koti.mbnet.fi/lsoft/formido/formido-music.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_=77c85c8935f572dfef5ff8aba4638e38
diff --git a/games-action/formido/Manifest b/games-action/formido/Manifest
new file mode 100644
index 000000000000..6a5b821a6eb9
--- /dev/null
+++ b/games-action/formido/Manifest
@@ -0,0 +1,4 @@
+DIST formido-1.0.1.tar.gz 3117496 BLAKE2B 19ba27513cb1ad28c2e1fdb80c956bb752b6a7515580d78de95d65a0e75d27c0ff780dc2b6ed2e0227570183976c2a5c6478218311af494139366e77a998fdc3 SHA512 72c4b92806eed79290da571c47fcd5427ccd0fafd3d5c5bc1cf641790e13b622eb40f8226e54daf30d1f301743f670115efe8f30279ed83b8fd58d69b6a7e123
+DIST formido-music.tar.bz2 6159005 BLAKE2B 606a0eee0728ef38f94acde72be33914ca22762b78452c25c846fde950e1d694a381aa41cbc8a56d78719876304add14ac983483800f138f4407e9e7bfbc8b5a SHA512 116ff8af42b68cf641f459b642d42c579decf8ee1314a45de30d4f5452e1669dab5cfdc3a61a72359305f690e686312ea0e1666e724de8b214f3d4d8f6034bd3
+EBUILD formido-1.0.1-r1.ebuild 1075 BLAKE2B a33854a221d204c4224425d9074a65f90b7d0e44970dc8a36ef33ce6f7c2b1fbb4facb91e060f5d2e49fc88ed1c27d4b2df896e7a9eb87992d703edefe4feedc SHA512 f35d0d8d13f0201d0d67bcc6dcc7ee967f4154b568e8006b4a020c97f861dc715fb9e856243ead8c8c00a83ac5897c204965f88b727c79b9e345b8fa0cc5dbed
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/formido/formido-1.0.1-r1.ebuild b/games-action/formido/formido-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..c7e9e86f1740
--- /dev/null
+++ b/games-action/formido/formido-1.0.1-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A shooting game in the spirit of Phobia games"
+HOMEPAGE="http://www.mhgames.org/oldies/formido/"
+SRC_URI="http://noe.falzon.free.fr/prog/${P}.tar.gz
+	http://koti.mbnet.fi/lsoft/formido/formido-music.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT=0
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl[sound,video]
+	media-libs/sdl-image
+	media-libs/sdl-mixer"
+RDEPEND=${DEPEND}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"/data || die
+	unpack ${PN}-music.tar.bz2
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s:g++:$(tc-getCXX):" \
+		-e "/^FLAGS=/s:$: ${CXXFLAGS}:" \
+		-e "/^LINKFLAGS=/s:=.*:=${LDFLAGS}:" \
+		-e "s:\${DATDIR}:/usr/share/${PN}/data:" \
+		-e "s:\${DEFCONFIGDIR}:/usr/share/${PN}:" \
+		Makefile || die
+}
+
+src_install() {
+	dobin ${PN}
+	insinto /usr/share/${PN}
+	doins -r ${PN}.cfg data
+	newicon data/icon.dat ${PN}.bmp
+	make_desktop_entry ${PN} Formido /usr/share/pixmaps/${PN}.bmp
+	dodoc README README-1.0.1
+}
diff --git a/games-action/formido/metadata.xml b/games-action/formido/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-action/formido/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-action/garden-1.0.9-r1 b/games-action/garden-1.0.9-r1
deleted file mode 100644
index 56dbead8e361..000000000000
--- a/games-action/garden-1.0.9-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=<media-libs/allegro-5 >=sys-apps/sed-4 >=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=Multiplatform vertical shoot-em-up with non-traditional elements
-EAPI=6
-HOMEPAGE=http://garden.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=<media-libs/allegro-5
-SLOT=0
-SRC_URI=mirror://sourceforge/garden/garden-1.0.9.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=366244828c23aae88fdf03322df66b28
diff --git a/games-action/garden/Manifest b/games-action/garden/Manifest
new file mode 100644
index 000000000000..4987ccfa559d
--- /dev/null
+++ b/games-action/garden/Manifest
@@ -0,0 +1,5 @@
+AUX garden-1.0.9-dash.patch 968 BLAKE2B a743565fe606251d2b5506a51fdb2683ed5a71beb078f0e32563c3a4e411183280b4184a507f90f26048dbcf8619a04157b2a7f50ed5150c5152426678dec5e0 SHA512 1033ce1f4056ee07203b739e852d777e35f908548c0fe582be27c38dac8227e4761a2fa80bc71d5bfe8ce09853f8250a6c745d99e02c70aad1e3b2a35b1188d5
+AUX garden-1.0.9-resources.patch 200 BLAKE2B 83053911919ac1b0e9ae87f612cdc1bb936b6e3ad20605dde41cbaf342d817904384ced5cffb6f223e1b964ca63f714fb5585ffadd267edb7edbf4c941c7c069 SHA512 f9ecabf264c60eab75ffdc3c2d875d1809f446eb86118432e67d19c0b3189f4200a28fcc1e798919dcf5472ac21f47c37a779a39d6cbc8b373811dffa6e5d904
+DIST garden-1.0.9.tar.gz 2714783 BLAKE2B e6d7c54db88e4683e760f53c2d58f68be7bcde08445dba4edabd85c7d4032f7000225ddfcb3f9f2cbc424216fe03bca5d81f0878be13849bf36a8360b0f4b711 SHA512 e8f52fc0ebf9eaa7933ae1faa5610e8a27a5e7cfc59d033714c4306a53680feeddd52b1fb3050f2d72addba03ee383e71e57eac02270f3d2369aed054a9a9848
+EBUILD garden-1.0.9-r1.ebuild 1006 BLAKE2B 4552c5773d72efbdfcad6e097846734ea04464687b6d352891c2d986b3e7dc6a22af3b3e2414f6378aaf55af9331a6d07a90aa95fa273400202977b75bb23be2 SHA512 81d8811786facf5b0651f17fc32caa7748c57909cede7b3cb965d65dba1d354188fcaf39936f509c8d079c92ae3fa2b31a4f538bc4b656d3ffb0f8e9c21cdfb5
+MISC metadata.xml 329 BLAKE2B 5ea0479d19fbe4a39186a5fa10b2114ec9fc7d4e7026d34ceab239f0c25b2a03da1b670b44b4e088ccefd35dc680b0e38d11963ae09113bb55403b33be05eaf8 SHA512 af05d41aaf7aa63a304e442bb6e6dd4617409434ae439ec14461739362bc0d4ebf03dc791435586dddfec81273a19bea91a78f7ccd573f420ea67d59665e69d7
diff --git a/games-action/garden/files/garden-1.0.9-dash.patch b/games-action/garden/files/garden-1.0.9-dash.patch
new file mode 100644
index 000000000000..6b197f4f4e1a
--- /dev/null
+++ b/games-action/garden/files/garden-1.0.9-dash.patch
@@ -0,0 +1,33 @@
+--- a/configure.ac	2015-05-04 14:48:03.467935640 -0400
++++ b/configure.ac	2015-05-04 14:48:24.729199607 -0400
+@@ -80,7 +80,7 @@
+ 		       [have_allegro="no"])
+ 	AC_MSG_RESULT([$have_allegro])
+ 	LIBS=$LIBS_SAVE
+-	AS_IF([test "x$have_allegro" == "xyes"],
++	AS_IF([test "x$have_allegro" = "xyes"],
+ 	      [return 0],
+ 	      [return 1])
+ }
+@@ -89,7 +89,7 @@
+ AM_PATH_ALLEGRO([4.2.0]) 
+ 
+ try_link_allegro "$allegro_LIBS"
+-AS_IF([test "x$?" == "x0"],
++AS_IF([test "x$?" = "x0"],
+       [[LIBS="$LIBS $allegro_LIBS"
+        ALLEGRO_LIB=`echo $allegro_LIBS | sed -e 's/-l\([^[:blank:]]*\).*/\1/'`
+        have_allegro="yes"]])
+@@ -103,10 +103,10 @@
+ for lib in $ALLEGRO_LIBS
+ do
+ 	ldflag="-l$lib"
+-	AS_IF([test "x$have_allegro" == "xyes"],
++	AS_IF([test "x$have_allegro" = "xyes"],
+ 	      [break])
+ 	try_link_allegro $ldflag
+-	AS_IF([test "x$?" == "x0"],
++	AS_IF([test "x$?" = "x0"],
+ 	      [LIBS="$LIBS $ldflag"
+ 	       ALLEGRO_LIB="$lib"
+ 	       have_allegro="yes"])
diff --git a/games-action/garden/files/garden-1.0.9-resources.patch b/games-action/garden/files/garden-1.0.9-resources.patch
new file mode 100644
index 000000000000..0ddbdc5e6e30
--- /dev/null
+++ b/games-action/garden/files/garden-1.0.9-resources.patch
@@ -0,0 +1,7 @@
+--- a/Makefile.am	2015-05-04 16:57:07.510191036 -0400
++++ b/Makefile.am	2015-05-04 16:57:14.581946228 -0400
+@@ -1,3 +1,3 @@
+ ACLOCAL_AMFLAGS= -I m4
+ 
+-SUBDIRS = src resources data
++SUBDIRS = src data
diff --git a/games-action/garden/garden-1.0.9-r1.ebuild b/games-action/garden/garden-1.0.9-r1.ebuild
new file mode 100644
index 000000000000..eb80fe0b36ba
--- /dev/null
+++ b/games-action/garden/garden-1.0.9-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils gnome2-utils autotools flag-o-matic
+
+DESCRIPTION="Multiplatform vertical shoot-em-up with non-traditional elements"
+HOMEPAGE="http://garden.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="<media-libs/allegro-5"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-dash.patch"
+	"${FILESDIR}/${P}-resources.patch"
+)
+src_prepare() {
+	default
+
+	# build with gcc52
+	sed -i \
+		-e 's/inline/extern inline/' \
+		src/stuff.h || die
+	eautoreconf
+	append-cflags -std=gnu89 # build with gcc5 (bug #572672)
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog NEWS README" \
+		default
+	doicon -s scalable resources/garden.svg
+	make_desktop_entry garden "Garden of coloured lights"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-action/garden/metadata.xml b/games-action/garden/metadata.xml
new file mode 100644
index 000000000000..ea6aa407a062
--- /dev/null
+++ b/games-action/garden/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">garden</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/geki2-KXL-2.0.3-r3 b/games-action/geki2-KXL-2.0.3-r3
deleted file mode 100644
index bc58ff976f8c..000000000000
--- a/games-action/geki2-KXL-2.0.3-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=dev-games/KXL >=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=2D length scroll shooting game
-EAPI=6
-HOMEPAGE=http://triring.net/ps2linux/games/kxl/kxlgames.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-games/KXL media-fonts/font-adobe-100dpi
-SLOT=0
-SRC_URI=mirror://gentoo/geki2-KXL-2.0.3.tar.gz mirror://gentoo/geki2-KXL.png
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=362faf1a62d396fb8d85cdbc64c1c93a
diff --git a/games-action/geki2-KXL/Manifest b/games-action/geki2-KXL/Manifest
new file mode 100644
index 000000000000..1a02bbacb023
--- /dev/null
+++ b/games-action/geki2-KXL/Manifest
@@ -0,0 +1,6 @@
+AUX geki2-KXL-2.0.3-cflags.patch 343 BLAKE2B 532233ad227a58aae86b8c8b4565680bdeab360f0cfb0eb1574310525a25d2d0fa3007ddaad220537a8ce9cd76de0ee1647ff343aa0cd8da386c594eb1a37e7b SHA512 8a3226a158bfff91328b53bb203b5de8cb2d1557dc765d41559679ac2e7ec6bc7c3c6e34793a1229331cb7090b7ecf222e09fc0383792188afd190b5f1634540
+AUX geki2-KXL-2.0.3-paths.patch 1576 BLAKE2B f4760e10071a7e6d316c1f1d7c5ec87f81a35b37c0ae12f7972f44212e495d3308794490edb693859ee63aa8cb85820c87ae1c2c4dbdc8cf2836de25f82710f1 SHA512 6165f119e3fc5359f4e9b674ca4df3b0f6784f6328262a65b714080f37799c3ccc8271df35e7531f13b907c0a7ab2b0bcc01b08a9887a4e81a5923777d86a4ca
+DIST geki2-KXL-2.0.3.tar.gz 708419 BLAKE2B 4b155a518e8dc662ff831c25ec83e3c2f912403f21ca048310b6351e489182ede7001804a5cfc6df475a8291fe37596483680c601e1149ec2968ba6837ecf6b2 SHA512 15d97e72f7490b0a1fa32f3ce002f99fe88183664cb3833bb6a2513de26a0dfb0cd2e723c59d0b6bdd9620b200da2e0e7612d44c02fd1be8721441417a9cb3e5
+DIST geki2-KXL.png 883 BLAKE2B 584a8d91d3c6c5fc924a1f8aed1e52c621dd68b0ea149d58ce17251e8caa0b092bd7cf880d3023338b97d3bbb2a30223ed303ed5f511f8e533fc0fa6b168aec2 SHA512 20d58e6cc3fd5b6283e6042f8660c73b5a938157ab871dd78e7a2ea2c1187ecae63bcfd46b885255181028531ebbba2c2bf93138e311adf7be10026497a85b74
+EBUILD geki2-KXL-2.0.3-r3.ebuild 996 BLAKE2B c6a24f6fe2e4458611ce5c35468ad2ad5d401d127b50d88ea2d2bee91cc061e1bcec1300db2dce833ee8e88f255b4c21a2fc097c4ed916b11e45224e710c93f2 SHA512 b8b14bd2da8bf17aa9d78d94cccb854d0da2a49089b70bf9846992623bb721ab27a86e3d9a1019789270bbf4d5a648bf8059ba50a219ee500311a05f92355f7f
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/geki2-KXL/files/geki2-KXL-2.0.3-cflags.patch b/games-action/geki2-KXL/files/geki2-KXL-2.0.3-cflags.patch
new file mode 100644
index 000000000000..d00f8d439c80
--- /dev/null
+++ b/games-action/geki2-KXL/files/geki2-KXL-2.0.3-cflags.patch
@@ -0,0 +1,9 @@
+--- a/src/Makefile.am	2012-11-10 21:50:02.159117541 +0100
++++ b/src/Makefile.am	2012-11-10 21:50:20.658715770 +0100
+@@ -4,5 +4,5 @@
+ 	        boss.h extern.h ranking.h your.h game.h\
+ 	        geki2.h load.h opening.h my.h misc.h
+ 
+-CFLAGS = @X_CFLAGS@ @KXL_CFLAGS@
++AM_CFLAGS = @X_CFLAGS@ @KXL_CFLAGS@
+ LIBS = @X_LIBS@ -lX11 @KXL_LIBS@ -lKXL
diff --git a/games-action/geki2-KXL/files/geki2-KXL-2.0.3-paths.patch b/games-action/geki2-KXL/files/geki2-KXL-2.0.3-paths.patch
new file mode 100644
index 000000000000..22844202bb2c
--- /dev/null
+++ b/games-action/geki2-KXL/files/geki2-KXL-2.0.3-paths.patch
@@ -0,0 +1,44 @@
+--- a/bmp/Makefile.am
++++ b/bmp/Makefile.am
+@@ -1,4 +1,4 @@
+-bmpdir = $(prefix)/share/geki2/bmp
++bmpdir = $(BMP_PATH)
+ bmp_DATA =   back1.bmp boss2.bmp enemyshot4.bmp kuru.bmp myshot.bmp back2.bmp\
+ 	     boss3.bmp enemyshot5.bmp mboss.bmp uraura.bmp back3.bmp\
+ 	     boss3laser.bmp flash.bmp uturn.bmp back4.bmp back6.bmp boss6.bmp\
+--- a/configure.in
++++ b/configure.in
+@@ -25,9 +25,9 @@
+         BMP_PATH=/usr/local/share/geki2/bmp
+         WAV_PATH=/usr/local/share/geki2/wav
+ else
+-        DATA_PATH=$prefix/share/geki2/data
+-        BMP_PATH=$prefix/share/geki2/bmp
+-        WAV_PATH=$prefix/share/geki2/wav
++        DATA_PATH=$datadir/geki2/data
++        BMP_PATH=$datadir/geki2/bmp
++        WAV_PATH=$datadir/geki2/wav
+ fi
+ AC_DEFINE_UNQUOTED(DATA_PATH,"$DATA_PATH")
+ AC_DEFINE_UNQUOTED(BMP_PATH,"$BMP_PATH")
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -1,9 +1,7 @@
+-datadir = $(prefix)/share/geki2/data
++datadir = $(DATA_PATH)
+ data_DATA = stage1.dat stage2.dat stage3.dat stage4.dat stage5.dat stage6.dat\
+ 	    map1.dat map2.dat map3.dat map4.dat map5.dat map6.dat
+ EXTRA_DIST = stage1.dat stage2.dat stage3.dat stage4.dat stage5.dat stage6.dat\
+ 	    map1.dat map2.dat map3.dat map4.dat map5.dat map6.dat .score
+ 
+-install:
+-	$(INSTALL) -c -m 666 ./.score $(DESTDIR)$(DATA_PATH)
+ 
+--- a/wav/Makefile.am
++++ b/wav/Makefile.am
+@@ -1,4 +1,4 @@
+-wavdir = $(prefix)/share/geki2/wav
++wavdir = $(WAV_PATH)
+ wav_DATA =   bgm1.wav bgm2.wav bgm3.wav bgm4.wav bgm5.wav\
+ 	     bomb.wav laser5.wav warning.wav boss.wav open.wav\
+ 	     laser.wav pow.wav go.wav bgm6.wav
diff --git a/games-action/geki2-KXL/geki2-KXL-2.0.3-r3.ebuild b/games-action/geki2-KXL/geki2-KXL-2.0.3-r3.ebuild
new file mode 100644
index 000000000000..fe44b06c04b0
--- /dev/null
+++ b/games-action/geki2-KXL/geki2-KXL-2.0.3-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils user
+
+DESCRIPTION="2D length scroll shooting game"
+HOMEPAGE="http://triring.net/ps2linux/games/kxl/kxlgames.html"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	mirror://gentoo/${PN}.png"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-games/KXL"
+RDEPEND="${DEPEND}
+	media-fonts/font-adobe-100dpi"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-paths.patch
+)
+
+pkg_setup(){
+	enewgroup gamestat 36
+}
+
+src_prepare() {
+	default
+	rm -f missing
+	sed -i \
+		-e '1i #include <string.h>' \
+		-e "s:DATA_PATH \"/.score\":\"/var/games/${PN}\":" \
+		src/ranking.c || die
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	insinto /var/games/
+	newins data/.score ${PN}
+	fowners root:gamestat /var/games/${PN} /usr/bin/geki2
+	fperms 660 /var/games/${PN}
+	fperms 2755 /usr/bin/geki2
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry geki2 Geki2
+}
diff --git a/games-action/geki2-KXL/metadata.xml b/games-action/geki2-KXL/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-action/geki2-KXL/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-action/geki3-KXL-1.0.3-r3 b/games-action/geki3-KXL-1.0.3-r3
deleted file mode 100644
index 6230e8131267..000000000000
--- a/games-action/geki3-KXL-1.0.3-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=dev-games/KXL >=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=2D length scroll shooting game
-EAPI=6
-HOMEPAGE=http://triring.net/ps2linux/games/kxl/kxlgames.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-games/KXL media-fonts/font-adobe-100dpi
-SLOT=0
-SRC_URI=mirror://gentoo/geki3-KXL-1.0.3.tar.gz mirror://gentoo/geki3-KXL.png
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5a73b5e3c3d60164747e06934b0e569f
diff --git a/games-action/geki3-KXL/Manifest b/games-action/geki3-KXL/Manifest
new file mode 100644
index 000000000000..3df9ea5cf9e9
--- /dev/null
+++ b/games-action/geki3-KXL/Manifest
@@ -0,0 +1,5 @@
+AUX geki3-KXL-1.0.3-paths.patch 1428 BLAKE2B 60b6dad603f917d3acdc722759a3e40857630d003cb2fe071590e04e4e610a5fe2c79e5e7957fa3f3f2747a2c27254440f93601ce79f3b70cc17567170267b55 SHA512 6189a5a49ca7792406dffbabf7e792ad6e14cc43019a654e4977f1b3f2d371201f432a0a338b4e297bc9498666412cd000ca57442129f53f277c716c18770fb7
+DIST geki3-KXL-1.0.3.tar.gz 695913 BLAKE2B 92cb420b93efb5cf96964cbf091b979b6cdcd54e70d9dd34c87a201409f4820c98254cdfb50b84b140ab5dcac0d62aadc49c6466ba55aa20be1f1254866d3c00 SHA512 23433c40bb800fa6da132a87dc89ed18c156dba44f3479be39b00ac48942cbf9e3ae7318149d3184f4ba8c340c937fa44e334dad5c8e800b9906bd26cdd34fd7
+DIST geki3-KXL.png 1142 BLAKE2B 17664d3614a88c80e8aca0da99e3a45894e9e6eb3b705fb4aad7d2663ce46c51ee6d5a64bbf67de42eae73ee75ce8308de3cab739b732cde7a5c66b83c45f0ba SHA512 bb78a188954e530638ebf3ded88a8a19402081d071341924f57b3cc1721de523cf099eac2585ea5a5dd0b86e67f68260d469db06408e86aea68e4950526103bd
+EBUILD geki3-KXL-1.0.3-r3.ebuild 1061 BLAKE2B 1dc3e7e35d6950f0ac33d78ec02dd307938ddf8d8fc758e60ef6450e2226aeecba0d5ab806c7e3fe556bcbe78c5075c0eb827b8c539aac04151df84b67e20f60 SHA512 52551af57d1ddf8d1404019a19e7500f673170bff4dfa5d28a026e96de382306fe312b0341ad3401d778c26efdf5d385ce4d08b7695a46c3a7d2681b9789a46b
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/geki3-KXL/files/geki3-KXL-1.0.3-paths.patch b/games-action/geki3-KXL/files/geki3-KXL-1.0.3-paths.patch
new file mode 100644
index 000000000000..26f3f4371b85
--- /dev/null
+++ b/games-action/geki3-KXL/files/geki3-KXL-1.0.3-paths.patch
@@ -0,0 +1,41 @@
+--- a/bmp/Makefile.am
++++ b/bmp/Makefile.am
+@@ -1,4 +1,4 @@
+-bmpdir = $(prefix)/share/geki3/bmp
++bmpdir = $(BMP_PATH)
+ bmp_DATA =   back1.bmp boss2.bmp enemyshot1.bmp missile.bmp\
+ 	     pata.bmp back2.bmp boss3.bmp enemyshot2.bmp mogu.bmp\
+              pata_ball.bmp back3.bmp boss4.bmp frame.bmp mogu_ball.bmp\
+--- a/configure.in
++++ b/configure.in
+@@ -25,9 +25,9 @@
+         BMP_PATH=/usr/local/share/geki3/bmp
+         WAV_PATH=/usr/local/share/geki3/wav
+ else
+-        DATA_PATH=$prefix/share/geki3/data
+-        BMP_PATH=$prefix/share/geki3/bmp
+-        WAV_PATH=$prefix/share/geki3/wav
++        DATA_PATH=$datadir/geki3/data
++        BMP_PATH=$datadir/geki3/bmp
++        WAV_PATH=$datadir/geki3/wav
+ fi
+ AC_DEFINE_UNQUOTED(DATA_PATH,"$DATA_PATH")
+ AC_DEFINE_UNQUOTED(BMP_PATH,"$BMP_PATH")
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -1,6 +1,4 @@
+-datadir = $(prefix)/share/geki3/data
++datadir = $(DATA_PATH)
+ data_DATA = stage1.dat stage2.dat stage3.dat stage4.dat
+ EXTRA_DIST = stage1.dat stage2.dat stage3.dat stage4.dat .score
+ 
+-install:
+-	$(INSTALL) -c -m 666 ./.score $(DESTDIR)$(DATA_PATH)
+--- a/wav/Makefile.am
++++ b/wav/Makefile.am
+@@ -1,4 +1,4 @@
+-wavdir = $(prefix)/share/geki3/wav
++wavdir = $(WAV_PATH)
+ wav_DATA =   bgm1.wav bgm2.wav bgm3.wav bgm4.wav boom.wav boss.wav go.wav \
+ 	     laser.wav open.wav pow.wav warning.wav
+ EXTRA_DIST = bgm1.wav bgm2.wav bgm3.wav bgm4.wav boom.wav boss.wav go.wav \
diff --git a/games-action/geki3-KXL/geki3-KXL-1.0.3-r3.ebuild b/games-action/geki3-KXL/geki3-KXL-1.0.3-r3.ebuild
new file mode 100644
index 000000000000..e4a7bf505b6d
--- /dev/null
+++ b/games-action/geki3-KXL/geki3-KXL-1.0.3-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils user
+
+DESCRIPTION="2D length scroll shooting game"
+HOMEPAGE="http://triring.net/ps2linux/games/kxl/kxlgames.html"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	mirror://gentoo/${PN}.png"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-games/KXL"
+RDEPEND="${DEPEND}
+	media-fonts/font-adobe-100dpi"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-paths.patch
+)
+
+pkg_setup(){
+	enewgroup gamestat 36
+}
+
+src_prepare() {
+	default
+	rm -f missing
+	sed -i \
+		-e '1i #include <string.h>' \
+		-e "s:DATA_PATH \"/.score\":\"/var/games/${PN}\":" \
+		src/ranking.c || die
+	sed -i -e '/CFLAGS/s/$/ @CFLAGS@/' src/Makefile.am || die #bug 426890
+	mv configure.{in,ac}
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	insinto /var/games/${PN}
+	newins data/.score ${PN}
+	fowners root:gamestat /var/games/${PN} /usr/bin/geki3
+	fperms 660 /var/games/${PN}
+	fperms 2755 /usr/bin/geki3
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry geki3 Geki3
+}
diff --git a/games-action/geki3-KXL/metadata.xml b/games-action/geki3-KXL/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-action/geki3-KXL/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-action/gltron-0.70-r2 b/games-action/gltron-0.70-r2
deleted file mode 100644
index 96a1feda47b8..000000000000
--- a/games-action/gltron-0.70-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/libmikmod media-libs/libpng:0 media-libs/libsdl[sound,video] media-libs/sdl-mixer[vorbis] media-libs/sdl-sound[vorbis,mikmod] media-libs/smpeg virtual/opengl
-DESCRIPTION=3d tron, just like the movie
-EAPI=6
-HOMEPAGE=http://gltron.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libmikmod media-libs/libpng:0 media-libs/libsdl[sound,video] media-libs/sdl-mixer[vorbis] media-libs/sdl-sound[vorbis,mikmod] media-libs/smpeg virtual/opengl
-SLOT=0
-SRC_URI=mirror://sourceforge/gltron/gltron-0.70-source.tar.gz mirror://gentoo/gltron.png
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=24554fef67e4657f2b68a99bb916a72c
diff --git a/games-action/gltron/Manifest b/games-action/gltron/Manifest
new file mode 100644
index 000000000000..a40cd40f4707
--- /dev/null
+++ b/games-action/gltron/Manifest
@@ -0,0 +1,8 @@
+AUX gltron-0.70-configure.patch 622 BLAKE2B 668ad864c79d338a4d3b2fe541961ad5dcb8c7d520ffbaf6fafec6cb663d9e8f27be1ccc2d7c8b29d591908a8ed2b49aba9c7c691445a58c52a8129b0f90a85a SHA512 c883589e1b54a98685bde729633077bae22834713d19d2b49ef0d9de57fa136a9808dbb491233902181feda4b522cc6fafe8ebbe09827e7bc3fe232c931cb5ba
+AUX gltron-0.70-debian.patch 885 BLAKE2B d837bd1dc32b1b9e9ad07acee573b6bec3f1eae4a244400da099f818349b2825710e87776d93817c08edf85af326c3f344ae447871448469e6822a086dbffd80 SHA512 1b3017735a48a0ff7fa837d777cda3dd50336520b7131d2c25a8be63940d1372e60d51fe96aae42c9b2c6c34810da9127d6a3f69d6a1cc8a4ff5aa480435727a
+AUX gltron-0.70-gcc49.patch 259 BLAKE2B 288d09fb2933a253ec2749ddff5170d4f1181f8f3f37420647be3d9f4c9b824c6be8d0f94cae25780415dd3a8068402d4fc0d3948a9ccf4e4886212d65d2488b SHA512 bd02b07edf56c3f2e6cb2b22e840dd7a8a6e83b1752580df5f20faadc9b8fb489822733c63ef26476af59a12413e902a547cd3bec893abacabc354379a3b952c
+AUX gltron-0.70-prototypes.patch 629 BLAKE2B 0fbaf68a5bd481be42b7eb389875a017b82421bc0d913beff254a377bb058960d5aad63e53133e867062b5f2280d4449ea0993b82da782b2ebb32586110b080c SHA512 54db68b1d16be029db3314f11da25ee3d3ef1ed4197a702e8d12e753bf1a842268c129784d3d8706347281005a00607572e191fac5215060c1554b69cfee20e5
+DIST gltron-0.70-source.tar.gz 2182440 BLAKE2B ad58f6bca17f7eda1c2daadc395d6f1333926ed389d1a2f362fc5b27b37c4ce144cea7dcad4ec2abeee9197d3e944b71b1e903d5b79dfad5a4b26125a5461233 SHA512 297708a145d995bfd186f1745ffa674ab44238e8c2fb627245de3c1602f578afdd9223fae696107769b3b29da476cd9623ee37183618bfb13a9a9cfa59e41bf2
+DIST gltron.png 7570 BLAKE2B 30e71b3ebb269228e264bdd6dc45c08d25ffd8cba3f91fb36129820f8b79c40073b22a0d202d4d440d1f27106edfeb3723c2963178a6d9084af274015796ac8e SHA512 d83eb90b4d070d4dc5e93bf90cf81629b6a8bb200ca5e2963b757e282aeae62288560a6ded6159a170c301f0119592ac743a15ab604a6ba98a4ee93d00c02d0a
+EBUILD gltron-0.70-r2.ebuild 1096 BLAKE2B 24fc37385be111fedb32a1755f775df603a32ba48f7ec7eef2bc49816b2d0cbc5956134226eecc9ecc645b42946e42301b032ca804785168639e22a2325436dd SHA512 82fa2317d66aeb083829978ce5d01f3194ebcb22de0690045c652ede47c315c329c41f528cc0ddc57bb3336c228305245cddfce27d485263756b84baa39cbbee
+MISC metadata.xml 329 BLAKE2B 1e70d0e1f5bb709921a826cdef9fb7bd7c600e91d3f9310efb77712eaa2e878a7b39d048e9c4785d9101d60d8be02ef83dc214f9f08e3e1e01f220b8b4531425 SHA512 118d8a5ce83c678a0a0e73b0a3932a24cffd2fef16949dfa986f16e34cad89929f9d0daed1db9945af0f515e9b5da7961cb9a61b19ea1846ed085fa414a24f80
diff --git a/games-action/gltron/files/gltron-0.70-configure.patch b/games-action/gltron/files/gltron-0.70-configure.patch
new file mode 100644
index 000000000000..5bdef979a57f
--- /dev/null
+++ b/games-action/gltron/files/gltron-0.70-configure.patch
@@ -0,0 +1,24 @@
+configure.in is written poorly so it just stomps all over CFLAGS
+
+--- a/configure
++++ b/configure
+@@ -2805,7 +2805,7 @@
+   RANLIB="$ac_cv_prog_RANLIB"
+ fi
+ 
+-CFLAGS="-DSEPARATOR=\"'/'\""
++CFLAGS="$CFLAGS -DSEPARATOR=\"'/'\""
+ 
+ # Check whether --enable-warn or --disable-warn was given.
+ if test "${enable_warn+set}" = set; then
+@@ -2852,10 +2852,6 @@
+ else
+   enable_optimize=s
+ fi;
+-if test "x$enable_optimize" ; then
+-	CFLAGS="$CFLAGS -O$enable_optimize"
+-	CXXFLAGS="$CXXFLAGS -O$enable_optimize"
+-fi
+ 
+ # Check whether --with-sdl-prefix or --without-sdl-prefix was given.
+ if test "${with_sdl_prefix+set}" = set; then
diff --git a/games-action/gltron/files/gltron-0.70-debian.patch b/games-action/gltron/files/gltron-0.70-debian.patch
new file mode 100644
index 000000000000..4e25618ce9b6
--- /dev/null
+++ b/games-action/gltron/files/gltron-0.70-debian.patch
@@ -0,0 +1,35 @@
+Ripped from Debian patchset 6
+
+--- a/src/include/game/game_data.h
++++ b/src/include/game/game_data.h
+@@ -71,7 +71,7 @@
+ typedef struct AI {
+   int active;
+   int tdiff;
+-  long lasttime;
++  unsigned int lasttime;
+ 	segment2 left, right, front, backleft;
+ } AI;
+ 
+--- a/src/include/video/fonttex.h
++++ b/src/include/video/fonttex.h
+@@ -10,7 +10,7 @@
+   int lower; /* lowest ascii character (normally: 32) */
+   int upper; /* highest ascii character (normally: 126) */
+ 
+-  int *texID;
++  unsigned int *texID;
+ 
+   char *fontname;
+   char *bitmapname;
+--- a/src/video/trail.c
++++ b/src/video/trail.c
+@@ -19,7 +19,7 @@
+   n[1] = s->vStart.v[1] - s->vDirection.v[0];
+   tmp[0] = eye[0] - s->vStart.v[0];
+   tmp[1] = eye[1] - s->vStart.v[1];
+-  if(n[0] == n[1] == 0) return length(tmp);
++  if(n[0] == 0 && n[1] == 0) return length(tmp);
+   return abs(scalarprod2(n, tmp) / length(n));
+ }
+ 
diff --git a/games-action/gltron/files/gltron-0.70-gcc49.patch b/games-action/gltron/files/gltron-0.70-gcc49.patch
new file mode 100644
index 000000000000..4a1d5cbe1e1e
--- /dev/null
+++ b/games-action/gltron/files/gltron-0.70-gcc49.patch
@@ -0,0 +1,13 @@
+--- 1/lua/src/lib/liolib.c
++++ 1/lua/src/lib/liolib.c
+@@ -6,9 +6,9 @@
+ */
+ 
+ 
++#define __USE_MISC /* for mkstemp() */
+ #include <ctype.h>
+ #include <stdio.h>
+-#define __USE_MISC /* for mkstemp() */
+ #include <stdlib.h>
+ #include <string.h>
+ #include <time.h>
diff --git a/games-action/gltron/files/gltron-0.70-prototypes.patch b/games-action/gltron/files/gltron-0.70-prototypes.patch
new file mode 100644
index 000000000000..621963aeb689
--- /dev/null
+++ b/games-action/gltron/files/gltron-0.70-prototypes.patch
@@ -0,0 +1,24 @@
+scripting.h declares these params as const so make sure they're the same.
+
+--- a/nebu/scripting/scripting.c
++++ b/nebu/scripting/scripting.c
+@@ -169,16 +169,16 @@
+   return status;
+ }    
+ 
+-void scripting_RunFile(char *name) {
++void scripting_RunFile(const char *name) {
+   lua_dofile(L, name);
+ }
+ 
+-void scripting_Run(char *command) {
++void scripting_Run(const char *command) {
+   /* fprintf(stderr, "[command] %s\n", command); */
+   lua_dostring(L, command);
+ }
+ 
+-void scripting_RunFormat(char *format, ... ) {
++void scripting_RunFormat(const char *format, ... ) {
+   char buf[4096];
+   va_list ap;
+   va_start(ap, format);
diff --git a/games-action/gltron/gltron-0.70-r2.ebuild b/games-action/gltron/gltron-0.70-r2.ebuild
new file mode 100644
index 000000000000..dc47e0b51cab
--- /dev/null
+++ b/games-action/gltron/gltron-0.70-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="3d tron, just like the movie"
+HOMEPAGE="http://gltron.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.gz
+	mirror://gentoo/${PN}.png"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	media-libs/libmikmod
+	media-libs/libpng:0
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-sound[vorbis,mikmod]
+	media-libs/smpeg
+	virtual/opengl"
+
+RDEPEND=${DEPEND}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-configure.patch
+	"${FILESDIR}"/${P}-debian.patch
+	"${FILESDIR}"/${P}-gcc49.patch
+	"${FILESDIR}"/${P}-prototypes.patch
+)
+
+src_prepare() {
+	default
+	sed -i \
+		-e '/^gltron_LINK/s/$/ $(LDFLAGS)/' \
+		Makefile.in || die
+}
+
+src_configure() {
+	# warn/debug/profile just modify CFLAGS, they aren't
+	# real options, so don't utilize USE flags here
+	econf \
+		--disable-warn \
+		--disable-debug \
+		--disable-profile
+}
+
+src_install() {
+	default
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} GLtron
+}
diff --git a/games-action/gltron/metadata.xml b/games-action/gltron/metadata.xml
new file mode 100644
index 000000000000..0612306374d9
--- /dev/null
+++ b/games-action/gltron/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">gltron</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/heretic2-1.06c-r1 b/games-action/heretic2-1.06c-r1
deleted file mode 100644
index 0463cb4e101a..000000000000
--- a/games-action/heretic2-1.06c-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=games-util/loki_patch
-DESCRIPTION=Third-person classic magical action-adventure game
-EAPI=5
-HOMEPAGE=http://lokigames.com/products/heretic2/ http://www.ravensoft.com/heretic2.html
-KEYWORDS=~amd64 ~x86
-LICENSE=LOKI-EULA
-PROPERTIES=interactive
-RDEPEND=virtual/opengl amd64? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] ) x86? ( x11-libs/libX11 x11-libs/libXext ) games-misc/games-envd
-RESTRICT=strip
-SLOT=0
-SRC_URI=mirror://lokigames/heretic2/heretic2-1.06b-unified-x86.run mirror://lokigames/heretic2/heretic2-1.06c-unified-x86.run mirror://lokigames/heretic2/heretic2-maps-1.0.run
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=905ed7b1bbb2f0f660e5951851aa7808
diff --git a/games-action/heretic2-demo-1.06a b/games-action/heretic2-demo-1.06a
deleted file mode 100644
index 0d1f8eb97457..000000000000
--- a/games-action/heretic2-demo-1.06a
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=games-util/loki_patch
-DESCRIPTION=Third-person classic magical action-adventure game
-EAPI=5
-HOMEPAGE=http://www.lokigames.com/products/heretic2/ http://www.hereticii.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=LOKI-EULA
-RDEPEND=x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] games-misc/games-envd
-RESTRICT=strip
-SLOT=0
-SRC_URI=mirror://lokigames/loki_demos/heretic2-demo.run
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6926969b65dd6d775746911f10da0946
diff --git a/games-action/heretic2-demo/Manifest b/games-action/heretic2-demo/Manifest
new file mode 100644
index 000000000000..3ad7013042ab
--- /dev/null
+++ b/games-action/heretic2-demo/Manifest
@@ -0,0 +1,3 @@
+DIST heretic2-demo.run 55065564 BLAKE2B d4d2e3383a14633d215f4cc7c979dc737e56a743998f10b36d0b9cbc3787df86cc0943802ce700e2123791f9d44cea9fd37d891b7c0562dbca1a4264e3eb48cc SHA512 62aba7b4569b76bf9a01864652da7be8e268ad3cad4eb5b986b7e84adbd88e826799d021b141f9a7a1135520e440de4ce2e57c5be6ceaa85dc08295d5e3ad30e
+EBUILD heretic2-demo-1.06a.ebuild 1352 BLAKE2B 27e78bca84c57cfe8ccb7fe99dc4780aaefdf38521f243d67dabf7ed76b3aece0844e8abfaaf550eb98fe2491cfe73abf446628062bb761477bd4faeaaf1f8fe SHA512 facfe4e8cca8e8d0d25db13459b9c1e2c145f0fe58e8ebdf0469b208d59a442bfefb74752cd67ebfc90236403f38abbb61329af952768b7768d9e6ba07af11b7
+MISC metadata.xml 710 BLAKE2B 2b9f13c1ebed41739b7700016440fbc43cb798906a68cd6c6c105218db4681863ebf1d711534967abed200c4e6ff2c5f42963b01fb33b63a6a1e6311e9f76c4a SHA512 3d5b818e953410bd3b51926173604c85ea1d74d6433e5ea52866153fa9da7d4627cd18adc844e10fa54cba1d156b505dca9364b22f6fe7d2d792127fa65b4586
diff --git a/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild b/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild
new file mode 100644
index 000000000000..0db2fab52331
--- /dev/null
+++ b/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils unpacker multilib games
+
+DESCRIPTION="Third-person classic magical action-adventure game"
+HOMEPAGE="http://www.lokigames.com/products/heretic2/
+	http://www.hereticii.com/"
+SRC_URI="mirror://lokigames/loki_demos/${PN}.run"
+
+LICENSE="LOKI-EULA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="strip"
+QA_TEXTRELS="${GAMES_PREFIX_OPT:1}/heretic2-demo/ref_glx.so"
+
+DEPEND="games-util/loki_patch"
+RDEPEND="
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]"
+
+S=${WORKDIR}
+
+dir=${GAMES_PREFIX_OPT}/${PN}
+Ddir=${D}/${dir}
+QA_PREBUILT="${dir:1}/*"
+
+src_install() {
+	ABI=x86
+
+	local demo="data/demos/heretic2_demo"
+	local exe="heretic2_demo.x86"
+
+	loki_patch patch.dat data/ || die
+
+	# Remove bad opengl library
+	rm -r "${demo}/gl_drivers/"
+
+	# Change to safe default of 800x600 and option of normal opengl driver
+	sed -i \
+		-e "s:fullscreen \"1\":fullscreen \"1\"\nset vid_mode \"4\":" \
+		-e "s:libGL:/usr/$(get_libdir)/libGL:" \
+		"${demo}"/base/default.cfg || die
+
+	insinto "${dir}"
+	exeinto "${dir}"
+	doins -r "${demo}"/*
+	doexe "${demo}/${exe}"
+
+	games_make_wrapper ${PN} "./${exe}" "${dir}" "${dir}"
+	newicon "${demo}"/icon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "Heretic 2 (Demo)" ${PN}
+
+	prepgamesdirs
+}
diff --git a/games-action/heretic2-demo/metadata.xml b/games-action/heretic2-demo/metadata.xml
new file mode 100644
index 000000000000..3df7e72452ae
--- /dev/null
+++ b/games-action/heretic2-demo/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>
+<longdescription>
+Power up your mana and help Corvus find the cure to a plague of epic dimensions -- and save the worlds of D'sparil before it's too late!  A high-powered and mystical three-dimensional environment will enthrall you, with spectacular sound and visual effects, non-stop action and adventure.  Prepare to be ensnared in the visual feast that is the worlds of D'sparil.  This is the demo version of the commercially-ported game.
+</longdescription>
+</pkgmetadata>
diff --git a/games-action/heretic2/Manifest b/games-action/heretic2/Manifest
new file mode 100644
index 000000000000..efbf3772cc08
--- /dev/null
+++ b/games-action/heretic2/Manifest
@@ -0,0 +1,5 @@
+DIST heretic2-1.06b-unified-x86.run 4718161 BLAKE2B 880b8c9468bf98a95cc0e31e9d1853de6f0f7e9d205518043ab243f81f760e588655b85bf7a2e1983ff738072adaa731a9488e00d342ec86be41f1b5aa32087f SHA512 7dcd4f8f87d526db7ea9fd647e4807d4e1a404a612460f8dcc0d0360964ef0d4c721e9c62b58cd1764c1e2c71ad1539c6aac5083fadc7a85ec4c12c8aa7b338f
+DIST heretic2-1.06c-unified-x86.run 3667873 BLAKE2B f492aec1d290ccf32a63d5a4ff017168ba89435db63124ce9de93ebe9c5284cf6dbabe0355fbad6a52f20d646194a9fd5014c1030abc1946961f922ae57e810f SHA512 e855c573d6e215e18d80143d1850e890349f941462a5d2d59c57a02f11a39967fd633efdfe46199d588e97cc99322d539ac50fc7bc7fa6d7e116e99f5a532de4
+DIST heretic2-maps-1.0.run 6257076 BLAKE2B 15151d80027f4912fab919526e4b91cacb87adeee7cb97e50b1ad5cfa905059c169705fd40ec3330b58996fac167822bc93af49c01fbbb61e4ace73309932cc2 SHA512 ba570caeae6bbe4a97bfe937353014dc9ddcc5a007b0fd1911ab1494667d2dae263d727190e7172d35639511a6383ff35eea5622cdc2e124e3793daef3c8e607
+EBUILD heretic2-1.06c-r1.ebuild 1790 BLAKE2B 1d0ee015a2235d76172b62af841e892dd7357b7f1628f9c5f955b07d828ff1024c1790bbe8b274f3ba758fc1b90e198e44f8aa6d284ac16292f8a4a50afea702 SHA512 2d197ecc09bbfbcfa09e3d4f1b7daadc6fce99189dd6ebbed14141dc377ed9f83b028c81868934493d90dc126f551a8f155ea9f267c4cf53a926c7e7291462b9
+MISC metadata.xml 252 BLAKE2B 1b951d2e730631865ae5f379b19ed9de2c8adf2f2786da3f75d0871d967374198ddd9106433f388bdc7050c37063fb28cda4320ae7bdc9a03854838693d9f952 SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638
diff --git a/games-action/heretic2/heretic2-1.06c-r1.ebuild b/games-action/heretic2/heretic2-1.06c-r1.ebuild
new file mode 100644
index 000000000000..dc1322e89355
--- /dev/null
+++ b/games-action/heretic2/heretic2-1.06c-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils unpacker cdrom multilib games
+
+DESCRIPTION="Third-person classic magical action-adventure game"
+HOMEPAGE="http://lokigames.com/products/heretic2/
+	http://www.ravensoft.com/heretic2.html"
+SRC_URI="mirror://lokigames/${PN}/${P/%?/b}-unified-x86.run
+	mirror://lokigames/${PN}/${P}-unified-x86.run
+	mirror://lokigames/${PN}/${PN}-maps-1.0.run"
+
+LICENSE="LOKI-EULA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="strip"
+QA_TEXTRELS="${GAMES_PREFIX_OPT:1}/${PN}/base/*.so"
+
+DEPEND="games-util/loki_patch"
+RDEPEND="virtual/opengl
+	amd64? (
+		>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+		>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+	)
+	x86? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)"
+
+S=${WORKDIR}
+
+src_unpack() {
+	cdrom_get_cds bin/x86/glibc-2.1/${PN}
+	mkdir ${A}
+
+	local f
+	for f in * ; do
+		cd "${S}"/${f}
+		unpack_makeself ${f}
+	done
+}
+
+src_install() {
+	has_multilib_profile && ABI=x86
+
+	local dir=${GAMES_PREFIX_OPT}/${PN}
+
+	cd "${CDROM_ROOT}"
+
+	insinto "${dir}"
+	doins -r base help Manual.html README README.more
+
+	exeinto "${dir}"
+	doexe bin/x86/glibc-2.1/${PN}
+
+	games_make_wrapper ${PN} ./${PN} "${dir}" "${dir}"
+	sed -i \
+		-e 's/^exec /__GL_ExtensionStringVersion=17700 exec /' \
+		"${D}/${GAMES_BINDIR}/${PN}" || die
+	newicon icon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "Heretic II"
+
+	cd "${D}/${dir}"
+	ln -s "${CDROM_ROOT}"/*.gz .
+	unpack ./*.gz
+	rm -f *.gz
+
+	local d
+	for d in "${S}"/* ; do
+		pushd "${d}" > /dev/null
+		loki_patch patch.dat "${D}/${dir}" || die
+		popd > /dev/null
+	done
+
+	rmdir gl_drivers
+	sed -i \
+		"128i set gl_driver \"/usr/$(get_libdir)/libGL.so\"" \
+		base/default.cfg || die
+
+	prepgamesdirs
+}
diff --git a/games-action/heretic2/metadata.xml b/games-action/heretic2/metadata.xml
new file mode 100644
index 000000000000..3c186688e265
--- /dev/null
+++ b/games-action/heretic2/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-action/heroes-0.21-r2 b/games-action/heroes-0.21-r2
deleted file mode 100644
index 0639e05da548..000000000000
--- a/games-action/heroes-0.21-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=ggi? ( media-libs/libggi media-libs/libgii media-libs/libmikmod ) nls? ( virtual/libintl ) sdl? ( media-libs/libsdl media-libs/sdl-mixer ) !sdl? ( !ggi? ( media-libs/libsdl media-libs/sdl-mixer ) ) 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=Heroes Enjoy Riding Over Empty Slabs: similar to Tron and Nibbles
-EAPI=6
-HOMEPAGE=http://heroes.sourceforge.net/
-IUSE=ggi nls sdl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=ggi? ( media-libs/libggi media-libs/libgii media-libs/libmikmod ) nls? ( virtual/libintl ) sdl? ( media-libs/libsdl media-libs/sdl-mixer ) !sdl? ( !ggi? ( media-libs/libsdl media-libs/sdl-mixer ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/heroes/heroes-0.21.tar.bz2 mirror://sourceforge/heroes/heroes-data-1.5.tar.bz2 mirror://sourceforge/heroes/heroes-sound-tracks-1.0.tar.bz2 mirror://sourceforge/heroes/heroes-sound-effects-1.0.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_=a116c5a895bd2fec274f0aaf1cbcb72c
diff --git a/games-action/heroes/Manifest b/games-action/heroes/Manifest
new file mode 100644
index 000000000000..632d40a7c078
--- /dev/null
+++ b/games-action/heroes/Manifest
@@ -0,0 +1,10 @@
+AUX 0.21-cvs-segfault-fix.patch 551 BLAKE2B 0a09409c97d252878cb3841b6c6ab95b4dea3b91aa6c6b81d84adc263bcee1629e0f7856ef9ddda3ba718a02aec8beab3c16cab06a76192e7081ee8be9c447a5 SHA512 4ccce0f50a5f2128809d8fa759b4dcdd002443ecf6d35ebd72a46e1feb0461150535c462e674156c9f8550578ea4b66d3c87aee74c3bbdfe756a96caa54bdde1
+AUX heroes-0.21-automake-1.12.patch 335 BLAKE2B 6c2d757313999dfce5d9fc4b2b4ded76bad6b89e45777910de8cef441590015fa37491594a6989a0da29fb70e636fc5b1c1a3bbba56bd371cb6ba1226d2620f7 SHA512 9c40b9b0bd4e82f3f9bd9b66c455e834bd1b2a91e79dd550fd4aada4ca1b6e2ecb55353f31cad1a021a28dfc3781afb1f040545bf8030b0e63b988708aae480d
+AUX heroes-0.21-gcc4.patch 6016 BLAKE2B a99603890ca5f7c23ca3286faea125b31c6b2eb7039b2f830cfe5d257f95960d83680a7e4a7153118ac21e9e84a7b57f8b0996e5665c27569261822f51bb9c47 SHA512 ab72c9f501458a493458d92140286ed3ffdc1b5dc767343ce60354f6b1ded90fb8b25f914f4bbaea68fa29ef9870c2534038e44a92f84f01e1538c1f6b450b31
+AUX heroes-0.21-underlink.patch 476 BLAKE2B 8e9b2892d82dd5c5b170ad1fda88766aae11955b94cf076aa6140ea781e1af314052b327b0142370b8779e5a8ed797f1148e79664f284c93c5f6921262ebda10 SHA512 6d5db649f4f1d0d7994e4fe1d6e5738276ada879ecd192be88b3dbdf900fe6991fce4fe05c52f075d0159cfab7cfd6728be322ba9f7e73556b61f43e5f9a52db
+DIST heroes-0.21.tar.bz2 709079 BLAKE2B 356c7c97504c5abe6c9e94a9ba190613d199000c5f2c0dd23b8517d8e9a8b7ea81b013472af4abaf5ab2519618772e5b657281fe2dc835d3882cf788f020cad8 SHA512 fc0ac1fdf7e686388c90162b6cd76d638d295fa5919a9fdd4e944a85ca4f60b1b0a01873820b2c718ae9c960ca3d7e28ec62c09d6cd0f052e62fd2e76a96be82
+DIST heroes-data-1.5.tar.bz2 391970 BLAKE2B b4325e978955ad6cfe522055755ebcc0ff487a9fdc136dbeaea30073f450d50946859d61cf44f75ab89be556e0886f8cb6ff3623c84c3275194ac81e60b1d0f9 SHA512 a4cb1508c2010b2157dc0e1d0a7973131fa167cb1f3c93649c3bc9b2c37419e4429e33cde14f3b67c7a4670f751ff4c28d88604102780bdb1fe5c77a93e1a213
+DIST heroes-sound-effects-1.0.tar.bz2 389883 BLAKE2B cd4e889bf7e0b33eda33806040d3141576d60b93332d6c4bf7d41fd587bb9d661ded4f619e313e17d8508500e138f7f3ce08b9336818f85d9e240d2fdebaf4e2 SHA512 51da63373f1bdb2314a8c3164028ee9cbb95958bfe8f13b1119236f035282a711efcc6ef5a84fd647c1e8451b4da788a74e4b8506e1476a437299dfc7b2046d1
+DIST heroes-sound-tracks-1.0.tar.bz2 1245613 BLAKE2B b390a96065c6b127addc0bc25326c8d0055b13f896d33e765ab9a5b3c45d831c0f91e1cff361f43a2b4956e87a6a980ce2cd07d6e6588357038f92805c64dbd1 SHA512 3e7ee2890c47366a39cfc7d7b9a1e5fdf3c3379013ca96072586ba909e2a602b114c728ffbe9dfe8eb6b62232cb6c25b13475f2a33da0243ea1ffb3f040842f0
+EBUILD heroes-0.21-r2.ebuild 1679 BLAKE2B afa68501c9ae56b4822798ab3ddf71ef174cd8097d181ad5007333922692a4501287a15405d7b90fd83772275b7151e887b504a9c73fe855674659e8f4a74f0a SHA512 c10f5113a492d26cd6f61973619e2e5b9106b603d7e76b0936ee18db8db0c1552941128a8133e72f4c9defbb9b976b2d1af763c6931a21454a7c3a378145e0de
+MISC metadata.xml 329 BLAKE2B 3d95771553c911350c23023422240c0a791ede2044a55bf40a25ac4c5ac84114ddb2942b370b9605a966d4dac960b1498f278394925d065bee642164f4893187 SHA512 f33d2b7d06f5e772abf4acb8b3dc8ba78b52ab8220a350ddc64d8bde67e850062830b4251f13021b8472b110602c937cfdc3fd34c97c37ba455542b771ecb872
diff --git a/games-action/heroes/files/0.21-cvs-segfault-fix.patch b/games-action/heroes/files/0.21-cvs-segfault-fix.patch
new file mode 100644
index 000000000000..689fdeea8a6c
--- /dev/null
+++ b/games-action/heroes/files/0.21-cvs-segfault-fix.patch
@@ -0,0 +1,17 @@
+===================================================================
+RCS file: /cvsroot/heroes/heroes/src/menus.c,v
+retrieving revision 1.108.2.1
+retrieving revision 1.108.2.2
+diff -u -r1.108.2.1 -r1.108.2.2
+--- a/src/menus.c	2002/06/16 19:16:09	1.108.2.1
++++ b/src/menus.c	2002/08/22 11:45:51	1.108.2.2
+@@ -219,7 +219,8 @@
+   { N_("NEW LEVEL"),	editor_menu },
+   /* TRANS: Load an existing level for edition.  */
+   { N_("LOAD LEVEL"),	editor_selector },
+-  { N_("GO BACK"),	0 }
++  { N_("GO BACK"),	0 },
++  { 0,			0 }
+ };
+ 
+ a_menu *editor_menu_data;
diff --git a/games-action/heroes/files/heroes-0.21-automake-1.12.patch b/games-action/heroes/files/heroes-0.21-automake-1.12.patch
new file mode 100644
index 000000000000..1a645df91acb
--- /dev/null
+++ b/games-action/heroes/files/heroes-0.21-automake-1.12.patch
@@ -0,0 +1,11 @@
+--- heroes-0.21/configure.ac
++++ heroes-0.21/configure.ac
+@@ -112,7 +112,7 @@
+ # Checks for typedefs, structures, and compiler characteristics.
+ # ==============================================================
+ 
+-AM_C_PROTOTYPES
++AC_C_PROTOTYPES
+ AC_C_CONST
+ AC_TYPE_UID_T     dnl This checks for gid_t too.
+ AC_CHECK_TYPES([ssize_t])
diff --git a/games-action/heroes/files/heroes-0.21-gcc4.patch b/games-action/heroes/files/heroes-0.21-gcc4.patch
new file mode 100644
index 000000000000..2e39907347a9
--- /dev/null
+++ b/games-action/heroes/files/heroes-0.21-gcc4.patch
@@ -0,0 +1,184 @@
+--- a/src/hedlite.c	2006-01-28 14:05:05.000000000 -0700
++++ b/src/hedlite.c	2006-01-28 14:07:20.000000000 -0700
+@@ -45,7 +45,7 @@
+ #include "dirname.h"
+ 
+ static a_pcx_image heditrsc;
+-static a_pcx_image tile_set_img;
++static a_pcx_image tile_set_img_local;
+ 
+ unsigned short int xdalles = 0;
+ unsigned short int ydalles = 0;
+@@ -144,9 +144,9 @@
+ static void
+ copy_tile (int src_, a_pixel *dest)
+ {
+-  int i = tile_set_img.width;
++  int i = tile_set_img_local.width;
+   int j;
+-  a_pixel *src = tile_set_img.buffer + src_;
++  a_pixel *src = tile_set_img_local.buffer + src_;
+   for (j = 20; j > 0; j--) {
+     fastmem4 (src, dest, 24 >> 2);
+     src += i;
+@@ -157,9 +157,9 @@
+ static void
+ copy_tile_pcx (int src_, a_pixel *dest)
+ {
+-  int i = tile_set_img.width;
++  int i = tile_set_img_local.width;
+   int j;
+-  a_pixel *src = tile_set_img.buffer + src_;
++  a_pixel *src = tile_set_img_local.buffer + src_;
+   for (j = 20; j > 0; j--) {
+     fastmem4 (src, dest, 24 >> 2);
+     src += i;
+@@ -170,9 +170,9 @@
+ static void
+ copy_tile_transp (int src_, a_pixel *dest)
+ {
+-  int i = tile_set_img.width;
++  int i = tile_set_img_local.width;
+   int j, k;
+-  a_pixel *src = tile_set_img.buffer + src_;
++  a_pixel *src = tile_set_img_local.buffer + src_;
+   for (j = 20; j > 0; j--) {
+     for (k = 24; k > 0; k--) {
+       if (*src != 0)
+@@ -188,9 +188,9 @@
+ static void
+ copy_tile_transp_pcx (int src_, a_pixel *dest)
+ {
+-  int i = tile_set_img.width;
++  int i = tile_set_img_local.width;
+   int j, k;
+-  a_pixel *src = tile_set_img.buffer + src_;
++  a_pixel *src = tile_set_img_local.buffer + src_;
+   for (j = 20; j > 0; j--) {
+     for (k = 24; k > 0; k--) {
+       if (*src != 0)
+@@ -555,7 +555,7 @@
+ static void
+ update_middle_panel (void)
+ {
+-  rectangle_copy (xdalles, 0, 144, 200, 145, 0, &tile_set_img);
++  rectangle_copy (xdalles, 0, 144, 200, 145, 0, &tile_set_img_local);
+   frame (145 + xdallesdec, ydalles, 23, 19, 15);
+   rectangle_copy (0, 64, 30, 6, 290, 64, &heditrsc);
+   sprintf (nombre, "%u", (xdalles + xdallesdec) / 24);
+@@ -670,7 +670,7 @@
+ curdalled (void)
+ {
+   int i =
+-    (xdalles + xdallesdec) / 24 + (ydalles / 20) * (tile_set_img.width / 24);
++    (xdalles + xdallesdec) / 24 + (ydalles / 20) * (tile_set_img_local.width / 24);
+   return i;
+ }
+ 
+@@ -894,7 +894,7 @@
+   free (tempc);
+   putc (0xC, fpcx);
+   for (i1 = 0; i1 < 768; i1++)
+-    putc (tile_set_img.palette.global[i1] << 2, fpcx);
++    putc (tile_set_img_local.palette.global[i1] << 2, fpcx);
+   fclose (fpcx);
+ }
+ 
+@@ -1225,7 +1225,7 @@
+     }
+   } else if (i == HK_End) {
+     if (mod & HK_MOD_Ctrl) {
+-      xdalles = (tile_set_img.width / 24) * 24 - 144;
++      xdalles = (tile_set_img_local.width / 24) * 24 - 144;
+       update_middle_panel ();
+     }
+   } else if (i == HK_PageDown) {
+@@ -1250,7 +1250,7 @@
+     }
+   } else if (i == HK_Right) {
+     if (mod & HK_MOD_Ctrl) {
+-      if (xdalles + 168U < tile_set_img.width) {
++      if (xdalles + 168U < tile_set_img_local.width) {
+ 	xdalles += 24;
+ 	update_middle_panel ();
+       } else if (xdallesdec < 120) {
+@@ -1337,7 +1337,7 @@
+   } else if (i == HK_Space) {
+     j = curdallep ();
+     level_map[j].number =
+-      xdalles + xdallesdec + ydalles * (tile_set_img.width);
++      xdalles + xdallesdec + ydalles * (tile_set_img_local.width);
+     level_map[j].type = ddef[curdalled ()].type;
+     level_map[j].info = ddef[curdalled ()].info;
+     gestclav (HK_i, HK_MOD_None);
+@@ -1351,9 +1351,9 @@
+       level_map[j].collision[3] = 0;
+     }
+     for (j = hplaninfo.xt * hplaninfo.yt - 1; j >= 0; j--) {
+-      k = (((level_map[j].number % tile_set_img.width) / 24) +
+-	   (level_map[j].number / (tile_set_img.width * 20)) *
+-	   (tile_set_img.width / 24));
++      k = (((level_map[j].number % tile_set_img_local.width) / 24) +
++	   (level_map[j].number / (tile_set_img_local.width * 20)) *
++	   (tile_set_img_local.width / 24));
+       level_map[j].type = ddef[k].type;
+       if (level_map[j].type != t_tunnel) {
+ 	if (level_map[j].type == t_anim || i == 0x1749)
+@@ -1404,7 +1404,7 @@
+     if (mod & HK_MOD_Ctrl) {
+       for (j = hplaninfo.xt * hplaninfo.yt - 1; j >= 0; j--) {
+ 	level_map[j].number = xdalles + xdallesdec +
+-	  ydalles * (tile_set_img.width);
++	  ydalles * (tile_set_img_local.width);
+ 	level_map[j].type = ddef[curdalled ()].type;
+ 	level_map[j].info = ddef[curdalled ()].info;
+       }
+@@ -1414,7 +1414,7 @@
+ 
+ 	level_map[j].number =
+ 	  (((j % hplaninfo.xt) + (j / hplaninfo.xt)) & 1) * 20 *
+-	  tile_set_img.width;
++	  tile_set_img_local.width;
+       update_left_panel ();
+     }
+   } else if (i == HK_F3) {
+@@ -1427,7 +1427,7 @@
+     if (level_map[curdallep ()].sprite == 0)
+ 
+       level_map[curdallep ()].sprite =
+-	(short int) (xdalles + xdallesdec + ydalles * (tile_set_img.width));
++	(short int) (xdalles + xdallesdec + ydalles * (tile_set_img_local.width));
+     else
+       level_map[curdallep ()].sprite = 0;
+     update_left_panel ();
+@@ -1707,17 +1707,17 @@
+ 				   hplaninfo.tile_set_name), ".pie");
+ 
+   pcx_load_from_rsc ("editor-img", &heditrsc);
+-  pcx_load (tile_set_name, &tile_set_img);
++  pcx_load (tile_set_name, &tile_set_img_local);
+ 
+   /* read the tileset definition */
+-  XCALLOC_ARRAY (ddef, (tile_set_img.width / 24) * 10);
++  XCALLOC_ARRAY (ddef, (tile_set_img_local.width / 24) * 10);
+   if (!((ftmp = fopen (dallepie, "rb")) == NULL))
+-    fread (ddef, sizeof (a_tile_info), (tile_set_img.width / 24) * 10, ftmp);
++    fread (ddef, sizeof (a_tile_info), (tile_set_img_local.width / 24) * 10, ftmp);
+   fclose (ftmp);
+ 
+   outwayinit ();
+   XCALLOC_ARRAY (hedit_buffer, xbuf * 200);
+-  set_pal (tile_set_img.palette.global, 0, 256 * 3);
++  set_pal (tile_set_img_local.palette.global, 0, 256 * 3);
+   rectangle_copy (0, 0, 30, 200, 290, 0, &heditrsc);
+   strupr (levelnomshort);
+   draw_text (levelnomshort, 305, 29, 8, 1);
+@@ -1767,7 +1767,7 @@
+     free (ddef);
+     free (level_map);
+     img_free (&heditrsc);
+-    img_free (&tile_set_img);
++    img_free (&tile_set_img_local);
+   }
+ 
+   free (dallepie);
diff --git a/games-action/heroes/files/heroes-0.21-underlink.patch b/games-action/heroes/files/heroes-0.21-underlink.patch
new file mode 100644
index 000000000000..18a0fca28f3c
--- /dev/null
+++ b/games-action/heroes/files/heroes-0.21-underlink.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.am	2011-06-10 11:32:03.905618275 +0200
++++ b/src/Makefile.am	2011-06-10 11:32:15.539347083 +0200
+@@ -42,7 +42,7 @@
+ heroeslvl_SOURCES = heroeslvl.c
+ 
+ heroes_LDADD = lvl/libhlvl.a media/libhmcommon.a ../lib/libheroes.a \
+-	       $(INTLLIBS) $(LIBALT_LOCAL_XLDADD) $(LIBALT_XLDADD)
++	       $(INTLLIBS) $(LIBALT_LOCAL_XLDADD) $(LIBALT_XLDADD) -lm
+ heroes_LDFLAGS = $(LIBALT_XLDFLAGS)
+ 
+ ## Depend upon Makefile because the value of LIBALT_LOCAL_LDADD might
diff --git a/games-action/heroes/heroes-0.21-r2.ebuild b/games-action/heroes/heroes-0.21-r2.ebuild
new file mode 100644
index 000000000000..5ab9018ee3d1
--- /dev/null
+++ b/games-action/heroes/heroes-0.21-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils autotools
+
+data_ver=1.5
+snd_trk_ver=1.0
+snd_eff_ver=1.0
+
+DESCRIPTION="Heroes Enjoy Riding Over Empty Slabs: similar to Tron and Nibbles"
+HOMEPAGE="http://heroes.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+	mirror://sourceforge/${PN}/${PN}-data-${data_ver}.tar.bz2
+	mirror://sourceforge/${PN}/${PN}-sound-tracks-${snd_trk_ver}.tar.bz2
+	mirror://sourceforge/${PN}/${PN}-sound-effects-${snd_eff_ver}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ggi nls sdl"
+RESTRICT="test"
+
+RDEPEND="
+	ggi? ( media-libs/libggi media-libs/libgii media-libs/libmikmod )
+	nls? ( virtual/libintl )
+	sdl? ( media-libs/libsdl media-libs/sdl-mixer )
+	!sdl? ( !ggi? ( media-libs/libsdl media-libs/sdl-mixer ) )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+	#56118
+PATCHES=(
+	"${FILESDIR}/${P}"-automake-1.12.patch
+	"${FILESDIR}/${P}"-gcc4.patch
+	"${FILESDIR}/${P}"-underlink.patch
+	"${FILESDIR}/${PV}"-cvs-segfault-fix.patch
+)
+
+src_prepare() {
+	default
+	sed -i 's:$(localedir):/usr/share/locale:' \
+		$(find . -name 'Makefile.in*') || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use sdl || ! use ggi ; then
+		myconf="${myconf} --with-sdl --with-sdl-mixer"
+	else
+		myconf="${myconf} --with-ggi --with-mikmod"
+	fi
+
+	local pkg
+	for pkg in ${A//.tar.bz2} ; do
+		cd "${WORKDIR}"/${pkg}
+		econf \
+			--disable-heroes-debug \
+			--disable-optimizations \
+			$(use_enable nls) \
+			${myconf}
+	done
+}
+
+src_install() {
+	local pkg
+	for pkg in ${A//.tar.bz2} ; do
+		cd "${WORKDIR}"/${pkg}
+		emake DESTDIR="${D}" install
+	done
+}
diff --git a/games-action/heroes/metadata.xml b/games-action/heroes/metadata.xml
new file mode 100644
index 000000000000..a811955bf505
--- /dev/null
+++ b/games-action/heroes/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">heroes</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/hotline-miami-1.0.9a_p20140221-r1 b/games-action/hotline-miami-1.0.9a_p20140221-r1
deleted file mode 100644
index 866dd68e5d3d..000000000000
--- a/games-action/hotline-miami-1.0.9a_p20140221-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
-DESCRIPTION=High-octane action game overflowing with raw brutality
-EAPI=5
-HOMEPAGE=http://www.devolverdigital.com/games/view/hotline-miami
-IUSE=bundled-libs +launcher
-KEYWORDS=~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=amd64? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)] !bundled-libs? ( >=media-gfx/nvidia-cg-toolkit-3.1.0013-r3[abi_x86_32(-)] >=media-libs/libogg-1.3.0[abi_x86_32(-)] >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] ) launcher? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] >=x11-libs/libxcb-1.9.1[abi_x86_32(-)] ) ) x86? ( x11-libs/libX11 !bundled-libs? ( media-gfx/nvidia-cg-toolkit media-libs/libogg media-libs/libvorbis media-libs/openal ) launcher? ( media-libs/freetype x11-libs/libXext x11-libs/libXrandr x11-libs/libXrender x11-libs/libxcb ) ) games-misc/games-envd
-RESTRICT=bindist fetch splitdebug
-SLOT=0
-SRC_URI=HotlineMiami_linux_1392944501.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=23837caaad366714daeca7eb2d519bcc
diff --git a/games-action/hotline-miami/Manifest b/games-action/hotline-miami/Manifest
new file mode 100644
index 000000000000..c40a4f79d8ab
--- /dev/null
+++ b/games-action/hotline-miami/Manifest
@@ -0,0 +1,3 @@
+DIST HotlineMiami_linux_1392944501.tar.gz 207632875 BLAKE2B 797143724dbc8229fb538cf3f9087b2cae3c6c5c7ebb6d863d935bd720f8ee38b06c1b28741cfe216e486f5dee9c77dfca80b808a76d83fc004358ff04567be2 SHA512 d1c1b7cbb910969ae120a12d982ed2ba7c935912bdc4e72e3a42b7aeb468b33c6536f4e43f97942155656be705e060d6fe9da37b04040c6aebf81ca80300d546
+EBUILD hotline-miami-1.0.9a_p20140221-r1.ebuild 2120 BLAKE2B d530c0b55d360ca7c360364207e86df0a07aa4909cd623052d2b4a8ad5fd29c50eef96b8b1447958902a1d09d81343a17a6592f35fb6717d4c7d0905e2d8f821 SHA512 41e41c48fbc6e46d8cb3df1b99b269b67c5d2dbeb1ab66a4cd0633e416d2d4c297f84781488495b2acf616a7331396952789fb6218a91ca08928b4e762195ac7
+MISC metadata.xml 377 BLAKE2B 474a88a7fa91f1024e794536a3a006edb921744be53dca4a2fc0febeffdc5067881d9129ecd8f064b49b6cc9312dc23032aa7601076de1f3d53cfc39a0acf8ab SHA512 ace6630c78a59dc9ee29d233621cd980f88d1140bccf565f19b6c41b206427fc6f7ce65ffcf44587873f497994b8436e7691eac44e0afd6ff81d057e5a257c5e
diff --git a/games-action/hotline-miami/hotline-miami-1.0.9a_p20140221-r1.ebuild b/games-action/hotline-miami/hotline-miami-1.0.9a_p20140221-r1.ebuild
new file mode 100644
index 000000000000..c885ea8a511e
--- /dev/null
+++ b/games-action/hotline-miami/hotline-miami-1.0.9a_p20140221-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: unbundle Qt5
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="High-octane action game overflowing with raw brutality"
+HOMEPAGE="http://www.devolverdigital.com/games/view/hotline-miami"
+SRC_URI="HotlineMiami_linux_1392944501.tar.gz"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bundled-libs +launcher"
+RESTRICT="bindist fetch splitdebug"
+
+MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
+QA_PREBUILT="${MYGAMEDIR#/}/lib/*
+	${MYGAMEDIR#/}/Hotline
+	${MYGAMEDIR#/}/hotline_launcher"
+
+RDEPEND="
+	amd64? (
+		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+		!bundled-libs? (
+			>=media-gfx/nvidia-cg-toolkit-3.1.0013-r3[abi_x86_32(-)]
+			>=media-libs/libogg-1.3.0[abi_x86_32(-)]
+			>=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)]
+			>=media-libs/openal-1.15.1[abi_x86_32(-)]
+		)
+		launcher? (
+			>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
+			>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+			>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+			>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
+			>=x11-libs/libxcb-1.9.1[abi_x86_32(-)]
+		)
+	)
+	x86? (
+		x11-libs/libX11
+		!bundled-libs? (
+			media-gfx/nvidia-cg-toolkit
+			media-libs/libogg
+			media-libs/libvorbis
+			media-libs/openal
+		)
+		launcher? (
+			media-libs/freetype
+			x11-libs/libXext
+			x11-libs/libXrandr
+			x11-libs/libXrender
+			x11-libs/libxcb
+		)
+	)"
+
+S=${WORKDIR}
+
+pkg_nofetch() {
+	einfo "Please buy & download ${SRC_URI} from:"
+	einfo "  https://www.humblebundle.com/store"
+	einfo "and move it to ${DISTDIR}"
+}
+
+src_install() {
+	insinto "${MYGAMEDIR}"
+	doins HotlineMiami_GL.wad *.ogg
+
+	exeinto "${MYGAMEDIR}"
+	doexe Hotline
+	use launcher && doexe hotline_launcher
+
+	exeinto "${MYGAMEDIR}/lib"
+	use launcher && doexe lib/libQt5*
+	use bundled-libs && doexe libCg* libopenal*
+
+	games_make_wrapper ${PN} "./Hotline" "${MYGAMEDIR}" "${MYGAMEDIR}/lib"
+	make_desktop_entry ${PN}
+	if use launcher ; then
+		games_make_wrapper ${PN}-launcher "./hotline_launcher" "${MYGAMEDIR}" "${MYGAMEDIR}/lib"
+		make_desktop_entry ${PN}-launcher "${PN} (launcher)"
+	fi
+
+	prepgamesdirs
+}
diff --git a/games-action/hotline-miami/metadata.xml b/games-action/hotline-miami/metadata.xml
new file mode 100644
index 000000000000..bd944bb6e375
--- /dev/null
+++ b/games-action/hotline-miami/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>
+	<use>
+		<flag name="bundled-libs">Use bundled libraries.</flag>
+		<flag name="launcher">Install qt launcher</flag>
+	</use>
+</pkgmetadata>
diff --git a/games-action/intrusion2-1.024 b/games-action/intrusion2-1.024
deleted file mode 100644
index 99361c864b6c..000000000000
--- a/games-action/intrusion2-1.024
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
-DESCRIPTION=Fast paced action sidescroller set in a sci-fi environment
-EAPI=5
-HOMEPAGE=http://intrusion2.com
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=amd64? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)] >=dev-libs/atk-2.10.0[abi_x86_32(-)] >=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)] >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)] >=x11-libs/pango-1.36.3[abi_x86_32(-)] >=media-libs/gst-plugins-base-0.10.36[abi_x86_32(-)] >=media-libs/gstreamer-0.10.36-r2[abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)] >=x11-libs/libXtst-1.2.1-r1[abi_x86_32(-)] ) x86? ( dev-libs/glib:2 dev-libs/atk x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango media-libs/gst-plugins-base media-libs/gstreamer media-libs/fontconfig media-libs/freetype x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXtst ) games-misc/games-envd
-RESTRICT=bindist fetch
-SLOT=0
-SRC_URI=intrusion2-1370288626-bin
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=28c06db006e1714288ce2ca807810389
diff --git a/games-action/intrusion2/Manifest b/games-action/intrusion2/Manifest
new file mode 100644
index 000000000000..6d4351168ee0
--- /dev/null
+++ b/games-action/intrusion2/Manifest
@@ -0,0 +1,3 @@
+DIST intrusion2-1370288626-bin 88713512 BLAKE2B 87d236dbba41a6b6cade2ea632c15c4f777fb245b7f1161f0b54ff931859b00f9326fa58d6207d5222c44faa6b6e6c44920b7409acc5bbd6b5f6aa920bcb2825 SHA512 ce3fc5c9dc388cd777e978c54b6696d102870f8111122e646637e12cb336767c60ffa8864ffa634012868f2b9ca231598e89438f226ca4465d8c4e936d492b06
+EBUILD intrusion2-1.024.ebuild 1766 BLAKE2B 23adc5988d336861f3b262f7e4e2a692c2de3b60f0c6a1106b9838bfb88d2bfe98d33bf444d83df1fdce56a463d6d189e196ad668f893ff045087ec56db6e665 SHA512 6da748695b73a4b887c50c2327cc589beef6cb08bab0a4a73b7e5ecaf88ecd657ef898d11ce51472775129a637659e1cb18ca896fae5a9443e57fc8d6e5ca283
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-action/intrusion2/intrusion2-1.024.ebuild b/games-action/intrusion2/intrusion2-1.024.ebuild
new file mode 100644
index 000000000000..69aae57e2d33
--- /dev/null
+++ b/games-action/intrusion2/intrusion2-1.024.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils games
+
+USELESS_ID="1370288626"
+DESCRIPTION="Fast paced action sidescroller set in a sci-fi environment"
+HOMEPAGE="http://intrusion2.com"
+SRC_URI="intrusion2-${USELESS_ID}-bin"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+RESTRICT="bindist fetch"
+
+MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
+QA_PREBUILT="${MYGAMEDIR#/}/${PN}"
+
+RDEPEND="
+	amd64? (
+		>=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
+		>=dev-libs/atk-2.10.0[abi_x86_32(-)]
+		>=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)]
+		>=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
+		>=x11-libs/pango-1.36.3[abi_x86_32(-)]
+		>=media-libs/gst-plugins-base-0.10.36[abi_x86_32(-)]
+		>=media-libs/gstreamer-0.10.36-r2[abi_x86_32(-)]
+		>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+		>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
+		>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
+		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+		>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+		>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
+		>=x11-libs/libXtst-1.2.1-r1[abi_x86_32(-)]
+	)
+	x86? (
+		dev-libs/glib:2
+		dev-libs/atk
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		x11-libs/pango
+		media-libs/gst-plugins-base
+		media-libs/gstreamer
+		media-libs/fontconfig
+		media-libs/freetype
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXtst
+	)"
+
+S=${WORKDIR}
+
+pkg_nofetch() {
+	einfo "Please buy & download ${SRC_URI} from:"
+	einfo "  ${HOMEPAGE}"
+	einfo "and move it to ${DISTDIR}"
+	einfo
+}
+
+src_unpack() { :; }
+
+src_install() {
+	exeinto "${MYGAMEDIR}"
+	newexe "${DISTDIR}"/${SRC_URI} ${PN}
+
+	games_make_wrapper ${PN} "${MYGAMEDIR}/${PN}"
+	make_desktop_entry ${PN}
+
+	prepgamesdirs
+}
diff --git a/games-action/intrusion2/metadata.xml b/games-action/intrusion2/metadata.xml
new file mode 100644
index 000000000000..26079e608bed
--- /dev/null
+++ b/games-action/intrusion2/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-action/koth-0.8.0-r1 b/games-action/koth-0.8.0-r1
deleted file mode 100644
index 6e54a99d426a..000000000000
--- a/games-action/koth-0.8.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=media-libs/libggi
-DESCRIPTION=Multiplayer, networked game of little tanks with really big weapons
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/koth/
-KEYWORDS=~alpha ~amd64 ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=media-libs/libggi
-SLOT=0
-SRC_URI=https://savannah.nongnu.org/download/koth/default.pkg/0.8.0/koth-0.8.0.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b6970466e63d409747e96e9ab8cab501
diff --git a/games-action/koth/Manifest b/games-action/koth/Manifest
new file mode 100644
index 000000000000..623a9303fe98
--- /dev/null
+++ b/games-action/koth/Manifest
@@ -0,0 +1,4 @@
+AUX koth-0.8.0-r1-gcc-3.4.patch 628 BLAKE2B e62daab926595507618cc9215612bd11bd901218448cf2a192023ddbd4c13fce70a49f853a50df628adb12c077cd6597b22cbafb67e1ca42394d90defbab6676 SHA512 ca6bfe40d9ab0a08bae833684628422d2b69047ec4aa80df43e0c093184680f8d202180f0ae3d89099b4c45aa481ac28055a1a5deb5afb69e8c397508e46e08e
+DIST koth-0.8.0.tar.bz2 140569 BLAKE2B cfcbba838238fbe45bccc800c258290531341623d4a57825f389a01278febe3b99d9459f4294cea9f4520c0dc76ad945266640c89687ab0b77a5348d2b88685a SHA512 edda377be9074298c63e85cad5f37f55dc67f0e9a7d075a94207559265ffbf8a5eadbd2dc0e4a06e535e6da9fcfd309d01141ba8be04cf8960b0229e0ce4ab9f
+EBUILD koth-0.8.0-r1.ebuild 838 BLAKE2B 52adb1c2da3b9eb6e276e699de9500b5bb296a080923da98cae63a474cf3e7758a8344cb80452dd06fcf0e4dad11937a3b31bc6aaf636590dba87dabed9ab1b4 SHA512 bb5092995841a66257753e845bf53dd3fff8b7de23f809bacdab94189d9ec753be52763c5f235661e15b3a460d435d64ae59e2bb7b6fcda2413de1e2ca0f64a2
+MISC metadata.xml 562 BLAKE2B f5d44dfcf5ed0fa77163ea4ac24d010fe3236130fb0dce1c68b8cb5804e6a5cd088a3b0d14bc573279ed23165d829a2f49516123e57158fd054469271bb20bd5 SHA512 c9bf2b0f6d97e56b9b8d3667fecd9a18bc971f2a396c7bb9a2904ea3e86eec4b625ff73630b4c6a45eea30418e8cfd8b3774a699e45b98b4e44bbb205365d333
diff --git a/games-action/koth/files/koth-0.8.0-r1-gcc-3.4.patch b/games-action/koth/files/koth-0.8.0-r1-gcc-3.4.patch
new file mode 100644
index 000000000000..145f17dbccdd
--- /dev/null
+++ b/games-action/koth/files/koth-0.8.0-r1-gcc-3.4.patch
@@ -0,0 +1,29 @@
+--- a/src/relay.c	2004-11-01 09:19:04.835537536 +0000
++++ b/src/relay.c	2004-11-01 09:19:59.453234384 +0000
+@@ -260,6 +260,7 @@
+ 		    else goto bail;
+ 		    goto nextpkt;
+ 		bail:
++		    ;
+ 		}
+ 	    }	
+ 	}
+--- a/src/ballistics.c	2004-11-01 09:19:33.132235784 +0000
++++ b/src/ballistics.c	2004-11-01 09:20:16.849589736 +0000
+@@ -92,6 +92,7 @@
+ 	    break;
+ 	case WALL_LAST:
+ 	    /* just to satisfy gcc -Wall */
++	    ;
+     }
+ }
+ 
+@@ -210,7 +211,7 @@
+ 		break;
+ 	    case WALL_RANDOM:	/* both of this can't happen, */
+ 	    case WALL_LAST:	/* so they are here to satisfy gcc -Wall */
+-
++	    	;
+ 	}
+     }
+     return FLYING;
diff --git a/games-action/koth/koth-0.8.0-r1.ebuild b/games-action/koth/koth-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..bc77fea14053
--- /dev/null
+++ b/games-action/koth/koth-0.8.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic
+
+DESCRIPTION="Multiplayer, networked game of little tanks with really big weapons"
+HOMEPAGE="http://www.nongnu.org/koth/"
+SRC_URI="https://savannah.nongnu.org/download/${PN}/default.pkg/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="media-libs/libggi"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PF}-gcc-3.4.patch
+)
+
+src_prepare() {
+	default
+	sed -i 's:-g -O2::' configure || die
+	sed -i 's:(uint16):(uint16_t):' src/gfx.c src/gfx.h || die
+	append-cflags -std=gnu89 # build with gcc5 (bug #570730)
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog NEWS README doc/*.txt" \
+		default
+	dodir /etc/koth
+	insinto /etc/koth
+	doins src/koth.cfg
+}
diff --git a/games-action/koth/metadata.xml b/games-action/koth/metadata.xml
new file mode 100644
index 000000000000..af8d2cdcfd9e
--- /dev/null
+++ b/games-action/koth/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>
+<longdescription>
+King of the Hill (KOTH) is a multiplayer, networked artillery game of little tanks with really big weapons set out to destroy one another. Best-known games of this type include the classic DOS game "Scorched Earth: The Mother of All Games" and "Scorched Tanks" for the Amiga.
+</longdescription>
+</pkgmetadata>
diff --git a/games-action/lugaru-20151204-r1 b/games-action/lugaru-20151204-r1
deleted file mode 100644
index d624570bb5a5..000000000000
--- a/games-action/lugaru-20151204-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/libpng:0 media-libs/libsdl[opengl,video] media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=3D arcade with unique fighting system and anthropomorphic characters
-EAPI=6
-HOMEPAGE=https://bitbucket.org/osslugaru/lugaru/wiki/Home
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ free-noncomm CC-BY-SA-3.0
-RDEPEND=media-libs/libpng:0 media-libs/libsdl[opengl,video] media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl
-SLOT=0
-SRC_URI=mirror://gentoo/lugaru-20151204.tar.bz2
-_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_=4a0ade456969f214e2d57af144e678fc
diff --git a/games-action/lugaru/Manifest b/games-action/lugaru/Manifest
new file mode 100644
index 000000000000..25bd52d81ac9
--- /dev/null
+++ b/games-action/lugaru/Manifest
@@ -0,0 +1,4 @@
+AUX lugaru-20151204-dir.patch 317 BLAKE2B 47b73dad97c8a853eb14d6718db18e0541607770419da6b95eb56791f5629a0ebcb1600506934aea30d3cb216c91d38fa8cf45735b0049435693a39a229c48aa SHA512 c0830385ca57dfda082596f65e7166ba71148fcb2b99e416a4a6ef8882c280a823e6308fce9fcfab62127667a10f0ed0ef49df60f1f39627615ff21c9ffd62e2
+DIST lugaru-20151204.tar.bz2 88950866 BLAKE2B d1d42f8d06d20d8f06fbe52d95c925fefc0453cc577dc5a023189eb77508361737ab01298f2035c3071ac7f8a239ee47c13bb8bafa852dd3b5cdecc971e9b4ed SHA512 8e448b782847376ac10585996a91a571fd005ac51e0e510765a35bf44bfcbb09e566d9a9c3d87277e69511b0f8d74c04edcc4b59f467bed640d8ba7c74045e30
+EBUILD lugaru-20151204-r1.ebuild 1158 BLAKE2B 6d8c1123f6d1340afaca28b10167a058c9b53d761b2cfa2ef51b98302686494a20dceb86e0e00f267d2f12ae038501486a9d3cdf1a0dce22fe0c526b16ec70cc SHA512 c71ed998364c6938154a298ed6ff6333ed93fc5c27eba047537823c2e1141671b313b51f0a3758def6e81418372119f2bbb81fc8678e632034c648af5d1e6cf1
+MISC metadata.xml 337 BLAKE2B 5fa6d71103f9aad7af7d0766be33b63f5dcdcbba20c043a2d1183b18a23f4910d49d411defb7f1c604ef085437956af72a55fa366734be5827a3d736bc71f72f SHA512 10af1cda47d8d683fc8245f23c05243fb5809636399d75779081a3da09209829da31a8d5fa070687656e9c235e78c75f1571b5b4f1a686359a11d1232a543b5e
diff --git a/games-action/lugaru/files/lugaru-20151204-dir.patch b/games-action/lugaru/files/lugaru-20151204-dir.patch
new file mode 100644
index 000000000000..da9310dde58e
--- /dev/null
+++ b/games-action/lugaru/files/lugaru-20151204-dir.patch
@@ -0,0 +1,11 @@
+--- a/Source/OpenGL_Windows.cpp	2015-01-14 23:57:19.799186785 -0500
++++ b/Source/OpenGL_Windows.cpp	2015-01-14 23:57:36.022643953 -0500
+@@ -1330,7 +1330,7 @@
+ 
+     // !!! FIXME: we could use a Win32 API for this.  --ryan.
+ #ifndef WIN32
+-    chdirToAppPath(argv[0]);
++    chdir("@GENTOO_DIR@");
+ #endif
+ 
+ 	LOGFUNC;
diff --git a/games-action/lugaru/lugaru-20151204-r1.ebuild b/games-action/lugaru/lugaru-20151204-r1.ebuild
new file mode 100644
index 000000000000..f53cecb8d748
--- /dev/null
+++ b/games-action/lugaru/lugaru-20151204-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils cmake-utils
+
+DESCRIPTION="3D arcade with unique fighting system and anthropomorphic characters"
+HOMEPAGE="https://bitbucket.org/osslugaru/lugaru/wiki/Home"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2+ free-noncomm CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/libpng:0
+	media-libs/libsdl[opengl,video]
+	media-libs/libvorbis
+	media-libs/openal
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg:0
+	virtual/opengl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-dir.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i \
+		-e "s:@GENTOO_DIR@:/usr/share/${PN}:" \
+		Source/OpenGL_Windows.cpp || die
+}
+
+src_configure() {
+	mycmakeargs=(
+		"-DCMAKE_VERBOSE_MAKEFILE=TRUE"
+		"-DLUGARU_FORCE_INTERNAL_OPENGL=False"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	dobin "${WORKDIR}/${P}_build/lugaru"
+	insinto /usr/share/${PN}
+	doins -r Data/
+	newicon Source/win-res/Lugaru.png ${PN}.png
+	make_desktop_entry ${PN} Lugaru ${PN}
+}
diff --git a/games-action/lugaru/metadata.xml b/games-action/lugaru/metadata.xml
new file mode 100644
index 000000000000..f50d5486c2ab
--- /dev/null
+++ b/games-action/lugaru/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="bitbucket">osslugaru/lugaru</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/luola-1.3.2-r1 b/games-action/luola-1.3.2-r1
deleted file mode 100644
index cb2561d669d4..000000000000
--- a/games-action/luola-1.3.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=media-libs/libsdl[X,sound,joystick,video] media-libs/sdl-gfx media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer media-libs/sdl-ttf >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=A 2D multiplayer arcade game resembling V-Wing
-EAPI=6
-HOMEPAGE=https://freecode.com/projects/luola
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[X,sound,joystick,video] media-libs/sdl-gfx media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer media-libs/sdl-ttf
-SLOT=0
-SRC_URI=mirror://gentoo/luola-1.3.2.tar.gz mirror://gentoo/stdlevels-6.0.tar.gz mirror://gentoo/nostalgia-1.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7d0ab4fec651c32b79b649acc0830b06
diff --git a/games-action/luola/Manifest b/games-action/luola/Manifest
new file mode 100644
index 000000000000..a5f1eb522994
--- /dev/null
+++ b/games-action/luola/Manifest
@@ -0,0 +1,6 @@
+AUX luola-1.3.2-underlink.patch 249 BLAKE2B b6cc9e7d9b3acc7b2772c8596357a38bfd318de008e60da3186aff7a4b52a6618dfdda5e0e90a8e9bf751cf6111153e5277d16792728529f195a9cb4c82d6018 SHA512 99a842abc48193ec92ac9005653b70ba0ea07abffe99c598413400cad68ce72b0d10d38e0ee827e49f0c91cd8c85b7f6e0313e369403118d527e8a92b7adf46d
+DIST luola-1.3.2.tar.gz 1774711 BLAKE2B 017327e47066a4ba5d4e1a8f1a7f923f74dc0b3770b43237ba8bfc9f91835d1c8ef18728be5cb85b42a66cc99185942ddd059206fa155d5fa95a897b0176aa5b SHA512 4e8b2f5e813dbb4d951632ded20f013aae6837d525d0068b430ae41319503f206ec27f2873cff241af8ba4cd1728ec89dcf8279a94dbb3094330de1ca531712f
+DIST nostalgia-1.2.tar.gz 1475672 BLAKE2B fda721e35b9afcb50d96309c0fe693d81cee43ae2410299ad026c8a36727870331008e866a0725f88977292fec85d01f4da9618c6070c8ea7265a2a316a9acb2 SHA512 06a03b3398204c04f88fccbbf6a59f11da043c73dc203fe258e09e036364ee73cae337b9828bd27b52ebee6ff456c317143444c3b6c395addcdedf720988731f
+DIST stdlevels-6.0.tar.gz 1850148 BLAKE2B cd621d2e42cf10950fd7c81b6753bd6f8f8df178a8009de9219a40141de4bd73ee7e410e107b7ba99e3e1e7af978291604995cf1f2e52975a3de5ecaeb776837 SHA512 d1823ca8340dea8766310962507bc5aad06c0f737c16c3ce32afaafc0e83a8b7b4d301d5cf65a0466fdaee9ec2a7ce718d03be61b383ac6fe030101466eff11a
+EBUILD luola-1.3.2-r1.ebuild 1170 BLAKE2B 2b2d389d9e64f22f21d7df36daa42991260c229c28b20f486d11de33c2a7eca6fac021b8aa636d3aed5f411ec149fb6b5008a62e228bd9c026e73325aa243ebb SHA512 021624a2ea7c30f4af950086d0649d8ce3383398d6a26fce53f35b936b708b41ccc6ae164c224ceac4229dfef4642c5e46fcc98230c951e5d96512535e411edf
+MISC metadata.xml 325 BLAKE2B 2c5d6a18895f3af0049678aa6eb707808345a81f2d96ce5faa254dba43fe54ab2dac6e1997b44ea3a4dff2bb4d65233864158f5b211b6ef85e234f51b59d9159 SHA512 5e693021a9b1e4a0cff7c4b953648d3e8d9c0acb40d910288f8ed16a558117455e52841ebb32b78909f850b9f5a3b00165aafb343ab15a3e86e7d45a4e00f8c1
diff --git a/games-action/luola/files/luola-1.3.2-underlink.patch b/games-action/luola/files/luola-1.3.2-underlink.patch
new file mode 100644
index 000000000000..2c862bbc30db
--- /dev/null
+++ b/games-action/luola/files/luola-1.3.2-underlink.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.am	2011-06-17 08:41:40.882481147 +0200
++++ b/src/Makefile.am	2011-06-17 08:41:58.497602372 +0200
+@@ -2,7 +2,7 @@
+ 
+ bin_PROGRAMS = luola
+ 
+-luola_LDADD = @SDL_LIBS@
++luola_LDADD = @SDL_LIBS@ -lm
+ 
+ luola_SOURCES = \
+ 	defines.h \
diff --git a/games-action/luola/luola-1.3.2-r1.ebuild b/games-action/luola/luola-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..f346b53fc647
--- /dev/null
+++ b/games-action/luola/luola-1.3.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils autotools gnome2-utils
+
+DESCRIPTION="A 2D multiplayer arcade game resembling V-Wing"
+HOMEPAGE="https://freecode.com/projects/luola"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	mirror://gentoo/stdlevels-6.0.tar.gz
+	mirror://gentoo/nostalgia-1.2.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/libsdl[X,sound,joystick,video]
+	media-libs/sdl-gfx
+	media-libs/sdl-image[jpeg,png]
+	media-libs/sdl-mixer
+	media-libs/sdl-ttf"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-underlink.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-sound
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	insinto /usr/share/${PN}/levels
+	doins "${WORKDIR}"/*.{lev,png}
+	dodoc AUTHORS ChangeLog DATAFILE FAQ LEVELFILE README TODO \
+		RELEASENOTES.txt ../README.Nostalgia
+	newdoc ../README README.stdlevels
+	doicon -s 64 luola.png
+	make_desktop_entry luola Luola
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-action/luola/metadata.xml b/games-action/luola/metadata.xml
new file mode 100644
index 000000000000..5fc36fdad374
--- /dev/null
+++ b/games-action/luola/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="freecode">luola</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/maelstrom-3.0.6-r3 b/games-action/maelstrom-3.0.6-r3
deleted file mode 100644
index f500bdb8f814..000000000000
--- a/games-action/maelstrom-3.0.6-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-net >=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=An asteroids battle game
-EAPI=6
-HOMEPAGE=http://www.libsdl.org/projects/Maelstrom/
-KEYWORDS=~alpha ~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-net
-SLOT=0
-SRC_URI=http://www.libsdl.org/projects/Maelstrom/src/Maelstrom-3.0.6.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b2f94485ccb3c2d3bf65b48460e07a7d
diff --git a/games-action/maelstrom/Manifest b/games-action/maelstrom/Manifest
new file mode 100644
index 000000000000..254815c37b6d
--- /dev/null
+++ b/games-action/maelstrom/Manifest
@@ -0,0 +1,8 @@
+AUX maelstrom-3.0.6-64bits.patch 499 BLAKE2B fd74e9af6a9c5937ceef5c95ee865a133a5cd6eaa3864437fcd6f8b1db1bd8934861ec11c802dbb19875e81583b7f0e53db857071de209275c66793df1b00d22 SHA512 b75c094aa91ff443bed86b34ebb52a19221cdc69fd2745a714f1d7728dddd9886c8874054dff7a02513cff7a67cb6c115d7a2757401dd5bcaa96a52537f530a1
+AUX maelstrom-3.0.6-gcc34.patch 878 BLAKE2B 6b260e8214f2a9b20f32ab3fde9950b2a115c9f6ca81bb1de7d7ea045c40a6c5b54694b034f554e6e060497b6d13495d822a410b7201244b5e1ce429cffbd885 SHA512 5427e198d6a595f9d68357d0ad31b8d1d7c6bc8db7dde261269a660d8e6102d83d592128e1e2f1c82285e764808f166798cb4a9121d88a8ec7c047efa6d856d6
+AUX maelstrom-3.0.6-gcc53.patch 537 BLAKE2B e5b0d5fe7cfdab51633988b93f592acc450b90e3732f035dc5b31a77b3319ab6f54d490eb992cb4d543e04489866ce2f068a24a4860980f4be474a5b04adc43b SHA512 cfd30e1474a084a1c45831b3d7c3f2a22ca6920e84838c4ff7615f179d377713d181f6d2bca3e660ee58ba2a62378838dec52cdb24fd896efecc40ff43a9c459
+AUX maelstrom-3.0.6-security.patch 14189 BLAKE2B 54af3ec92a0b8d3d7fdfa865114e65ab4ee3667cbdfedcd1d4cad6394273619a9d3cb7448dfa0e92f5a017d8778087e9be76e4615557cd59f20118b5c7c8f11b SHA512 7e8c6c5c7244fa8871fe55b95e9d2a8c631735590dba04e9e2dfed62e2dfc6264f1b990f3737d797c7762fbceda17474782b1720f944d444bdb8627b43188cb3
+AUX maelstrom-3.0.6-warnings.patch 438 BLAKE2B 8075ff8a90660e70837c48fa44d10cc0e284e3e51832d689dc87baa6b9aa19c9490c405bbd837aeb6d15988508402cb2a21a209723ff146f5bd5e9c0ca38fba2 SHA512 5310843f4a126acf62686aaa9d2086a85a313258fbc0b35b27a8bf7a24389a70264691454a018252d1997bc70093dbaf80c44282c3c59ba39d8cfaa7018866f7
+DIST Maelstrom-3.0.6.tar.gz 1007421 BLAKE2B 652aff33fa683307632ca1be35701c6cce62536845c459d9a06636871da504b2878ef0853d232ccbe854d8d541b97d91accdecc25f34ca17ef4bc9fcf516ea02 SHA512 fecd2411f5d2109aa99e5a6c65702c74f9f79326fc9f074a53005238c846780f231776b9c170ceb54b0470894b856abaa4708c59afd912fa5b2868e6776893ca
+EBUILD maelstrom-3.0.6-r3.ebuild 1946 BLAKE2B ecb3a40b69c420de00ed1f37f3e0410c006385c3672b8b5ef9a807624916eeea552657d7b9a2849d233adac46a7c78dccfd0ba85d4332e13e31dd128a24e5cc3 SHA512 b3c39bb003bb18e214347436cfa3d049cab8357ed376e2c41095371a17e16a8b9535c1914da81c3b28bd03d4954c5d14541f7e11682dbad29bd197fc13b55150
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/maelstrom/files/maelstrom-3.0.6-64bits.patch b/games-action/maelstrom/files/maelstrom-3.0.6-64bits.patch
new file mode 100644
index 000000000000..7d6f59a5ac26
--- /dev/null
+++ b/games-action/maelstrom/files/maelstrom-3.0.6-64bits.patch
@@ -0,0 +1,15 @@
+--- a/screenlib/SDL_FrameBuf.cpp	2006-10-25 22:37:21.000000000 +0200
++++ b/screenlib/SDL_FrameBuf.cpp	2006-10-25 22:38:26.000000000 +0200
+@@ -847,10 +847,8 @@
+ 			/* Update the dirty rectangle map with the new list */
+ 			for ( i=0; i<dirtymaplen; ++i ) {
+ 				if ( dirtymap[i] != NULL ) {
+-					dirtymap[i] = (SDL_Rect *)(
+-					((int)dirtymap[i]-(int)updatelist) +
+-								(int)newlist
+-					);
++					dirtymap[i] = newlist
++						+ (dirtymap[i]-updatelist);
+ 				}
+ 			}
+ 			delete[] updatelist;
diff --git a/games-action/maelstrom/files/maelstrom-3.0.6-gcc34.patch b/games-action/maelstrom/files/maelstrom-3.0.6-gcc34.patch
new file mode 100644
index 000000000000..6ceb421f16ba
--- /dev/null
+++ b/games-action/maelstrom/files/maelstrom-3.0.6-gcc34.patch
@@ -0,0 +1,30 @@
+diff -ur Maelstrom-3.0.6-orig/buttonlist.h Maelstrom-3.0.6/buttonlist.h
+--- Maelstrom-3.0.6-orig/buttonlist.h	2004-08-28 01:43:55.867378220 -0400
++++ Maelstrom-3.0.6/buttonlist.h	2004-08-28 01:44:23.700062593 -0400
+@@ -16,7 +16,7 @@
+ 
+ 	void Add_Button(Uint16 x, Uint16 y, Uint16 width, Uint16 height, 
+ 						void (*callback)(void)) {
+-		struct button *belem;
++		button *belem;
+ 		
+ 		for ( belem=&button_list; belem->next; belem=belem->next );
+ 		belem->next = new button;
+@@ -30,7 +30,7 @@
+ 	}
+ 
+ 	void Activate_Button(Uint16 x, Uint16 y) {
+-		struct button *belem;
++		button *belem;
+ 
+ 		for ( belem=button_list.next; belem; belem=belem->next ) {
+ 			if ( (x >= belem->x1) && (x <= belem->x2) &&
+@@ -42,7 +42,7 @@
+ 	}
+ 
+ 	void Delete_Buttons(void) {
+-		struct button *belem, *btemp;
++		button *belem, *btemp;
+ 
+ 		for ( belem=button_list.next; belem; ) {
+ 			btemp = belem;
diff --git a/games-action/maelstrom/files/maelstrom-3.0.6-gcc53.patch b/games-action/maelstrom/files/maelstrom-3.0.6-gcc53.patch
new file mode 100644
index 000000000000..db7624bacf91
--- /dev/null
+++ b/games-action/maelstrom/files/maelstrom-3.0.6-gcc53.patch
@@ -0,0 +1,11 @@
+--- Maelstrom-3.0.6/Maelstrom-netd.c.orig	2016-06-04 06:02:44.000000000 +0300
++++ Maelstrom-3.0.6/Maelstrom-netd.c	2016-06-05 13:45:11.422533649 +0300
+@@ -204,7 +204,7 @@
+ 	memset(&serv_addr, 0, sizeof(serv_addr));
+ 	serv_addr.sin_family      = AF_INET;
+ 	serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
+-	serv_addr.sin_port        = htons(NETPLAY_PORT-1);
++	serv_addr.sin_port        = htons(NETPLAY_PORT - 1);
+ 	if (bind(netfd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) < 0) {
+ 		perror("Can't bind local address");
+ 		exit(3);
diff --git a/games-action/maelstrom/files/maelstrom-3.0.6-security.patch b/games-action/maelstrom/files/maelstrom-3.0.6-security.patch
new file mode 100644
index 000000000000..ae22c0cdd11a
--- /dev/null
+++ b/games-action/maelstrom/files/maelstrom-3.0.6-security.patch
@@ -0,0 +1,380 @@
+diff -ur Maelstrom-3.0.6-orig/controls.cpp Maelstrom-3.0.6/controls.cpp
+--- Maelstrom-3.0.6-orig/controls.cpp	2001-03-25 03:04:28 +0900
++++ Maelstrom-3.0.6/controls.cpp	2003-05-21 11:25:53 +0900
+@@ -83,7 +83,7 @@
+ 	if ( fname ) {
+ 		*fname = datafile;
+ 	}
+-	sprintf(datafile,  "%s"DIR_SEP"%s", home, MAELSTROM_DATA);
++	snprintf(datafile, sizeof(datafile), "%s"DIR_SEP"%s", home, MAELSTROM_DATA);
+ 	if ( (data=fopen(datafile, mode)) == NULL )
+ 		return(NULL);
+ 	return(data);
+diff -ur Maelstrom-3.0.6-orig/dialog.h Maelstrom-3.0.6/dialog.h
+--- Maelstrom-3.0.6-orig/dialog.h	2001-07-21 00:08:10 +0900
++++ Maelstrom-3.0.6/dialog.h	2003-05-21 11:24:33 +0900
+@@ -92,7 +92,7 @@
+ 		va_list ap;
+ 
+ 		va_start(ap, fmt);
+-		vsprintf(errbuf, fmt, ap);
++		vsnprintf(errbuf, sizeof(errbuf), fmt, ap);
+ 		va_end(ap);
+ 		errstr = errbuf;
+         }
+@@ -878,7 +878,7 @@
+ 		if ( entry->text ) {
+ 			Fontserv->FreeText(entry->text);
+ 		}
+-		sprintf(buf, "%d", *entry->variable);
++		snprintf(buf, sizeof(buf), "%d", *entry->variable);
+ 
+ 		if ( entry->hilite ) {
+ 			clear = Fg;
+diff -ur Maelstrom-3.0.6-orig/load.cpp Maelstrom-3.0.6/load.cpp
+--- Maelstrom-3.0.6-orig/load.cpp	2000-02-15 11:47:39 +0900
++++ Maelstrom-3.0.6/load.cpp	2003-05-21 11:26:18 +0900
+@@ -81,7 +81,7 @@
+ 	SDL_Surface *bmp, *title;
+ 	
+ 	/* Open the title file -- we know its colormap is our global one */
+-	sprintf(file, "Images"DIR_SEP"Maelstrom_Titles#%d.bmp", title_id);
++	snprintf(file, sizeof(file), "Images"DIR_SEP"Maelstrom_Titles#%d.bmp", title_id);
+ 	bmp = SDL_LoadBMP(path.Path(file));
+ 	if ( bmp == NULL ) {
+ 		return(NULL);
+@@ -103,7 +103,7 @@
+ 	Uint16 w, h;
+ 	
+ 	/* Open the cicn sprite file.. */
+-	sprintf(file, "Images"DIR_SEP"Maelstrom_Icon#%hd.cicn", cicn_id);
++	snprintf(file, sizeof(file), "Images"DIR_SEP"Maelstrom_Icon#%hd.cicn", cicn_id);
+ 	if ( (cicn_src=SDL_RWFromFile(path.Path(file), "r")) == NULL ) {
+ 		error("GetCIcon(%hd): Can't open CICN %s: ",
+ 					cicn_id, path.Path(file));
+diff -ur Maelstrom-3.0.6-orig/maclib/Mac_FontServ.h Maelstrom-3.0.6/maclib/Mac_FontServ.h
+--- Maelstrom-3.0.6-orig/maclib/Mac_FontServ.h	1999-12-03 02:15:33 +0900
++++ Maelstrom-3.0.6/maclib/Mac_FontServ.h	2003-05-21 11:28:43 +0900
+@@ -135,7 +135,7 @@
+ 		va_list ap;
+ 
+ 		va_start(ap, fmt);
+-		vsprintf(errbuf, fmt, ap);
++		vsnprintf(errbuf, sizeof(errbuf), fmt, ap);
+ 		va_end(ap);
+ 		errstr = errbuf;
+ 	}
+diff -ur Maelstrom-3.0.6-orig/maclib/Mac_Resource.h Maelstrom-3.0.6/maclib/Mac_Resource.h
+--- Maelstrom-3.0.6-orig/maclib/Mac_Resource.h	1999-12-04 03:01:47 +0900
++++ Maelstrom-3.0.6/maclib/Mac_Resource.h	2003-05-21 11:28:35 +0900
+@@ -96,7 +96,7 @@
+ 		va_list ap;
+ 
+ 		va_start(ap, fmt);
+-		vsprintf(errbuf, fmt, ap);
++		vsnprintf(errbuf, sizeof(errbuf), fmt, ap);
+ 		va_end(ap);
+ 		errstr = errbuf;
+ 	}
+diff -ur Maelstrom-3.0.6-orig/maclib/Mac_Sound.h Maelstrom-3.0.6/maclib/Mac_Sound.h
+--- Maelstrom-3.0.6-orig/maclib/Mac_Sound.h	2002-10-20 11:53:34 +0900
++++ Maelstrom-3.0.6/maclib/Mac_Sound.h	2003-05-21 11:28:27 +0900
+@@ -199,7 +199,7 @@
+ 		va_list ap;
+ 
+ 		va_start(ap, fmt);
+-		vsprintf(errbuf, fmt, ap);
++		vsnprintf(errbuf, sizeof(errbuf), fmt, ap);
+ 		va_end(ap);
+ 		errstr = errbuf;
+ 	}
+diff -ur Maelstrom-3.0.6-orig/maclib/Mac_Wave.h Maelstrom-3.0.6/maclib/Mac_Wave.h
+--- Maelstrom-3.0.6-orig/maclib/Mac_Wave.h	2000-01-26 01:44:10 +0900
++++ Maelstrom-3.0.6/maclib/Mac_Wave.h	2003-05-21 11:28:20 +0900
+@@ -108,7 +108,7 @@
+ 		va_list ap;
+ 
+ 		va_start(ap, fmt);
+-		vsprintf(errbuf, fmt, ap);
++		vsnprintf(errbuf, sizeof(errbuf), fmt, ap);
+ 		va_end(ap);
+ 		errstr = errbuf;
+ 	}
+diff -ur Maelstrom-3.0.6-orig/maclib/macres.cpp Maelstrom-3.0.6/maclib/macres.cpp
+--- Maelstrom-3.0.6-orig/maclib/macres.cpp	2000-01-26 01:44:20 +0900
++++ Maelstrom-3.0.6/maclib/macres.cpp	2003-05-21 11:30:01 +0900
+@@ -58,8 +58,8 @@
+ 				ids[j], res->ResourceName(types[i], ids[j]));
+ 			if ( argv[2] ) {
+ 				char path[23];
+-				sprintf(path,"%s/%s:%hu", argv[2],
+-							types[i], ids[j]);
++				snprintf(path, sizeof(path), "%s/%s:%hu",
++					 argv[2], types[i], ids[j]);
+ 				FILE *output;
+ 				Mac_ResData *D;
+             			if ( (output=fopen(path, "w")) != NULL ) {
+diff -ur Maelstrom-3.0.6-orig/maclib/snd2wav.cpp Maelstrom-3.0.6/maclib/snd2wav.cpp
+--- Maelstrom-3.0.6-orig/maclib/snd2wav.cpp	2001-03-28 12:54:50 +0900
++++ Maelstrom-3.0.6/maclib/snd2wav.cpp	2003-05-21 11:29:23 +0900
+@@ -82,7 +82,7 @@
+ 			continue;
+ 		}
+ 		wave.Load(snd, rate);
+-		sprintf(wavname, "snd_%d.wav", ids[i]);
++		snprintf(wavname, sizeof(wavname), "snd_%d.wav", ids[i]);
+ 		wave.Save(wavname);
+ 	}
+ 	delete macx;
+diff -ur Maelstrom-3.0.6-orig/main.cpp Maelstrom-3.0.6/main.cpp
+--- Maelstrom-3.0.6-orig/main.cpp	2002-10-20 11:53:32 +0900
++++ Maelstrom-3.0.6/main.cpp	2003-05-21 11:27:02 +0900
+@@ -445,7 +445,7 @@
+ 		DrawText(xOff+309-7, yOff+240-6, text, geneva, STYLE_BOLD,
+ 							0x00, 0x00, 0x00);
+ 	}
+-	sprintf(text, "%d", gSoundLevel);
++	snprintf(text, sizeof(text), "%d", gSoundLevel);
+ 	DrawText(xOff+309-7, yOff+240-6, text, geneva, STYLE_BOLD,
+ 						30000>>8, 30000>>8, 0xFF);
+ 	screen->Update();
+@@ -547,11 +547,11 @@
+ 		}
+ 		DrawText(xOff+5, botDiv+42+(index*18), hScores[index].name,
+ 						font, STYLE_BOLD, R, G, B);
+-		sprintf(buffer, "%u", hScores[index].score);
++		snprintf(buffer, sizeof(buffer), "%u", hScores[index].score);
+ 		sw = fontserv->TextWidth(buffer, font, STYLE_BOLD);
+ 		DrawText(sRt-sw, botDiv+42+(index*18), buffer, 
+ 						font, STYLE_BOLD, R, G, B);
+-		sprintf(buffer, "%u", hScores[index].wave);
++		snprintf(buffer, sizeof(buffer), "%u", hScores[index].wave);
+ 		sw = fontserv->TextWidth(buffer, font, STYLE_BOLD);
+ 		DrawText(wRt-sw, botDiv+42+(index*18), buffer, 
+ 						font, STYLE_BOLD, R, G, B);
+@@ -560,7 +560,7 @@
+ 
+ 	DrawText(xOff+5, botDiv+46+(10*18)+3, "Last Score: ", 
+ 					bigfont, STYLE_NORM, 0xFF, 0xFF, 0xFF);
+-	sprintf(buffer, "%d", GetScore());
++	snprintf(buffer, sizeof(buffer), "%d", GetScore());
+ 	sw = fontserv->TextWidth("Last Score: ", bigfont, STYLE_NORM);
+ 	DrawText(xOff+5+sw, botDiv+46+(index*18)+3, buffer, 
+ 					bigfont, STYLE_NORM, 0xFF, 0xFF, 0xFF);
+diff -ur Maelstrom-3.0.6-orig/myerror.cpp Maelstrom-3.0.6/myerror.cpp
+--- Maelstrom-3.0.6-orig/myerror.cpp	1998-07-14 10:50:17 +0900
++++ Maelstrom-3.0.6/myerror.cpp	2003-05-21 11:23:33 +0900
+@@ -16,7 +16,7 @@
+ 	va_list ap;
+ 
+ 	va_start(ap, fmt);
+-	vsprintf(mesg, fmt, ap);
++	vsnprintf(mesg, sizeof(mesg), fmt, ap);
+ 	fputs(mesg, stderr);
+ 	va_end(ap);
+ }
+@@ -27,7 +27,7 @@
+ 	va_list ap;
+ 
+ 	va_start(ap, fmt);
+-	vsprintf(mesg, fmt, ap);
++	vsnprintf(mesg, sizeof(mesg), fmt, ap);
+ 	fputs(mesg, stdout);
+ 	va_end(ap);
+ }
+@@ -37,7 +37,7 @@
+ 	char buffer[BUFSIZ];
+ 
+ 	if ( *msg ) {
+-		sprintf(buffer, "%s: %s\n", msg, strerror(errno));
++		snprintf(buffer, sizeof(buffer), "%s: %s\n", msg, strerror(errno));
+ 		error(buffer);
+ 	} else
+ 		error((char *)strerror(errno));
+diff -ur Maelstrom-3.0.6-orig/netlogic/game.cpp Maelstrom-3.0.6/netlogic/game.cpp
+--- Maelstrom-3.0.6-orig/netlogic/game.cpp	2001-07-23 11:24:03 +0900
++++ Maelstrom-3.0.6/netlogic/game.cpp	2003-05-21 11:33:19 +0900
+@@ -232,7 +232,7 @@
+ 
+ 			lastDisplayed = gDisplayed;
+ 			screen->FillRect(0, 0, SCREEN_WIDTH, 12, ourBlack);
+-			sprintf(caption,
++			snprintf(caption, sizeof(caption),
+ 				"You are player %d --- displaying player %d",
+ 						gOurPlayer+1, gDisplayed+1);
+ 			DrawText(SPRITES_WIDTH, 11, caption, geneva,
+@@ -357,7 +357,7 @@
+ 				/* -- Erase old and draw new score */
+ 				screen->FillRect(45, gStatusLine+1,
+ 					score_width, text_height, ourBlack);
+-				sprintf(numbuf, "%d", Score);
++				snprintf(numbuf, sizeof(numbuf), "%d", Score);
+ 				score_width = DrawText(45, gStatusLine+11, 
+ 						numbuf, geneva, STYLE_BOLD,
+ 							0xFF, 0xFF, 0xFF);
+@@ -380,7 +380,7 @@
+ 		if (lastWave != gWave) {
+ 			screen->FillRect(255, gStatusLine+1,
+ 					wave_width, text_height, ourBlack);
+-			sprintf(numbuf, "%d", gWave);
++			snprintf(numbuf, sizeof(numbuf), "%d", gWave);
+ 			wave_width = DrawText(255, gStatusLine+11, 
+ 					numbuf, geneva, STYLE_BOLD,
+ 							0xFF, 0xFF, 0xFF);
+@@ -391,7 +391,7 @@
+ 		if (lastLives != Lives) {
+ 			screen->FillRect(319, gStatusLine+1,
+ 					lives_width, text_height, ourBlack);
+-			sprintf(numbuf, "%-3.1d", Lives);
++			snprintf(numbuf, sizeof(numbuf), "%-3.1d", Lives);
+ 			lives_width = DrawText(319, gStatusLine+11,
+ 					numbuf, geneva, STYLE_BOLD,
+ 							0xFF, 0xFF, 0xFF);
+@@ -402,7 +402,7 @@
+ 		if (lastBonus != Bonus) {
+ 			screen->FillRect(384, gStatusLine+1,
+ 					bonus_width, text_height, ourBlack);
+-			sprintf(numbuf, "%-7.1d", Bonus);
++			snprintf(numbuf, sizeof(numbuf), "%-7.1d", Bonus);
+ 			bonus_width = DrawText(384, gStatusLine+11,
+ 					numbuf, geneva, STYLE_BOLD,
+ 							0xFF, 0xFF, 0xFF);
+@@ -414,7 +414,7 @@
+ 			if (lastFrags != Frags) {
+ 				screen->FillRect(fragoff, gStatusLine+1,
+ 					frags_width, text_height, ourBlack);
+-				sprintf(numbuf, "%-3.1d", Frags);
++				snprintf(numbuf, sizeof(numbuf), "%-3.1d", Frags);
+ 				frags_width = DrawText(fragoff, gStatusLine+11,
+ 						numbuf, geneva, STYLE_BOLD,
+ 							0xFF, 0xFF, 0xFF);
+@@ -747,10 +747,11 @@
+ 		for ( i=0; i<gNumPlayers; ++i ) {
+ 			char buffer[BUFSIZ], num1[12], num2[12];
+ 
+-			sprintf(num1, "%7.1d", final[i].Score);
+-			sprintf(num2, "%3.1d", final[i].Frags);
+-			sprintf(buffer, "Player %d: %-.7s Points, %-.3s Frags",
+-						final[i].Player, num1, num2);
++			snprintf(num1, sizeof(num1), "%7.1d", final[i].Score);
++			snprintf(num2, sizeof(num2), "%3.1d", final[i].Frags);
++			snprintf(buffer, sizeof(buffer),
++				 "Player %d: %-.7s Points, %-.3s Frags",
++				 final[i].Player, num1, num2);
+ 			DrawText(160, 380+i*newyork_height, buffer,
+ 				newyork, STYLE_NORM, 30000>>8, 30000>>8, 0xFF);
+ 		}
+@@ -898,7 +899,7 @@
+ 	
+ 
+ 	/* -- Draw the wave completed message */
+-	sprintf(numbuf, "Wave %d completed.", gWave);
++	snprintf(numbuf, sizeof(numbuf), "Wave %d completed.", gWave);
+ 	sw = fontserv->TextWidth(numbuf, geneva, STYLE_BOLD);
+ 	x = (SCREEN_WIDTH - sw) / 2;
+ 	DrawText(x,  150, numbuf, geneva, STYLE_BOLD, 0xFF, 0xFF, 0x00);
+@@ -935,7 +936,7 @@
+ 		if (OurShip->GetBonusMult() != 1) {
+ 			SDL_Surface *sprite;
+ 
+-			sprintf(numbuf, "%-5.1d", OurShip->GetBonus());
++			snprintf(numbuf, sizeof(numbuf), "%-5.1d", OurShip->GetBonus());
+ 			DrawText(x, 200, numbuf, geneva, STYLE_BOLD,
+ 							0xFF, 0xFF, 0xFF);
+ 			x += 75;
+@@ -951,10 +952,10 @@
+ 	Delay(SOUND_DELAY);
+ 	sound->PlaySound(gFunk, 5);
+ 
+-	sprintf(numbuf, "%-5.1d", OurShip->GetBonus());
++	snprintf(numbuf, sizeof(numbuf), "%-5.1d", OurShip->GetBonus());
+ 	bonus_width = DrawText(x, 200, numbuf, geneva, STYLE_BOLD,
+ 							0xFF, 0xFF, 0xFF);
+-	sprintf(numbuf, "%-5.1d", OurShip->GetScore());
++	snprintf(numbuf, sizeof(numbuf), "%-5.1d", OurShip->GetScore());
+ 	score_width = DrawText(xt, 220, numbuf, geneva, STYLE_BOLD,
+ 							0xFF, 0xFF, 0xFF);
+ 	screen->Update();
+@@ -997,12 +998,12 @@
+ 	
+ 			screen->FillRect(x, 200-text_height+2,
+ 					bonus_width, text_height, ourBlack);
+-			sprintf(numbuf, "%-5.1d", OurShip->GetBonus());
++			snprintf(numbuf, sizeof(numbuf), "%-5.1d", OurShip->GetBonus());
+ 			bonus_width = DrawText(x, 200, numbuf,
+ 					geneva, STYLE_BOLD, 0xFF, 0xFF, 0xFF);
+ 			screen->FillRect(xt, 220-text_height+2,
+ 					score_width, text_height, ourBlack);
+-			sprintf(numbuf, "%-5.1d", OurShip->GetScore());
++			snprintf(numbuf, sizeof(numbuf), "%-5.1d", OurShip->GetScore());
+ 			score_width = DrawText(xt, 220, numbuf,
+ 					geneva, STYLE_BOLD, 0xFF, 0xFF, 0xFF);
+ 
+@@ -1015,7 +1016,7 @@
+ 	HandleEvents(10);
+ 
+ 	/* -- Draw the "next wave" message */
+-	sprintf(numbuf, "Prepare for Wave %d...", gWave+1);
++	snprintf(numbuf, sizeof(numbuf), "Prepare for Wave %d...", gWave+1);
+ 	sw = fontserv->TextWidth(numbuf, geneva, STYLE_BOLD);
+ 	x = (SCREEN_WIDTH - sw)/2;
+ 	DrawText(x, 259, numbuf, geneva, STYLE_BOLD, 0xFF, 0xFF, 0x00);
+diff -ur Maelstrom-3.0.6-orig/netlogic/netplay.cpp Maelstrom-3.0.6/netlogic/netplay.cpp
+--- Maelstrom-3.0.6-orig/netlogic/netplay.cpp	2002-10-20 13:11:52 +0900
++++ Maelstrom-3.0.6/netlogic/netplay.cpp	2003-05-21 11:31:43 +0900
+@@ -670,7 +670,9 @@
+ 		strcpy(message, "Waiting for players:");
+ 		for ( i=0; i<gNumPlayers; ++i ) {
+ 			if ( ! acked[i] )
+-				sprintf(&message[strlen(message)], " %d", i+1);
++				snprintf(&message[strlen(message)],
++					 sizeof(message)-strlen(message),
++					 " %d", i+1);
+ 		}
+ 		Message(message);
+ 
+@@ -725,7 +727,7 @@
+ 			/* Check the player... */
+ 			if ( (i != gOurPlayer) && (netbuf[1] == gOurPlayer) ) {
+ 				/* Print message, sleep 3 seconds absolutely */
+-				sprintf(message, 
++			  snprintf(message, sizeof(message),
+ 	"Error: Another player (%d) thinks they are player 1!\r\n", i+1);
+ 				ErrorMessage(message);
+ 				/* Suck up retransmission packets */
+diff -ur Maelstrom-3.0.6-orig/netscore.cpp Maelstrom-3.0.6/netscore.cpp
+--- Maelstrom-3.0.6-orig/netscore.cpp	2001-07-23 12:25:17 +0900
++++ Maelstrom-3.0.6/netscore.cpp	2003-05-21 11:27:18 +0900
+@@ -59,7 +59,7 @@
+ 
+ 	/* Send the scores */
+ 	crc = get_checksum(key, KEY_LEN);
+-	sprintf(netbuf, SCOREFMT, crc, high.name, high.score, high.wave);
++	snprintf(netbuf, sizeof(netbuf), SCOREFMT, crc, high.name, high.score, high.wave);
+ 	SDLNet_TCP_Send(remote, netbuf, strlen(netbuf));
+ 	n = SDLNet_TCP_Recv(remote, netbuf, 1024);
+ 	if ( n > 0 ) {
+diff -ur Maelstrom-3.0.6-orig/screenlib/SDL_FrameBuf.cpp Maelstrom-3.0.6/screenlib/SDL_FrameBuf.cpp
+--- Maelstrom-3.0.6-orig/screenlib/SDL_FrameBuf.cpp	2001-07-23 06:03:13 +0900
++++ Maelstrom-3.0.6/screenlib/SDL_FrameBuf.cpp	2003-05-21 11:31:01 +0900
+@@ -628,7 +628,7 @@
+ 
+ 		found = 0;
+ 		for ( which=0; !found; ++which ) {
+-			sprintf(file, "%s%d.bmp", prefix, which);
++			snprintf(file, sizeof(file), "%s%d.bmp", prefix, which);
+ 			if ( ((fp=fopen(file, "r")) == NULL) &&
+ 			     ((fp=fopen(file, "w")) != NULL) ) {
+ 				found = 1;
+diff -ur Maelstrom-3.0.6-orig/screenlib/SDL_FrameBuf.h Maelstrom-3.0.6/screenlib/SDL_FrameBuf.h
+--- Maelstrom-3.0.6-orig/screenlib/SDL_FrameBuf.h	2000-09-25 02:55:39 +0900
++++ Maelstrom-3.0.6/screenlib/SDL_FrameBuf.h	2003-05-21 11:27:41 +0900
+@@ -165,7 +165,7 @@
+ 		va_list ap;
+ 
+ 		va_start(ap, fmt);
+-		vsprintf(errbuf, fmt, ap);
++		vsnprintf(errbuf, sizeof(errbuf), fmt, ap);
+ 		va_end(ap);
+ 		errstr = errbuf;
+         }
diff --git a/games-action/maelstrom/files/maelstrom-3.0.6-warnings.patch b/games-action/maelstrom/files/maelstrom-3.0.6-warnings.patch
new file mode 100644
index 000000000000..8b2ca084c65f
--- /dev/null
+++ b/games-action/maelstrom/files/maelstrom-3.0.6-warnings.patch
@@ -0,0 +1,20 @@
+--- a/Maelstrom-netd.c	2014-03-18 01:00:28.408099526 -0400
++++ b/Maelstrom-netd.c	2014-03-18 01:01:29.892142782 -0400
+@@ -1,7 +1,9 @@
+ 
+ /* Here we go... */
+ 
++#include <stdlib.h>
+ #include <stdio.h>
++#include <time.h>
+ #include <string.h>
+ #include <signal.h>
+ #include <errno.h>
+@@ -9,6 +11,7 @@
+ #include <sys/time.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
++#include <arpa/inet.h>
+ #include <netdb.h>
+ #include <unistd.h>
+ 
diff --git a/games-action/maelstrom/maelstrom-3.0.6-r3.ebuild b/games-action/maelstrom/maelstrom-3.0.6-r3.ebuild
new file mode 100644
index 000000000000..bd1110643dbe
--- /dev/null
+++ b/games-action/maelstrom/maelstrom-3.0.6-r3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils user
+
+MY_P=Maelstrom-${PV}
+DESCRIPTION="An asteroids battle game"
+HOMEPAGE="http://www.libsdl.org/projects/Maelstrom/"
+SRC_URI="http://www.libsdl.org/projects/Maelstrom/src/${MY_P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND="media-libs/libsdl[sound,joystick,video]
+		media-libs/sdl-net"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-security.patch
+	"${FILESDIR}"/${P}-64bits.patch
+	"${FILESDIR}"/${P}-gcc34.patch
+	"${FILESDIR}"/${P}-warnings.patch
+	"${FILESDIR}"/${P}-gcc53.patch
+)
+
+pkg_setup(){
+	enewgroup gamestat 36
+}
+
+src_prepare() {
+	default
+
+	# Install the data into $(datadir)/..., not $(prefix)/games/...
+	sed -i \
+		-e "s:(prefix)/games/:(datadir)/:" configure.in || die
+	sed -i \
+		-e '/make install_gamedata/ { s:=:=$(DESTDIR)/:; s/make/$(MAKE)/; s/install_gamedata/install-binPROGRAMS install_gamedata/; }' Makefile.am || die
+	# Install the high scores file in ${GAMES_STATEDIR}
+	sed -i \
+		-e "s:path.Path(MAELSTROM_SCORES):\"/var/games/\"MAELSTROM_SCORES:" scores.cpp || die
+	mv configure.{in,ac}
+	rm aclocal.m4 acinclude.m4
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc Changelog Docs/{Maelstrom-Announce,*FAQ,MaelstromGPL_press_release,*.Paper,Technical_Notes*}
+
+	newicon "${D}/usr/share/Maelstrom/icon.xpm" maelstrom.xpm
+	make_desktop_entry Maelstrom "Maelstrom" maelstrom
+
+	# Put the high scores file in the right place
+	insinto /var/games
+	doins "${D}/usr/share/Maelstrom/Maelstrom-Scores"
+
+	# clean up some cruft
+	rm -f \
+		"${D}/usr/share/Maelstrom/Maelstrom-Scores" \
+		"${D}/usr/share/Maelstrom/Images/Makefile*"
+
+	# make sure we can update the high scores
+	fowners root:gamestat /var/games/Maelstrom-Scores /usr/bin/Maelstrom{,-netd}
+	fperms 2755 /usr/bin/Maelstrom{,-netd}
+	fperms 660 /var/games/Maelstrom-Scores
+}
diff --git a/games-action/maelstrom/metadata.xml b/games-action/maelstrom/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-action/maelstrom/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-action/metadata.xml b/games-action/metadata.xml
new file mode 100644
index 000000000000..dd0a884f0100
--- /dev/null
+++ b/games-action/metadata.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The games-action category contains action games.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie games-action enthält Actionspiele.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría games-action contiene juegos de acción.
+	</longdescription>
+	<longdescription lang="ja">
+		games-actionカテゴリーにはアクション・ゲームが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De games-action categorie bevat actiespellen.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm games-action chứa các trò chơi thuộc thể loại hành động.
+	</longdescription>
+	<longdescription lang="sk">
+		Kategória games-action obsahuje akčné hry.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria games-action contiene giochi d'azione.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria games-action contém jogos de ação.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria games-action zawiera gry akcji.
+	</longdescription>
+</catmetadata>
+
diff --git a/games-action/minetest-0.4.16-r1 b/games-action/minetest-0.4.16-r1
deleted file mode 100644
index daeda73ded12..000000000000
--- a/games-action/minetest-0.4.16-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-db/sqlite:3 sys-libs/zlib curl? ( net-misc/curl ) !dedicated? ( app-arch/bzip2 >=dev-games/irrlicht-1.8-r2 dev-libs/gmp:0= media-libs/libpng:0= virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm sound? ( media-libs/libogg:= media-libs/libvorbis:= media-libs/openal:= ) truetype? ( media-libs/freetype:2 ) ) leveldb? ( dev-libs/leveldb ) luajit? ( dev-lang/luajit:2 ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) postgres? ( >=dev-db/postgresql-9.5:= ) redis? ( dev-libs/hiredis ) spatial? ( sci-libs/libspatialindex ) >=dev-games/irrlicht-1.8-r2 doc? ( app-doc/doxygen media-gfx/graphviz ) nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=An InfiniMiner/Minecraft inspired game
-EAPI=6
-HOMEPAGE=https://www.minetest.net
-IUSE=+curl dedicated doc +leveldb luajit ncurses nls postgres redis +server +sound spatial +truetype
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0
-RDEPEND=dev-db/sqlite:3 sys-libs/zlib curl? ( net-misc/curl ) !dedicated? ( app-arch/bzip2 >=dev-games/irrlicht-1.8-r2 dev-libs/gmp:0= media-libs/libpng:0= virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm sound? ( media-libs/libogg:= media-libs/libvorbis:= media-libs/openal:= ) truetype? ( media-libs/freetype:2 ) ) leveldb? ( dev-libs/leveldb ) luajit? ( dev-lang/luajit:2 ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) postgres? ( >=dev-db/postgresql-9.5:= ) redis? ( dev-libs/hiredis ) spatial? ( sci-libs/libspatialindex )
-SLOT=0
-SRC_URI=https://github.com/minetest/minetest/tarball/0.4.16 -> minetest-0.4.16.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5942a1d855075b3a2a75229ca6b7302b
diff --git a/games-action/minetest-0.4.17-r1 b/games-action/minetest-0.4.17-r1
deleted file mode 100644
index c4f4fd366aee..000000000000
--- a/games-action/minetest-0.4.17-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-db/sqlite:3 sys-libs/zlib curl? ( net-misc/curl ) !dedicated? ( app-arch/bzip2 >=dev-games/irrlicht-1.8-r2 dev-libs/gmp:0= media-libs/libpng:0= virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm sound? ( media-libs/libogg:= media-libs/libvorbis:= media-libs/openal:= ) truetype? ( media-libs/freetype:2 ) ) jsoncpp? ( dev-libs/jsoncpp ) leveldb? ( dev-libs/leveldb:= ) luajit? ( dev-lang/luajit:2 ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) postgres? ( >=dev-db/postgresql-9.5:= ) redis? ( dev-libs/hiredis ) spatial? ( sci-libs/libspatialindex ) >=dev-games/irrlicht-1.8-r2 doc? ( app-doc/doxygen media-gfx/graphviz ) nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=An InfiniMiner/Minecraft inspired game
-EAPI=6
-HOMEPAGE=https://www.minetest.net
-IUSE=+curl dedicated doc jsoncpp +leveldb luajit ncurses nls postgres redis +server +sound spatial +truetype
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0
-RDEPEND=dev-db/sqlite:3 sys-libs/zlib curl? ( net-misc/curl ) !dedicated? ( app-arch/bzip2 >=dev-games/irrlicht-1.8-r2 dev-libs/gmp:0= media-libs/libpng:0= virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm sound? ( media-libs/libogg:= media-libs/libvorbis:= media-libs/openal:= ) truetype? ( media-libs/freetype:2 ) ) jsoncpp? ( dev-libs/jsoncpp ) leveldb? ( dev-libs/leveldb:= ) luajit? ( dev-lang/luajit:2 ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) postgres? ( >=dev-db/postgresql-9.5:= ) redis? ( dev-libs/hiredis ) spatial? ( sci-libs/libspatialindex )
-SLOT=0
-SRC_URI=https://github.com/minetest/minetest/archive/0.4.17.tar.gz -> minetest-0.4.17.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ad46e02d5635b0997de5d50800ce23fe
diff --git a/games-action/minetest-0.4.17.1 b/games-action/minetest-0.4.17.1
deleted file mode 100644
index effd132156cf..000000000000
--- a/games-action/minetest-0.4.17.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-db/sqlite:3 sys-libs/zlib curl? ( net-misc/curl ) !dedicated? ( app-arch/bzip2 >=dev-games/irrlicht-1.8-r2 dev-libs/gmp:0= media-libs/libpng:0= virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm sound? ( media-libs/libogg:= media-libs/libvorbis:= media-libs/openal:= ) truetype? ( media-libs/freetype:2 ) ) jsoncpp? ( dev-libs/jsoncpp ) leveldb? ( dev-libs/leveldb:= ) luajit? ( dev-lang/luajit:2 ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) postgres? ( >=dev-db/postgresql-9.5:= ) redis? ( dev-libs/hiredis ) spatial? ( sci-libs/libspatialindex ) >=dev-games/irrlicht-1.8-r2 doc? ( app-doc/doxygen media-gfx/graphviz ) nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=An InfiniMiner/Minecraft inspired game
-EAPI=6
-HOMEPAGE=https://www.minetest.net
-IUSE=+curl dedicated doc jsoncpp +leveldb luajit ncurses nls postgres redis +server +sound spatial +truetype
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0
-RDEPEND=dev-db/sqlite:3 sys-libs/zlib curl? ( net-misc/curl ) !dedicated? ( app-arch/bzip2 >=dev-games/irrlicht-1.8-r2 dev-libs/gmp:0= media-libs/libpng:0= virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm sound? ( media-libs/libogg:= media-libs/libvorbis:= media-libs/openal:= ) truetype? ( media-libs/freetype:2 ) ) jsoncpp? ( dev-libs/jsoncpp ) leveldb? ( dev-libs/leveldb:= ) luajit? ( dev-lang/luajit:2 ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) postgres? ( >=dev-db/postgresql-9.5:= ) redis? ( dev-libs/hiredis ) spatial? ( sci-libs/libspatialindex )
-SLOT=0
-SRC_URI=https://github.com/minetest/minetest/archive/0.4.17.1.tar.gz -> minetest-0.4.17.1.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ad46e02d5635b0997de5d50800ce23fe
diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
new file mode 100644
index 000000000000..3883e7c3ff1b
--- /dev/null
+++ b/games-action/minetest/Manifest
@@ -0,0 +1,9 @@
+AUX minetestserver.confd 313 BLAKE2B 67e0b20c320d93323affd63b58085c7e0371f2ac68a541cd59a5327811bb420a42951b12396fe9c73e83be38c1a9affa25f5257e9e8488cdf9074498c1664d60 SHA512 96fe764d78b383f294bce81e8631861057f309fd9d13f9397ca0c715396f3793f201f313a3507c0b190f41891441eb4fe418b5888cb73ffdea0d27969d0172c3
+AUX minetestserver.initd 558 BLAKE2B 70557c32b4aaff21ea8e8101b90bb2f1278dfbaa684152024130603a1c69ac93790983777eed666069bfe8898a4b3d20fca4f8dba6a93018e238bc6274ca1c41 SHA512 0be59fb3b42632d3a6badd01362bf62519da9cf4a1a726f304167c7ecd52c7643c04cc410bbfd3096ebd6413242cb28e3d149b06858b25344fd5a2412b6f0907
+DIST minetest-0.4.16.tar.gz 7753044 BLAKE2B a35a0bcab00393fc72e5d932a86ebacdd1b3aa5a850e36f7b788599086c65f549341fa05fcbc0c6a09540df79d840611ec352d79e673ba63575a9f51fd5e22af SHA512 c124a997d9eb242885551e5c68948158cbd172ccd44fb1feb4d7aea487f876a2421bc990528dbfb6baf2033bfd4759d17138ed95b077e0ba80785a6e7ff521a2
+DIST minetest-0.4.17.1.tar.gz 7758675 BLAKE2B 93f5f1ce32b98bb78a6ae5bc2ab9110902e118480b37b8c9cf87f1c6aa986f379e1191e82d4a764fb2aa0a0747c113e80cd014e6a06e0a485a59e516c4644fc6 SHA512 9f84ae45ebe181cb1cd2dff6b71b558eb276472efdfcd73bd02a111b2761793d49681bdfbbeaccc28f4a2f49e15b80d04b78db2f2f728c852c188b0c96aae618
+DIST minetest-0.4.17.tar.gz 7757149 BLAKE2B 9ee908990224da800e7f0f4fc5e28d5bde03f4486d43ad58225d8ec056f8209fde94597798c977e1d3f3f8cbeadeb0bcdae6eb2aac2b8572fcbcfa28bbd62eba SHA512 3015f5a03be37c5395b55b6dc9f883f9270b19f709a47250f36bc7b1ce6d04a0e89e4366d86da33bbebbfb64f04ff008aec66c96930d7314991a21160265bafe
+EBUILD minetest-0.4.16-r1.ebuild 3226 BLAKE2B 917e9af650a0e760804a2247b516565864390686141c67293aa38fd3ef52a0f6a68dd8713f9b6d48fb38b006c3dbcc4c2251373daf9e92bc53758a3a4dcc769d SHA512 0e5bbfc042b0951b7bd1fa589b91a280372bceaec7703046a0e124eb0c81d4572b821a72733c2ad30eed56dc7d2ff42f6d41d8e4670f1fa8551391acec3ce414
+EBUILD minetest-0.4.17-r1.ebuild 3296 BLAKE2B e659a638177d0f1435352476393e71c6aef503fb8ce83b0bef7144c6d8c29b55955fa9e73e01f3e4954fb6eec0eaba0bcc351dce27dbe8879d8184d4ea9be206 SHA512 6024a9de7ce3ee7372f7ced01a40b0b060a351fce506d506a9fd1f225ba8cf858ca031851aeb11da351d3dac75624bcce1da924f239d83b12f79e85604ddf9ca
+EBUILD minetest-0.4.17.1.ebuild 3296 BLAKE2B e659a638177d0f1435352476393e71c6aef503fb8ce83b0bef7144c6d8c29b55955fa9e73e01f3e4954fb6eec0eaba0bcc351dce27dbe8879d8184d4ea9be206 SHA512 6024a9de7ce3ee7372f7ced01a40b0b060a351fce506d506a9fd1f225ba8cf858ca031851aeb11da351d3dac75624bcce1da924f239d83b12f79e85604ddf9ca
+MISC metadata.xml 2216 BLAKE2B 3872d007ded87d46e806b334e3808096f7a07c64e6ae1a99a5b79db81d7396131df7ea42d7d74753efd42844e7fe01de5e02be37c8f78198de953d9e8381602d SHA512 4c2a2a007239ca5a313e31caa19483fc877e241e5ede1ea509b12931d0feef1aa72cb086266d61f3d38c11fc303f646f328b17c5f184d8bb45d0019e6a31c9a7
diff --git a/games-action/minetest/files/minetestserver.confd b/games-action/minetest/files/minetestserver.confd
new file mode 100644
index 000000000000..ec3d0138cb73
--- /dev/null
+++ b/games-action/minetest/files/minetestserver.confd
@@ -0,0 +1,16 @@
+# /etc/conf.d/minetest-server: config file for /etc/init.d/minetest-server
+
+# user
+USER="minetest"
+
+# group
+GROUP="@GROUP@"
+
+# pidfile
+PIDFILE="/var/run/minetest.pid"
+
+# executable
+MINETESTBIN="@BINDIR@/minetestserver"
+
+# additional arguments for the server
+ARGS="--logfile /var/lib/minetest/minetest-server.log"
diff --git a/games-action/minetest/files/minetestserver.initd b/games-action/minetest/files/minetestserver.initd
new file mode 100644
index 000000000000..1e56ff646517
--- /dev/null
+++ b/games-action/minetest/files/minetestserver.initd
@@ -0,0 +1,35 @@
+#!/sbin/openrc-run
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Minetest dedicated server"
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "starting server"
+	start-stop-daemon \
+		--start \
+		--quiet \
+		--make-pidfile \
+		--pidfile "${PIDFILE}" \
+		--background \
+		--user ${USER} \
+		--group ${GROUP} \
+		--exec "${MINETESTBIN}" -- ${ARGS}
+
+	eend $?
+}
+
+stop() {
+	ebegin "stopping server"
+	start-stop-daemon \
+		--stop \
+		--signal 15 \
+		--quiet \
+		--pidfile "${PIDFILE}"
+
+	eend $?
+}
diff --git a/games-action/minetest/metadata.xml b/games-action/minetest/metadata.xml
new file mode 100644
index 000000000000..c302c3ff8ee8
--- /dev/null
+++ b/games-action/minetest/metadata.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription lang="en">
+		Minetest is an infinite-world block sandbox game and a game
+		engine, inspired by InfiniMiner, Minecraft and the like. It has
+		been in development and use since October 2010.
+
+		It is Free and Open Source Software, released under the LGPL 2.1
+		or later, available for Windows, Mac OS X and Linux.
+
+		Minetest is developed by a random bunch of lunatics.
+
+		Minetest is designed to be simple, stable and portable. It is
+		lightweight enough to run on fairly old hardware. It currently
+		runs playably on a laptop with Intel 945GM graphics. Though, as
+		for the CPU, dualcore is recommended.
+
+		Features
+		* Walk around, dig and build in an infinite voxel world,
+		and craft stuff from raw materials to help you along the way.
+		* Simplistic Modding API that supports many kinds of additions
+		and modifications to the game.
+		* Multiplayer support for tens of players, via servers hosted by
+		users.
+		* Voxel based lighting with gameplay consequences
+		(light caves and buildings with torches)
+		* Almost infinite world and a beautiful map generator.
+		* Runs natively on Windows, Linux, OS X and FreeBSD.
+		* Supports multiple languages, translated by the community.
+	</longdescription>
+	<maintainer type="person">
+		<email>vilhelm.gray@gmail.com</email>
+		<name>William Breathitt Gray</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="jsoncpp">Enable using a system-wide JSONCPP</flag>
+		<flag name="leveldb">Enable LevelDB backend</flag>
+		<flag name="postgres">Optionally use PostgreSQL as map backend</flag>
+		<flag name="redis">Enable redis backend via
+			<pkg>dev-libs/hiredis</pkg>
+		</flag>
+		<flag name="spatial">Enable SpatialIndex AreaStore backend
+		</flag>
+		<flag name="server">Build minetest server</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://github.com/minetest/minetest/issues</bugs-to>
+		<doc lang="en">http://wiki.minetest.net/Main_Page</doc>
+		<remote-id type="github">minetest/minetest</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/minetest/minetest-0.4.16-r1.ebuild b/games-action/minetest/minetest-0.4.16-r1.ebuild
new file mode 100644
index 000000000000..8291b16dba14
--- /dev/null
+++ b/games-action/minetest/minetest-0.4.16-r1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils eutils gnome2-utils user vcs-snapshot
+
+DESCRIPTION="An InfiniMiner/Minecraft inspired game"
+HOMEPAGE="https://www.minetest.net"
+SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+curl dedicated doc +leveldb luajit ncurses nls postgres redis +server +sound spatial +truetype"
+
+RDEPEND="dev-db/sqlite:3
+	sys-libs/zlib
+	curl? ( net-misc/curl )
+	!dedicated? (
+		app-arch/bzip2
+		>=dev-games/irrlicht-1.8-r2
+		dev-libs/gmp:0=
+		media-libs/libpng:0=
+		virtual/jpeg:0
+		virtual/opengl
+		x11-libs/libX11
+		x11-libs/libXxf86vm
+		sound? (
+			media-libs/libogg:=
+			media-libs/libvorbis:=
+			media-libs/openal:=
+		)
+		truetype? ( media-libs/freetype:2 )
+	)
+	leveldb? ( dev-libs/leveldb )
+	luajit? ( dev-lang/luajit:2 )
+	ncurses? ( sys-libs/ncurses:0= )
+	nls? ( virtual/libintl )
+	postgres? ( >=dev-db/postgresql-9.5:= )
+	redis? ( dev-libs/hiredis )
+	spatial? ( sci-libs/libspatialindex )"
+DEPEND="${RDEPEND}
+	>=dev-games/irrlicht-1.8-r2
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	if use server || use dedicated ; then
+		enewgroup ${PN}
+		enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	# set paths
+	sed \
+		-e "s#@BINDIR@#${EPREFIX}/usr/bin#g" \
+		-e "s#@GROUP@#${PN}#g" \
+		"${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CLIENT=$(usex !dedicated)
+		-DCUSTOM_BINDIR="${EPREFIX}/usr/bin"
+		-DCUSTOM_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DCUSTOM_LOCALEDIR="${EPREFIX}/usr/share/${PN}/locale"
+		-DCUSTOM_SHAREDIR="${EPREFIX}/usr/share/${PN}"
+		-DCUSTOM_EXAMPLE_CONF_DIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_FREETYPE=$(usex truetype)
+		-DENABLE_GETTEXT=$(usex nls)
+		-DENABLE_GLES=0
+		-DENABLE_LEVELDB=$(usex leveldb)
+		-DENABLE_POSTGRESQL=$(usex postgres)
+		-DENABLE_REDIS=$(usex redis)
+		-DENABLE_SPATIAL=$(usex spatial)
+		-DENABLE_SOUND=$(usex sound)
+		-DENABLE_LUAJIT=$(usex luajit)
+		-DENABLE_CURSES=$(usex ncurses)
+		-DRUN_IN_PLACE=0
+	)
+
+	use dedicated && mycmakeargs+=(
+		-DIRRLICHT_INCLUDE_DIR="${EPREFIX}/usr/include/irrlicht"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc ; then
+		cmake-utils_src_compile doc
+		HTML_DOCS=( "${CMAKE_BUILD_DIR}"/doc/html/. )
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use server || use dedicated ; then
+		newinitd "${FILESDIR}"/minetestserver.initd minetest-server
+		newconfd "${T}"/minetestserver.confd minetest-server
+	fi
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	if ! use dedicated ; then
+		elog
+		elog "optional dependencies:"
+		elog "	games-action/minetest_game (official mod)"
+		elog
+	fi
+
+	if use server || use dedicated ; then
+		elog
+		elog "Configure your server via /etc/conf.d/minetest-server"
+		elog "The user \"minetest\" is created with /var/lib/${PN} homedir."
+		elog "Default logfile is ~/minetest-server.log"
+		elog
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-action/minetest/minetest-0.4.17-r1.ebuild b/games-action/minetest/minetest-0.4.17-r1.ebuild
new file mode 100644
index 000000000000..b71ccc4d1979
--- /dev/null
+++ b/games-action/minetest/minetest-0.4.17-r1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils gnome2-utils user
+
+DESCRIPTION="An InfiniMiner/Minecraft inspired game"
+HOMEPAGE="https://www.minetest.net"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+curl dedicated doc jsoncpp +leveldb luajit ncurses nls postgres redis +server +sound spatial +truetype"
+
+RDEPEND="dev-db/sqlite:3
+	sys-libs/zlib
+	curl? ( net-misc/curl )
+	!dedicated? (
+		app-arch/bzip2
+		>=dev-games/irrlicht-1.8-r2
+		dev-libs/gmp:0=
+		media-libs/libpng:0=
+		virtual/jpeg:0
+		virtual/opengl
+		x11-libs/libX11
+		x11-libs/libXxf86vm
+		sound? (
+			media-libs/libogg:=
+			media-libs/libvorbis:=
+			media-libs/openal:=
+		)
+		truetype? ( media-libs/freetype:2 )
+	)
+	jsoncpp? ( dev-libs/jsoncpp )
+	leveldb? ( dev-libs/leveldb:= )
+	luajit? ( dev-lang/luajit:2 )
+	ncurses? ( sys-libs/ncurses:0= )
+	nls? ( virtual/libintl )
+	postgres? ( >=dev-db/postgresql-9.5:= )
+	redis? ( dev-libs/hiredis )
+	spatial? ( sci-libs/libspatialindex )"
+DEPEND="${RDEPEND}
+	>=dev-games/irrlicht-1.8-r2
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	if use server || use dedicated ; then
+		enewgroup ${PN}
+		enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	# set paths
+	sed \
+		-e "s#@BINDIR@#${EPREFIX}/usr/bin#g" \
+		-e "s#@GROUP@#${PN}#g" \
+		"${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CLIENT=$(usex !dedicated)
+		-DCUSTOM_BINDIR="${EPREFIX}/usr/bin"
+		-DCUSTOM_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DCUSTOM_EXAMPLE_CONF_DIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DCUSTOM_LOCALEDIR="${EPREFIX}/usr/share/${PN}/locale"
+		-DCUSTOM_SHAREDIR="${EPREFIX}/usr/share/${PN}"
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_CURSES=$(usex ncurses)
+		-DENABLE_FREETYPE=$(usex truetype)
+		-DENABLE_GETTEXT=$(usex nls)
+		-DENABLE_GLES=0
+		-DENABLE_LEVELDB=$(usex leveldb)
+		-DENABLE_LUAJIT=$(usex luajit)
+		-DENABLE_POSTGRESQL=$(usex postgres)
+		-DENABLE_REDIS=$(usex redis)
+		-DENABLE_SPATIAL=$(usex spatial)
+		-DENABLE_SOUND=$(usex sound)
+		-DENABLE_SYSTEM_JSONCPP=$(usex jsoncpp)
+		-DRUN_IN_PLACE=0
+	)
+
+	use dedicated && mycmakeargs+=(
+		-DIRRLICHT_INCLUDE_DIR="${EPREFIX}/usr/include/irrlicht"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc ; then
+		cmake-utils_src_compile doc
+		HTML_DOCS=( "${CMAKE_BUILD_DIR}"/doc/html/. )
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use server || use dedicated ; then
+		newinitd "${FILESDIR}"/minetestserver.initd minetest-server
+		newconfd "${T}"/minetestserver.confd minetest-server
+	fi
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	if ! use dedicated ; then
+		elog
+		elog "optional dependencies:"
+		elog "	games-action/minetest_game (official mod)"
+		elog
+	fi
+
+	if use server || use dedicated ; then
+		elog
+		elog "Configure your server via /etc/conf.d/minetest-server"
+		elog "The user \"minetest\" is created with /var/lib/${PN} homedir."
+		elog "Default logfile is ~/minetest-server.log"
+		elog
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-action/minetest/minetest-0.4.17.1.ebuild b/games-action/minetest/minetest-0.4.17.1.ebuild
new file mode 100644
index 000000000000..b71ccc4d1979
--- /dev/null
+++ b/games-action/minetest/minetest-0.4.17.1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils gnome2-utils user
+
+DESCRIPTION="An InfiniMiner/Minecraft inspired game"
+HOMEPAGE="https://www.minetest.net"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+curl dedicated doc jsoncpp +leveldb luajit ncurses nls postgres redis +server +sound spatial +truetype"
+
+RDEPEND="dev-db/sqlite:3
+	sys-libs/zlib
+	curl? ( net-misc/curl )
+	!dedicated? (
+		app-arch/bzip2
+		>=dev-games/irrlicht-1.8-r2
+		dev-libs/gmp:0=
+		media-libs/libpng:0=
+		virtual/jpeg:0
+		virtual/opengl
+		x11-libs/libX11
+		x11-libs/libXxf86vm
+		sound? (
+			media-libs/libogg:=
+			media-libs/libvorbis:=
+			media-libs/openal:=
+		)
+		truetype? ( media-libs/freetype:2 )
+	)
+	jsoncpp? ( dev-libs/jsoncpp )
+	leveldb? ( dev-libs/leveldb:= )
+	luajit? ( dev-lang/luajit:2 )
+	ncurses? ( sys-libs/ncurses:0= )
+	nls? ( virtual/libintl )
+	postgres? ( >=dev-db/postgresql-9.5:= )
+	redis? ( dev-libs/hiredis )
+	spatial? ( sci-libs/libspatialindex )"
+DEPEND="${RDEPEND}
+	>=dev-games/irrlicht-1.8-r2
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	if use server || use dedicated ; then
+		enewgroup ${PN}
+		enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	# set paths
+	sed \
+		-e "s#@BINDIR@#${EPREFIX}/usr/bin#g" \
+		-e "s#@GROUP@#${PN}#g" \
+		"${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CLIENT=$(usex !dedicated)
+		-DCUSTOM_BINDIR="${EPREFIX}/usr/bin"
+		-DCUSTOM_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DCUSTOM_EXAMPLE_CONF_DIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DCUSTOM_LOCALEDIR="${EPREFIX}/usr/share/${PN}/locale"
+		-DCUSTOM_SHAREDIR="${EPREFIX}/usr/share/${PN}"
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_CURSES=$(usex ncurses)
+		-DENABLE_FREETYPE=$(usex truetype)
+		-DENABLE_GETTEXT=$(usex nls)
+		-DENABLE_GLES=0
+		-DENABLE_LEVELDB=$(usex leveldb)
+		-DENABLE_LUAJIT=$(usex luajit)
+		-DENABLE_POSTGRESQL=$(usex postgres)
+		-DENABLE_REDIS=$(usex redis)
+		-DENABLE_SPATIAL=$(usex spatial)
+		-DENABLE_SOUND=$(usex sound)
+		-DENABLE_SYSTEM_JSONCPP=$(usex jsoncpp)
+		-DRUN_IN_PLACE=0
+	)
+
+	use dedicated && mycmakeargs+=(
+		-DIRRLICHT_INCLUDE_DIR="${EPREFIX}/usr/include/irrlicht"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc ; then
+		cmake-utils_src_compile doc
+		HTML_DOCS=( "${CMAKE_BUILD_DIR}"/doc/html/. )
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use server || use dedicated ; then
+		newinitd "${FILESDIR}"/minetestserver.initd minetest-server
+		newconfd "${T}"/minetestserver.confd minetest-server
+	fi
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	if ! use dedicated ; then
+		elog
+		elog "optional dependencies:"
+		elog "	games-action/minetest_game (official mod)"
+		elog
+	fi
+
+	if use server || use dedicated ; then
+		elog
+		elog "Configure your server via /etc/conf.d/minetest-server"
+		elog "The user \"minetest\" is created with /var/lib/${PN} homedir."
+		elog "Default logfile is ~/minetest-server.log"
+		elog
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-action/minetest_game-0.4.16 b/games-action/minetest_game-0.4.16
deleted file mode 100644
index d56979ebe08e..000000000000
--- a/games-action/minetest_game-0.4.16
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=The main game for the Minetest game engine
-EAPI=6
-HOMEPAGE=https://github.com/minetest/minetest_game
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 CC-BY-SA-3.0
-RDEPEND=>=games-action/minetest-0.4.16
-SLOT=0
-SRC_URI=https://github.com/minetest/minetest_game/tarball/0.4.16 -> minetest_game-0.4.16.tar.gz
-_eclasses_=vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
-_md5_=8848610a4128c381ab5019bcca9072ab
diff --git a/games-action/minetest_game-0.4.17 b/games-action/minetest_game-0.4.17
deleted file mode 100644
index 94c37038ac7d..000000000000
--- a/games-action/minetest_game-0.4.17
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=The main game for the Minetest game engine
-EAPI=6
-HOMEPAGE=https://github.com/minetest/minetest_game
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 CC-BY-SA-3.0
-RDEPEND=>=games-action/minetest-0.4.17
-SLOT=0
-SRC_URI=https://github.com/minetest/minetest_game/archive/0.4.17.tar.gz -> minetest_game-0.4.17.tar.gz
-_eclasses_=vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
-_md5_=9f69228b39f090a02d4e20fd50c4e395
diff --git a/games-action/minetest_game/Manifest b/games-action/minetest_game/Manifest
new file mode 100644
index 000000000000..1fc591a3faf6
--- /dev/null
+++ b/games-action/minetest_game/Manifest
@@ -0,0 +1,5 @@
+DIST minetest_game-0.4.16.tar.gz 1356062 BLAKE2B 5a5481a56484b486848c762f53000fad3359076938767726d1c629ae3ce5c273306adda38672333137df314f83eb67c58633a58a82ba9c556c8d0f8df03b0f8a SHA512 5823be50b385327948be1d609ffd66c9c24c6eb466eba4366c67dc3287c26066c74d25f17c4a6cb27fba34a82c093b8da44b3cb3fc62c45ad9d996bde15112d1
+DIST minetest_game-0.4.17.tar.gz 1356784 BLAKE2B 4cbae279edc24c7ebe8460fd3d805d3ab0f6deaf5ab303818b025b454fee8e67097a980e22f1eff39306b1ef545eae3becbbc6cfcbcad34af96b01d46e865df0 SHA512 3ed6c8419a11fe38e311b319c2af8b1f2793e40cf4bcd96b3d61748ec56a930278bace992b4142a394279c0c0308d5783a0121a9224126da9df7bdb7536b9294
+EBUILD minetest_game-0.4.16.ebuild 574 BLAKE2B 3a89ea8208081cac45263ea9a09e6eb8057d9b669b247a7c598d47093b3e349c61ad6bf10048b4016793283b78a7387d312ad96e25eca1f800ec15e80f6b553f SHA512 3278722d306214315ea07a848b6cd5e066fb01e4d2cd7f54966acb504753ef08abdf6f0dbd58d6fde73f31abb379d2c8e8cb33fdcaa3fdf7c5bf31d9226b77d3
+EBUILD minetest_game-0.4.17.ebuild 581 BLAKE2B aa999ccf92a0e5fe692d82e259af16446b8304ec2ca8676b9bad263acc7f70de6d8330a22b86e0f5128d0b75ffb599263827f2c8bdd448633b09b73bc47936e4 SHA512 828eddf0477cb8e5fd823cf9139160be76f21d772262ccdfa9b548d7eef74b4c6811b21e71f2fea64ca94e987cb047c6981f4702294997392179fdc47d7b532d
+MISC metadata.xml 534 BLAKE2B ce785d62b15d550a92f226db94770a6e4d96ad434ab5136f6dcc1b2c6f6d28a7a84562c48ab029c25bac434c56b723c2e600adcca7355252e38af10f811b3611 SHA512 f244d4aa62a012e586988dd4839b4f809dfc82e348e04f79f84d8a6faa78bbaaa02364ba8152380a6a92e0d60402a70ea8b5ec4c896795ba8affd6297d8cb833
diff --git a/games-action/minetest_game/metadata.xml b/games-action/minetest_game/metadata.xml
new file mode 100644
index 000000000000..15dfa15e0050
--- /dev/null
+++ b/games-action/minetest_game/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>vilhelm.gray@gmail.com</email>
+		<name>William Breathitt Gray</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/minetest/minetest_game/issues</bugs-to>
+		<remote-id type="github">minetest/minetest_game</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/minetest_game/minetest_game-0.4.16.ebuild b/games-action/minetest_game/minetest_game-0.4.16.ebuild
new file mode 100644
index 000000000000..480fa56907fc
--- /dev/null
+++ b/games-action/minetest_game/minetest_game-0.4.16.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vcs-snapshot
+
+DESCRIPTION="The main game for the Minetest game engine"
+HOMEPAGE="https://github.com/minetest/minetest_game"
+SRC_URI="https://github.com/minetest/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-2 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=games-action/minetest-${PV}"
+
+src_install() {
+	insinto /usr/share/minetest/games/${PN}
+	doins -r mods menu
+	doins game.conf minetest.conf
+
+	dodoc README.txt game_api.txt
+}
diff --git a/games-action/minetest_game/minetest_game-0.4.17.ebuild b/games-action/minetest_game/minetest_game-0.4.17.ebuild
new file mode 100644
index 000000000000..cba98c5a4067
--- /dev/null
+++ b/games-action/minetest_game/minetest_game-0.4.17.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vcs-snapshot
+
+DESCRIPTION="The main game for the Minetest game engine"
+HOMEPAGE="https://github.com/minetest/minetest_game"
+SRC_URI="https://github.com/minetest/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=games-action/minetest-${PV}"
+
+src_install() {
+	insinto /usr/share/minetest/games/${PN}
+	doins -r mods menu
+	doins game.conf minetest.conf
+
+	dodoc README.txt game_api.txt
+}
diff --git a/games-action/moon-buggy-1.0.51-r1 b/games-action/moon-buggy-1.0.51-r1
deleted file mode 100644
index 36786becd51a..000000000000
--- a/games-action/moon-buggy-1.0.51-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=sys-libs/ncurses:0 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=A simple console game, where you drive a car across the moon's surface
-EAPI=6
-HOMEPAGE=http://www.seehuhn.de/comp/moon-buggy.html
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0
-SLOT=0
-SRC_URI=http://www.seehuhn.de/data/moon-buggy-1.0.51.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2f8d3f0e92d9bbd51019a5a5421f8394
diff --git a/games-action/moon-buggy/Manifest b/games-action/moon-buggy/Manifest
new file mode 100644
index 000000000000..782208303389
--- /dev/null
+++ b/games-action/moon-buggy/Manifest
@@ -0,0 +1,3 @@
+DIST moon-buggy-1.0.51.tar.gz 263572 BLAKE2B d298b04116a5bc7735f672c067efa688dbea153dbc309a6e371b970b7a31648a337af872513bd94b5d01981fdf5595ca326cca11503d138cfcbe126f18ef55e9 SHA512 34da2ca8b79d4f95a762cb7142586d176fd1b58ea6f4375de424d73d6046c2dc3dbae30dddb3a78c8c2563fbfec01d9eaafe27b79cc78ffa22121ad5a2e9dc77
+EBUILD moon-buggy-1.0.51-r1.ebuild 965 BLAKE2B c7f56c648bbc3db1cdd85faf30542a6622a39c8109daf2e717784298095c885e1a40b0aefd04ff4419d4e828a88604a1dc609fdbe792c1b5692202ced6e4ef36 SHA512 780dcb8ccff5db72f544b883af9fc734379f0e33decc7fd2252099aaab534b3264e65fd354b795e57158105e6fa275d22f8d2f6043ecce796cfd9c403c957f9b
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/moon-buggy/metadata.xml b/games-action/moon-buggy/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-action/moon-buggy/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-action/moon-buggy/moon-buggy-1.0.51-r1.ebuild b/games-action/moon-buggy/moon-buggy-1.0.51-r1.ebuild
new file mode 100644
index 000000000000..22373707aea9
--- /dev/null
+++ b/games-action/moon-buggy/moon-buggy-1.0.51-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils user
+
+DESCRIPTION="A simple console game, where you drive a car across the moon's surface"
+HOMEPAGE="http://www.seehuhn.de/comp/moon-buggy.html"
+SRC_URI="http://www.seehuhn.de/data/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="sys-libs/ncurses:0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup(){
+	enewgroup gamestat 36
+}
+
+src_prepare() {
+	default
+	sed -i \
+		-e '/$(DESTDIR)$(bindir)\/moon-buggy -c/d' \
+		Makefile.am || die
+	rm -f missing
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--sharedstatedir="/var/games" \
+		--with-curses-libs="$(pkg-config ncurses --libs)"
+}
+
+src_install() {
+	default
+	touch "${D}/var/games/${PN}/mbscore"
+	fowners root:gamestat /usr/bin/${PN} /var/games/${PN} /var/games/${PN}/mbscore
+	fperms 2755 /usr/bin/${PN}
+	fperms 664 /var/games/${PN}/mbscore
+}
diff --git a/games-action/mutantstorm-demo-1.33-r1 b/games-action/mutantstorm-demo-1.33-r1
deleted file mode 100644
index b2a7bc89c737..000000000000
--- a/games-action/mutantstorm-demo-1.33-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=shoot through crazy psychedelic 3D environments
-EAPI=6
-HOMEPAGE=http://www.pompomgames.com/
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=POMPOM
-RDEPEND=media-libs/libsdl[abi_x86_32(-)] sys-libs/lib-compat x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)]
-RESTRICT=strip
-SLOT=0
-SRC_URI=ftp://ggdev-1.homelan.com/mutantstorm/MutantStormDemo_1_33.sh.bin
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=268ab149ced8cc0ea43d4e99cb83ad59
diff --git a/games-action/mutantstorm-demo/Manifest b/games-action/mutantstorm-demo/Manifest
new file mode 100644
index 000000000000..38283c6ea72f
--- /dev/null
+++ b/games-action/mutantstorm-demo/Manifest
@@ -0,0 +1,3 @@
+DIST MutantStormDemo_1_33.sh.bin 9249167 BLAKE2B 304877cb30ba0f43540b6d467e0d4ebd12c3896778c305a3aabf8a2a747fc1fa48e75d6e4ee8c123afa58fbb12fa9ead4f9f9af3bdc0604b3ff613ee92a558bb SHA512 176c9f05ca03a1b8f397e046eac26c1442571806543df9b7e0545b8e32e0cc8f2fc827f03840c2082e600a9336ba2c7a7497ef336d9eb8c4e8f122abec413cad
+EBUILD mutantstorm-demo-1.33-r1.ebuild 1031 BLAKE2B e0c6460b22957d97e71872821e582289d1cf421d1e11d19aa972e09a148ff37bfb492c5a03f0142cad169c39c6154c7ca42065019165bdd4e7109fa0deba3541 SHA512 8f117835feb59654850854fcd27291753838c131e41d3e7a48991f125a70472c7b4fda05a85bb778cd1d046aa279f9b909ee57f3e35c7afd4f3904eb1ffc1471
+MISC metadata.xml 1759 BLAKE2B 797c2106d0302bd32b52a60f07df2d9aea348308b05249cd8ad7102e61aadcd7fc327a0e7e1d347e50b53c55923b333f4bc0419dca9abbd37c0d0b2f138517b7 SHA512 a5d3cbfc4ed0b4078a83f5c608129e6d4f69f1c76bb442f2907dd99bd2b13163080693b4ba6e07b2ca35d0e5495c64580a9aae3cf30e6746df435098a75dceea
diff --git a/games-action/mutantstorm-demo/metadata.xml b/games-action/mutantstorm-demo/metadata.xml
new file mode 100644
index 000000000000..b12b9be3c4cb
--- /dev/null
+++ b/games-action/mutantstorm-demo/metadata.xml
@@ -0,0 +1,40 @@
+<?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>
+Mutant Storm progresses over 89 levels of psychedelic 3D arenas, that get 
+ever more crowded with nasty beasties. This carnival of frenetic fun is 
+showcased in a cutting edge graphics extravganza.
+
+Viewed from well above, you and your enemies can always be seen. Always be 
+killed, and always be laughed at! There is no hiding. No tactics. No 
+planning... No Net.
+Your enemies created this world and they sure ain't gonna help you 
+out!
+
+You like to play hard? Then the game gets harder. Feel like your doing 
+well? ...
+Enjoy it while it lasts!
+
+Survive long enough, and you get rewarded with score multipliers, doubling 
+your score. Making your enemies even angrier, and that bit more determined 
+to kill you!
+Lose a life and watch your multipliers tumble, and the beasties slow down 
+and relax, safe in the knowledge that you are just a big softy really!!
+After you conquer all 89 levels you'll be awarded your first 
+'White Belt' progressing if you can win all 8 belts until you 
+have possess the much coveted Mutant Storm 'Black Belt'.
+
+Mutant Storm is inspired the classic RoboTron by Williams, Smash TV and 
+Jeff Minters fantastic Llamatron.
+To those unacquainted, this means one hand controlling fire direction, and 
+the other controlling movement. Sounds confusing? ...don't worry, just grab 
+your trusty mouse ( or dual stick joypad if you want genuine Robotron style 
+) and give it a go. Its very simple once you try, and very intuitive once 
+you're used to it.
+</longdescription>
+</pkgmetadata>
diff --git a/games-action/mutantstorm-demo/mutantstorm-demo-1.33-r1.ebuild b/games-action/mutantstorm-demo/mutantstorm-demo-1.33-r1.ebuild
new file mode 100644
index 000000000000..c97fee4f7172
--- /dev/null
+++ b/games-action/mutantstorm-demo/mutantstorm-demo-1.33-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils unpacker
+
+DESCRIPTION="shoot through crazy psychedelic 3D environments"
+HOMEPAGE="http://www.pompomgames.com/"
+SRC_URI="ftp://ggdev-1.homelan.com/mutantstorm/MutantStormDemo_${PV/./_}.sh.bin"
+
+LICENSE="POMPOM"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+RESTRICT="strip"
+
+RDEPEND="
+	media-libs/libsdl[abi_x86_32(-)]
+	sys-libs/lib-compat
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]"
+
+S=${WORKDIR}
+
+dir=/opt/${PN}
+Ddir=${D}/${dir}
+QA_PREBUILT="${dir:1}/mutantstorm-bin"
+
+src_install() {
+	insinto "${dir}"
+	doins -r menu script styles
+
+	exeinto "${dir}"
+	doexe bin/Linux/x86/*
+	# Remove libSDL since we use the system version and our version doesn't
+	# have TEXTRELs in it.
+	rm -f "${Ddir}"/libSDL-1.2.so.0.0.5
+	make_wrapper mutantstorm-demo ./mutantstormdemo "${dir}" "${dir}"
+
+	insinto "${dir}"
+	doins README.txt buy_me mutant.xpm pompom readme.htm
+}
diff --git a/games-action/nighthawk-2.2-r1 b/games-action/nighthawk-2.2-r1
deleted file mode 100644
index 21489ffdac3c..000000000000
--- a/games-action/nighthawk-2.2-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=x11-libs/libXpm
-DESCRIPTION=A tribute to Paradroid by Andrew Braybrook
-EAPI=6
-HOMEPAGE=http://night-hawk.sourceforge.net/nighthawk.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libXpm
-SLOT=0
-SRC_URI=ftp://metalab.unc.edu/pub/Linux/games/arcade/nighthawk-2.2-1.tar.gz
-_md5_=0cb2bfa2c505d1a53c49531aa8ef6a78
diff --git a/games-action/nighthawk/Manifest b/games-action/nighthawk/Manifest
new file mode 100644
index 000000000000..b3eb487525dc
--- /dev/null
+++ b/games-action/nighthawk/Manifest
@@ -0,0 +1,5 @@
+AUX nighthawk-2.2-gcc42.patch 670 BLAKE2B a5d0b38983e0ed434f13225f213bc64142629b4d7189fb1665271c45129f1a4e3086210911310c7cd09362328030f2242179e4e1c3e07b87cf21475ecdddee9b SHA512 f23188baa922881b36c45900e34bcaaa04b9c9752c52c13d5c03454e46853aae6c5f50375e87785b4d9866a0156b697b9dbfac0eb4f54aaa92fec5c5185686b1
+AUX nighthawk.patch 1235 BLAKE2B 644abc5e0910550f6dfd103ba02aee064ee4c63b2161fa3443ec5abf5da64350e43ab79b2d6cff65a00ca963c96bf456eb374bdc874cec45df9e0180dd697cb0 SHA512 6362d1188c857f5b1236b5ca9e04e00d8eb85eb1a7e2efaa588c1b8cdcfd11f61a914e0db8f5bffd377c495b1464e7060c79d9205abbe84bfa24112c4be4e237
+DIST nighthawk-2.2-1.tar.gz 1079706 BLAKE2B 38b9e2fe6f9fe4b373ddae05f0277eea1dd65f921f99e0f728ca47630378ad865117846945ba5c708cef7120dbda8c5c1ac5a032738d974f2687be34fe561556 SHA512 dca5d0c01ed651dee0c29b939c832ae343ca70ff0eb7779e7c13007881cf75d96cadafbbac6b431cd473ce9b9e1347dd4ba90502627059439b5a9a557cbc3fcf
+EBUILD nighthawk-2.2-r1.ebuild 614 BLAKE2B 21ed1d82be90a6b378521f25b9441936c683bb72a6e893ad9e97a61b2ee0a0516e39064e588c03660c22c7dc82448dc41127e826b9111271a82ecf2339ef9eef SHA512 f83933b6464b23625ec8395a1b2c2fc45b2229addc2a88c8fe8c9630e45b4ec85ef0cd59a0bc242e2966158e091e4a9e7ca8fc17505d2a8ed8eab3694b3245ec
+MISC metadata.xml 333 BLAKE2B a7d3bbfb68e4cd24addfeb880b896f12d2ff4bbf72701943f5a91078eaccf24bb2b9a05125389c1d1bdf3cb2b34a3e367ffde7c028e34bbdfd870dad5ab19558 SHA512 336358437939bf16817128792faf057aaf920f5530ca57ba425b9ac67ed0599ebfb2b1a21faecf1836f89be85a9a0b2751287ba625b4a4606c669c2192116ad4
diff --git a/games-action/nighthawk/files/nighthawk-2.2-gcc42.patch b/games-action/nighthawk/files/nighthawk-2.2-gcc42.patch
new file mode 100644
index 000000000000..a9ad8c98484a
--- /dev/null
+++ b/games-action/nighthawk/files/nighthawk-2.2-gcc42.patch
@@ -0,0 +1,24 @@
+--- a/src_sound/dsp_mixxer.c
++++ b/src_sound/dsp_mixxer.c
+@@ -302,10 +302,8 @@
+   for(sample_no = 0;sample_no < mix_buffer_size;sample_no++)
+   {
+     if(chmix[chan_no].funkctrl & 0x2)
+-#pragma pack(1)
+       sam = *((sDB *)chmix[chan_no].sample_addr +
+             (unsigned long)chmix[chan_no].sample_ptr);
+-#pragma pack()
+     else
+       sam = 0;
+ 
+@@ -364,10 +362,8 @@
+   for(sample_no = 0;sample_no < mix_buffer_size;sample_no++)
+   {
+     if(chmix[chan_no].funkctrl & 0x2)
+-#pragma pack(1)
+       sam = *((sDW *)chmix[chan_no].sample_addr +
+             (unsigned long)chmix[chan_no].sample_ptr);
+-#pragma pack()
+     else
+       sam = 0;
+ #ifdef DIGITAL_ECHOING
diff --git a/games-action/nighthawk/files/nighthawk.patch b/games-action/nighthawk/files/nighthawk.patch
new file mode 100644
index 000000000000..accef759e682
--- /dev/null
+++ b/games-action/nighthawk/files/nighthawk.patch
@@ -0,0 +1,46 @@
+diff -c -3 -r nighthawk-2.2/src/nighthawk.cc nighthawk.orig/src/nighthawk.cc
+*** nighthawk-2.2/src/nighthawk.cc	Sun May 23 01:10:59 1999
+--- nighthawk.orig/src/nighthawk.cc	Fri Jul 12 04:18:38 2002
+***************
+*** 20,25 ****
+--- 20,26 ----
+  #include <string.h>
+  #include <signal.h>
+  #include <pwd.h>
++ #include <time.h>
+  #include <sys/types.h>
+  #include <sys/file.h>
+  #include <sys/stat.h>
+diff -c -3 -r nighthawk-2.2/src_sound/Make.common nighthawk.orig/src_sound/Make.common
+*** nighthawk-2.2/src_sound/Make.common	Sat May  1 18:04:08 1999
+--- nighthawk.orig/src_sound/Make.common	Fri Jul 12 04:23:51 2002
+***************
+*** 10,16 ****
+    endif
+  endif
+  
+! HOST_SAFE = 0
+  
+  ifeq ($(HOSTTYPE),i386)
+    HOST_SAFE = 1
+--- 10,16 ----
+    endif
+  endif
+  
+! HOST_SAFE = 1
+  
+  ifeq ($(HOSTTYPE),i386)
+    HOST_SAFE = 1
+*** nighthawk-2.2/src/object.cc	Mon Sep 30 21:54:56 2002
+--- nighthawk-orig/src/object.cc	Mon Sep 30 21:55:05 2002
+***************
+*** 32,37 ****
+--- 32,39 ----
+  #include "tdroid_8xx.h"
+  #include "tdroid_9xx.h"
+  
++ #include <string.h>
++ 
+  /***************************************************************************
+  *
+  ***************************************************************************/
diff --git a/games-action/nighthawk/metadata.xml b/games-action/nighthawk/metadata.xml
new file mode 100644
index 000000000000..e90f5a7f5e60
--- /dev/null
+++ b/games-action/nighthawk/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">night-hawk</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/nighthawk/nighthawk-2.2-r1.ebuild b/games-action/nighthawk/nighthawk-2.2-r1.ebuild
new file mode 100644
index 000000000000..bba6757c9e18
--- /dev/null
+++ b/games-action/nighthawk/nighthawk-2.2-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A tribute to Paradroid by Andrew Braybrook"
+HOMEPAGE="http://night-hawk.sourceforge.net/nighthawk.html"
+SRC_URI="ftp://metalab.unc.edu/pub/Linux/games/arcade/${P}-1.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="x11-libs/libXpm"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/nighthawk.patch
+	"${FILESDIR}"/${P}-gcc42.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's:AC_FD_MSG:6:g' configure || die #218936
+	sed -i -e '/LDFLAGS = /d' src/Makefile.in || die
+}
diff --git a/games-action/noiz2sa-0.51a-r1 b/games-action/noiz2sa-0.51a-r1
deleted file mode 100644
index 3396bb110fef..000000000000
--- a/games-action/noiz2sa-0.51a-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=dev-libs/libbulletml-0.0.3 media-libs/sdl-mixer[vorbis] virtual/opengl
-DESCRIPTION=Abstract Shooting Game
-EAPI=6
-HOMEPAGE=http://www.asahi-net.or.jp/~cs8k-cyu/windows/noiz2sa_e.html https://sourceforge.net/projects/noiz2sa/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/libbulletml-0.0.3 media-libs/sdl-mixer[vorbis] virtual/opengl
-SLOT=0
-SRC_URI=mirror://sourceforge/noiz2sa/noiz2sa-0.51a.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=43dab2e490e64cd49e21e2bdad03abeb
diff --git a/games-action/noiz2sa/Manifest b/games-action/noiz2sa/Manifest
new file mode 100644
index 000000000000..a9eb4b2255cd
--- /dev/null
+++ b/games-action/noiz2sa/Manifest
@@ -0,0 +1,5 @@
+AUX noiz2sa-0.51a-gcc41.patch 621 BLAKE2B 834ba58a31f739009843e905235bb2bc9013258914aaf46edfe4675eac03ac601856fe21a69f7ca839091985d7b04a3928be1a09800fda6e9a6e269c89311365 SHA512 895c81865aefd54a20f9b22b07f6a1dd8a11034a20c62f08888d73cba5e106c30a78c4b11575a991e2c34d84911614e1b5a1d34231b52f8d55ff9751d5d18bdc
+AUX noiz2sa-0.51a-underlink.patch 971 BLAKE2B 0fe04349a4f5a5bf02c9f15d29750cf46f336c2e387c6dc1f0f67662469062e7748cd9cd799b5d8c17e77510f43f0cf6e9437ceba5395ae6fabedb0600e5adc1 SHA512 fcc3bc67fe1d06fdb8466112f6c3bd15b681ba3da83a0b70b09ebc734c53f390eb1f380cffb0d2753a7c42ca2d483255a39b1979e7b745ee9e63fbb0a65e506b
+DIST noiz2sa-0.51a.tar.gz 8861907 BLAKE2B e6b4747945fe15cdfd58f1a5cfa80ecae4e3bdabcdba9d7c2e826315ff90bed0a2f66e9e308ef621dd282b3809b13be7a8bf0115be3fa88dad35e6cf3f6a458e SHA512 be0893f96240c00c15073d99e0c73667f65bd4aa98a303d6b4e0b7d5ac9fa510843b37841f9cf6c98f602cb7a70c518107272df1f42682a74ec52a3221e10174
+EBUILD noiz2sa-0.51a-r1.ebuild 826 BLAKE2B b7912deefb550426b3fccd8033110397c78b76d6d0ed4930e96efac243567bfedf24d4ad9a7768a22c085fe02775447736b2d113f957d9ad868790643b15e645 SHA512 09a03012f3ebf0ecefe7b4a3385a9e7ad73a2bfe7a43148af2c4afc56043e57e239518e92cfc2fcd00b582e22667a300d6f5ee2381013525d06ad874a33c936f
+MISC metadata.xml 330 BLAKE2B 9aac324cda12c70950bcd954bffe87fea9b81243fc10922c20a01aa749f19c630f7e714cd3e10348b5eb6b5baa1db052d176fd9b322f609813230d3d6634bc1c SHA512 420c33888091af44a7fa2b8d8763cb1ab3748a23485d1c987cea2ea6d03589880d4a9d9b10ede7395e232b19c6be135755c6a495dfbf77b45482f5c85c36a9a9
diff --git a/games-action/noiz2sa/files/noiz2sa-0.51a-gcc41.patch b/games-action/noiz2sa/files/noiz2sa-0.51a-gcc41.patch
new file mode 100644
index 000000000000..9f4f4fe2f1c0
--- /dev/null
+++ b/games-action/noiz2sa/files/noiz2sa-0.51a-gcc41.patch
@@ -0,0 +1,17 @@
+--- src/foecommand.h.old	2006-04-21 20:06:35.000000000 +0200
++++ src/foecommand.h	2006-04-21 20:06:57.000000000 +0200
+@@ -36,10 +36,10 @@
+   
+   virtual void doChangeDirection(double d);
+   virtual void doChangeSpeed(double s);
+-  virtual void FoeCommand::doAccelX(double ax);
+-  virtual void FoeCommand::doAccelY(double ay);
+-  virtual double FoeCommand::getBulletSpeedX();
+-  virtual double FoeCommand::getBulletSpeedY();
++  virtual void doAccelX(double ax);
++  virtual void doAccelY(double ay);
++  virtual double getBulletSpeedX();
++  virtual double getBulletSpeedY();
+   
+  private:
+   struct foe *foe;
diff --git a/games-action/noiz2sa/files/noiz2sa-0.51a-underlink.patch b/games-action/noiz2sa/files/noiz2sa-0.51a-underlink.patch
new file mode 100644
index 000000000000..6d6ab9f18636
--- /dev/null
+++ b/games-action/noiz2sa/files/noiz2sa-0.51a-underlink.patch
@@ -0,0 +1,31 @@
+--- a/makefile.lin	2011-06-14 08:03:28.928366818 +0200
++++ b/makefile.lin	2011-06-14 08:07:43.199113541 +0200
+@@ -4,18 +4,13 @@
+ NAME   = noiz2sa
+ O      = o
+ RM     = rm -f
+-CC     = gcc
+-CXX    = g++
+ 
+ PROG        = $(NAME)
+ 
+ DEFAULT_CFLAGS = `sdl-config --cflags`
+-LDFLAGS        = `sdl-config --libs` -L. -lglut -lbulletml -lSDL_mixer -mwindows -lstdc++
++LDLIBS         = `sdl-config --libs` -lGL -lbulletml -lSDL_mixer -lstdc++ -lm
+ 
+-MORE_CFLAGS = -O3
+-
+-CFLAGS  = $(DEFAULT_CFLAGS) $(MORE_CFLAGS)
+-CPPFLAGS  = $(DEFAULT_CFLAGS) $(MORE_CFLAGS) -I./bulletml/
++CPPFLAGS  = $(DEFAULT_CFLAGS) -I./bulletml/
+ 
+ OBJS =	$(NAME).$(O) ship.$(O) shot.$(O) frag.$(O) bonus.$(O) \
+ 	foe.$(O) foecommand.$(O) barragemanager.$(O) attractmanager.$(O) \
+@@ -23,7 +19,6 @@
+ 	screen.$(O) clrtbl.$(O) vector.$(O) degutil.$(O) rand.$(O) soundmanager.$(O)
+ 
+ $(PROG): $(OBJS)
+-	$(CC) $(CFLAGS) -o $(PROG) $(OBJS) $(LDFLAGS)
+ 
+ clean:
+ 	$(RM) $(PROG) *.$(O)
diff --git a/games-action/noiz2sa/metadata.xml b/games-action/noiz2sa/metadata.xml
new file mode 100644
index 000000000000..953ec64f1e61
--- /dev/null
+++ b/games-action/noiz2sa/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">noiz2sa</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/noiz2sa/noiz2sa-0.51a-r1.ebuild b/games-action/noiz2sa/noiz2sa-0.51a-r1.ebuild
new file mode 100644
index 000000000000..785ff242ac91
--- /dev/null
+++ b/games-action/noiz2sa/noiz2sa-0.51a-r1.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 user
+
+DESCRIPTION="Abstract Shooting Game"
+HOMEPAGE="http://www.asahi-net.or.jp/~cs8k-cyu/windows/noiz2sa_e.html https://sourceforge.net/projects/noiz2sa/"
+SRC_URI="mirror://sourceforge/noiz2sa/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-libs/libbulletml-0.0.3
+	media-libs/sdl-mixer[vorbis]
+	virtual/opengl"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}/src
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc41.patch
+	"${FILESDIR}"/${P}-underlink.patch
+)
+
+src_prepare(){
+	default
+	cp makefile.lin Makefile || die
+}
+
+src_install(){
+	local datadir="/usr/share/games/${PN}"
+
+	dobin ${PN}
+	dodir "${datadir}"
+	dodoc ../readme*
+
+	cp -r ../noiz2sa_share/* "${D}/${datadir}" || die
+}
diff --git a/games-action/openastromenace-1.3.2-r1 b/games-action/openastromenace-1.3.2-r1
deleted file mode 100644
index d2626e1c05e7..000000000000
--- a/games-action/openastromenace-1.3.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=media-libs/freealut media-libs/freetype:2 media-libs/libogg media-libs/libsdl[joystick,video,X] media-libs/libvorbis media-libs/openal virtual/glu virtual/opengl x11-libs/libXinerama >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Modern 3D space shooter with spaceship upgrade possibilities
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/openastromenace/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 GPL-3+ CC-BY-SA-3.0 UbuntuFontLicense-1.0 OFL-1.1
-RDEPEND=media-libs/freealut media-libs/freetype:2 media-libs/libogg media-libs/libsdl[joystick,video,X] media-libs/libvorbis media-libs/openal virtual/glu virtual/opengl x11-libs/libXinerama
-SLOT=0
-SRC_URI=mirror://sourceforge/openastromenace/1.3.2/astromenace-src-1.3.2.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=83327e2cb750e7f636b7390d24ad5aad
diff --git a/games-action/openastromenace/Manifest b/games-action/openastromenace/Manifest
new file mode 100644
index 000000000000..aaadf53f73f5
--- /dev/null
+++ b/games-action/openastromenace/Manifest
@@ -0,0 +1,3 @@
+DIST astromenace-src-1.3.2.tar.bz2 55390211 BLAKE2B 143e0a5dbbb9b451ca15b3ff015db6981ebd6b54200093bc1f34e0eda2029f544c3b70ecfcd5435b44c52a614b5ff859dc8dca79a4277d49a7129ae7d522c6a8 SHA512 0a06278a8a7fdaaf5c730590fcc1f8f59503fe4c94dcbb6dd6b6ee638048f9bebf7c49c75cd32f26e4cd08cfbe01f5082002860901b7196f08a55712bb3ed5d4
+EBUILD openastromenace-1.3.2-r1.ebuild 1531 BLAKE2B 477081a3de2f367a3de2ff214e061b4589ee5dedf4055c034f0dca89d255fe3d8bfa57dc287508aba1ad0fe1bd9910475c9b7aa86c4b947a94aa4bb85eb5b03c SHA512 07a61135ce4b2c05b6ce3a83b0c18073cf970b73b7caac7ac85e1ad8dac8438713878e9dc1276cc39f0cd182977bed38ff4c256dc8de461c157def6055de3234
+MISC metadata.xml 338 BLAKE2B 6c318ab57a89bd4e1ae46723bf6d0a64e7ef78f8507dabbfb8a0ff3f39b58ce5642f04e2d65d93722d74a4783b67fe860513785a12098aa7ee03f8d7df2054f6 SHA512 b2364e10d11ba13a39560816a4b7bc99bd00eb5917e81842a909813cd0fe55bb5324baf4181238fcd1122508bde58f2f0d064c6d6cf52401bc7a76372c6e6e44
diff --git a/games-action/openastromenace/metadata.xml b/games-action/openastromenace/metadata.xml
new file mode 100644
index 000000000000..6894dd761700
--- /dev/null
+++ b/games-action/openastromenace/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">openastromenace</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/openastromenace/openastromenace-1.3.2-r1.ebuild b/games-action/openastromenace/openastromenace-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..cdd657e1958c
--- /dev/null
+++ b/games-action/openastromenace/openastromenace-1.3.2-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils cmake-utils eutils
+
+DESCRIPTION="Modern 3D space shooter with spaceship upgrade possibilities"
+HOMEPAGE="https://sourceforge.net/projects/openastromenace/"
+SRC_URI="mirror://sourceforge/openastromenace/${PV}/astromenace-src-${PV}.tar.bz2"
+
+LICENSE="GPL-3 GPL-3+ CC-BY-SA-3.0 UbuntuFontLicense-1.0 OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	media-libs/freealut
+	media-libs/freetype:2
+	media-libs/libogg
+	media-libs/libsdl[joystick,video,X]
+	media-libs/libvorbis
+	media-libs/openal
+	virtual/glu
+	virtual/opengl
+	x11-libs/libXinerama"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/AstroMenace
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# no messing with CXXFLAGS please.
+	sed -i -e '/-Os/d' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=("-DDATADIR=/usr/share/${PN}")
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	"${CMAKE_BUILD_DIR}"/AstroMenace --pack \
+		--rawdata="${S}"/RAW_VFS_DATA \
+		--dir=$(dirname "${CMAKE_BUILD_DIR}") || die
+}
+
+src_install() {
+	newbin "${CMAKE_BUILD_DIR}"/AstroMenace "${PN}"
+
+	insinto /usr/share/${PN}
+	doins ../*.vfs
+
+	newicon -s 128 astromenace_128.png ${PN}.png
+	newicon -s 64 astromenace_64.png ${PN}.png
+
+	dodoc ChangeLog.txt ReadMe.txt
+
+	make_desktop_entry "${PN}" OpenAstroMenace
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-action/openclonk-7.0 b/games-action/openclonk-7.0
deleted file mode 100644
index fa2c7d23d60f..000000000000
--- a/games-action/openclonk-7.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=dev-libs/boost-1.40:= dev-libs/tinyxml net-libs/libupnp media-libs/libpng:0= sys-libs/zlib !dedicated? ( dev-libs/glib:2 media-libs/freealut media-libs/freetype:2 media-libs/glew media-libs/libsdl[X,opengl,sound,video] media-libs/libvorbis media-libs/openal media-libs/sdl-mixer[mp3,vorbis,wav] virtual/jpeg:0= virtual/opengl virtual/glu x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libXrandr x11-libs/libX11 ) dedicated? ( sys-libs/readline:0= ) || ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 ) virtual/pkgconfig doc? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-libs/libxml2[python] sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=A free multiplayer action game where you control clonks
-EAPI=5
-HOMEPAGE=https://openclonk.org/
-IUSE=dedicated doc
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD ISC CLONK-trademark LGPL-2.1 POSTGRESQL
-RDEPEND=>=dev-libs/boost-1.40:= dev-libs/tinyxml net-libs/libupnp media-libs/libpng:0= sys-libs/zlib !dedicated? ( dev-libs/glib:2 media-libs/freealut media-libs/freetype:2 media-libs/glew media-libs/libsdl[X,opengl,sound,video] media-libs/libvorbis media-libs/openal media-libs/sdl-mixer[mp3,vorbis,wav] virtual/jpeg:0= virtual/opengl virtual/glu x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libXrandr x11-libs/libX11 ) dedicated? ( sys-libs/readline:0= ) games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.openclonk.org/builds/release/7.0/openclonk-7.0-src.tar.bz2
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	5128c4729303400bd8d4b0b966530955	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0d4f1f5db5d9b1dc2735dd9c90667f2d
diff --git a/games-action/openclonk/Manifest b/games-action/openclonk/Manifest
new file mode 100644
index 000000000000..37921f643a59
--- /dev/null
+++ b/games-action/openclonk/Manifest
@@ -0,0 +1,6 @@
+AUX openclonk-7.0-paths.patch 2792 BLAKE2B e8ff47e3881236795cabb3c3c7374059da692bbdf8edd1866d303c6f63389d529ccbf854a80e70a73cabbabe06c41a9820ddd5a918798319ec31c1ec6c3dd5a4 SHA512 3079ce128cba9b822bdb2df404a51a28df4152041d86bc55f10f6ddd057e29127b57da71471dd256fe48de9e30c1a33c760d99868c6611806e7468a2164d886c
+AUX openclonk-7.0-postinst.patch 668 BLAKE2B 7f39cf553e209fad91466ad99682bf92eaee809616828e558562d28fac088d2cdc5fde744093e855eb7d4153dbe3bc98d9424559fa5e1ca17bbe8bed05679136 SHA512 77258633e8a4601f53666520561c40a533699d8de3429463d66a2b9659105c7838a099371648a92d91d1b1226abd6dd277717645e7409aed7ee40439bfab3634
+AUX openclonk-wrapper-script.sh 229 BLAKE2B 5645fe9fd40d59a8284a71fdbea5d3c9728d1209cc11ce6e0d6a67ecba6bdc1b43e55c58c3664d452097c7236bd0f0b226c3fefb3a78ffdd9c960ca9f8c1c32d SHA512 d31a2ffa6dbb014cfe3761d5a8b52b33f6b658cda317d0f7fc91ad8cc869fd93c486f9808da9ebe03e75255b7b2fedc2ef6c4f6372f1dce0575771ae9471a8a3
+DIST openclonk-7.0-src.tar.bz2 102143348 BLAKE2B 2ea6aa1aaca21795c80ee668b17fbfbfe0d5bc4fb4607066eb75e3d25ba0e81de06959e335ab8076cda04b05c4569ea1fcc02d9856e010f12e7ad678ead8519b SHA512 b7ea557b5441986c0527abcb9c074c462f73bf45dd7ac4835329169d63ace5cc02e122d0dee7241da8621a7727ce9b09a2ad17e06dfc5610fcb529d350a51577
+EBUILD openclonk-7.0.ebuild 2574 BLAKE2B 97e471d2120b211476cc7eb8777d033aebc5f6ed249b198b2352abdb92f9c1d856d03a382c1268536458cef001d988eb724a55763b03856a044f3ed86492acfe SHA512 de817e06328ceb5ea2d3e520db5336da3125002874a84d8c6e2f8c91546ccb0710d03d48ac4a2e80ce43f307b7e6ae20cc1a9eff15594e4c5d71e9c739e73e81
+MISC metadata.xml 1027 BLAKE2B 65056dd55948b37edd79afa73dfd801581b9aa178fe515b387a3a41bee4d4e500a5a4572592d4eba328e8ea0250d2f2d16278ebc1a18ee9b57db158e0829efe7 SHA512 566eb22d22644a7a16f94246b0f461ac7cac26702e2a21c443790f735155b8d30507862728847ab93f4e9c036561580363ef29de2173499e4b802a828ab1616f
diff --git a/games-action/openclonk/files/openclonk-7.0-paths.patch b/games-action/openclonk/files/openclonk-7.0-paths.patch
new file mode 100644
index 000000000000..4ebd6034a59b
--- /dev/null
+++ b/games-action/openclonk/files/openclonk-7.0-paths.patch
@@ -0,0 +1,68 @@
+Updated for openclonk-6.0, based on this patch:
+  From: Julian Ospald <hasufell@gentoo.org>
+  Date: Thu Feb  6 19:58:45 UTC 2014
+  Subject: make paths modifiable
+
+--- openclonk-release-6.0-src.orig/CMakeLists.txt
++++ openclonk-release-6.0-src/CMakeLists.txt
+@@ -42,6 +42,16 @@
+ 	set(${_var} "${_string}" PARENT_SCOPE)
+ endfunction()
+ 
++
++############################################################################
++# User selectable paths
++############################################################################
++set(INSTALL_BINDIR "bin/" CACHE PATH "Binary install destination")
++set(INSTALL_GAMES_BINDIR "games/bin" CACHE PATH "Games binary install destination")
++set(INSTALL_DATAROOTDIR "share/" CACHE PATH "Data root install destination")
++set(INSTALL_DATADIR "${INSTALL_DATAROOTDIR}" CACHE PATH "Data install destination")
++
++
+ ############################################################################
+ # User selectable options
+ ############################################################################
+@@ -1212,10 +1222,16 @@
+ # Assemble compiler flags
+ ############################################################################
+ if(UNIX)
++	if(NOT IS_ABSOLUTE "${INSTALL_DATADIR}")
++		set(ABSOLUTE_INSTALL_DATADIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_DATADIR}")
++	else()
++		set(ABSOLUTE_INSTALL_DATADIR "${INSTALL_DATADIR}")
++	endif()
++
+ 	# Don't put this into CMAKE_CXX_FLAGS because otherwise it is cached,
+ 	# and when the path is changed both the old and new definition appears
+ 	# in the list of flags.
+-	add_definitions("-DOC_SYSTEM_DATA_DIR=\"${CMAKE_INSTALL_PREFIX}/share/games/openclonk\"")
++	add_definitions("-DOC_SYSTEM_DATA_DIR=\"${ABSOLUTE_INSTALL_DATADIR}/openclonk\"")
+ endif()
+ if(OC_CXX_FLAGS)
+ 	list(REMOVE_DUPLICATES OC_CXX_FLAGS)
+@@ -1537,7 +1553,7 @@
+ 			DEPENDS "${native_c4group}"
+ 			VERBATIM
+ 		)
+-		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${group} DESTINATION share/games/openclonk)
++		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${group} DESTINATION "${INSTALL_DATADIR}/openclonk")
+ 	endif()
+ endforeach()
+ 
+@@ -1546,13 +1562,13 @@
+ 	add_dependencies(data groups)
+ 	
+ 	# Install new files
+-	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/openclonk.desktop DESTINATION share/applications)
++	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/openclonk.desktop DESTINATION "${INSTALL_DATAROOTDIR}/applications")
+ 	# Update the MIME cache -- this makes the clonk:// protocol handler actually work
+ 	install(CODE "execute_process(COMMAND update-desktop-database)")
+ 
+ 	# Install binaries
+-	install(TARGETS openclonk DESTINATION games)
+-	install(TARGETS c4group DESTINATION bin)
++	install(TARGETS openclonk DESTINATION "${INSTALL_GAMES_BINDIR}")
++	install(TARGETS c4group DESTINATION "${INSTALL_BINDIR}")
+ else()
+ 	install(TARGETS openclonk
+ 		BUNDLE DESTINATION .
diff --git a/games-action/openclonk/files/openclonk-7.0-postinst.patch b/games-action/openclonk/files/openclonk-7.0-postinst.patch
new file mode 100644
index 000000000000..26ad61ec6784
--- /dev/null
+++ b/games-action/openclonk/files/openclonk-7.0-postinst.patch
@@ -0,0 +1,14 @@
+update-desktop-database is called from the pkg_postinst stage instead.
+
+--- openclonk-release-6.0-src.orig/CMakeLists.txt
++++ openclonk-release-6.0-src/CMakeLists.txt
+@@ -1564,7 +1564,8 @@
+ 	# Install new files
+ 	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/openclonk.desktop DESTINATION "${INSTALL_DATAROOTDIR}/applications")
+ 	# Update the MIME cache -- this makes the clonk:// protocol handler actually work
+-	install(CODE "execute_process(COMMAND update-desktop-database)")
++	# --> ebuild, pkg_postinst stage
++	#install(CODE "execute_process(COMMAND update-desktop-database)")
+ 
+ 	# Install binaries
+ 	install(TARGETS openclonk DESTINATION "${INSTALL_GAMES_BINDIR}")
diff --git a/games-action/openclonk/files/openclonk-wrapper-script.sh b/games-action/openclonk/files/openclonk-wrapper-script.sh
new file mode 100644
index 000000000000..9f7e64442887
--- /dev/null
+++ b/games-action/openclonk/files/openclonk-wrapper-script.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+# wrapper prevents the game to look for .ocp files in the current dir
+# which can lead to weird behavior and game freeze
+
+[ -d ~/.clonk/openclonk ] || mkdir -p ~/.clonk/openclonk
+
+cd ~/.clonk/openclonk
+
+exec clonk "$@"
diff --git a/games-action/openclonk/metadata.xml b/games-action/openclonk/metadata.xml
new file mode 100644
index 000000000000..8d041fd7d412
--- /dev/null
+++ b/games-action/openclonk/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<changelog>http://hg.openclonk.org/openclonk/</changelog>
+		<doc lang="en">http://wiki.openclonk.org/w/C4Script_Documentation</doc>
+		<bugs-to>http://bugs.openclonk.org/</bugs-to>
+	</upstream>
+	<longdescription lang="en">
+		OpenClonk is the Open source successor of the Clonk gaming series.
+		OpenClonk is a project dedicated to the further development of the
+		Clonk game series. Our goal is to improve and make the real strengths
+		of Clonk more fun to play: Bustling mining, production lines and
+		economy, fast and fiddly melees. Another focus lies on the further
+		enchancement of the game engine and the extensibility/modability of
+		the game content with C4Script which has always been one of the most
+		important features of Clonk.
+	</longdescription>
+</pkgmetadata>
diff --git a/games-action/openclonk/openclonk-7.0.ebuild b/games-action/openclonk/openclonk-7.0.ebuild
new file mode 100644
index 000000000000..46aeb31b45a4
--- /dev/null
+++ b/games-action/openclonk/openclonk-7.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils eutils gnome2-utils python-any-r1 fdo-mime toolchain-funcs games
+
+MY_P=${PN}-release-${PV}-src
+
+DESCRIPTION="A free multiplayer action game where you control clonks"
+HOMEPAGE="https://openclonk.org/"
+SRC_URI="http://www.openclonk.org/builds/release/${PV}/openclonk-${PV}-src.tar.bz2"
+
+LICENSE="BSD ISC CLONK-trademark LGPL-2.1 POSTGRESQL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated doc"
+
+RDEPEND="
+	>=dev-libs/boost-1.40:=
+	dev-libs/tinyxml
+	net-libs/libupnp
+	media-libs/libpng:0=
+	sys-libs/zlib
+	!dedicated? (
+		dev-libs/glib:2
+		media-libs/freealut
+		media-libs/freetype:2
+		media-libs/glew
+		media-libs/libsdl[X,opengl,sound,video]
+		media-libs/libvorbis
+		media-libs/openal
+		media-libs/sdl-mixer[mp3,vorbis,wav]
+		virtual/jpeg:0=
+		virtual/opengl
+		virtual/glu
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3
+		x11-libs/libXrandr
+		x11-libs/libX11
+	)
+	dedicated? ( sys-libs/readline:0= )"
+DEPEND="${RDEPEND}
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	virtual/pkgconfig
+	doc? (
+		${PYTHON_DEPS}
+		dev-libs/libxml2[python]
+		sys-devel/gettext
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-paths.patch
+	"${FILESDIR}"/${P}-postinst.patch
+)
+S=${WORKDIR}/${P}-src
+
+pkg_pretend() {
+	if [[ $(tc-getCXX) == *g++* && $(gcc-version) < 4.9 ]] ; then
+		die 'The active compiler needs to be gcc 4.9 (or newer) or clang'
+	else
+		einfo 'The active compiler should be ok'
+	fi
+}
+
+pkg_setup() {
+	games_pkg_setup
+	use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(usex dedicated \
+			"-DUSE_CONSOLE=ON -DUSE_X11=OFF -DUSE_GTK=OFF -DUSE_GTK3=OFF" \
+			"-DUSE_CONSOLE=OFF -DUSE_X11=ON -DUSE_GTK=ON -DUSE_GTK3=ON")
+		-DWITH_AUTOMATIC_UPDATE=OFF
+		-DINSTALL_GAMES_BINDIR="${GAMES_BINDIR}"
+		-DINSTALL_DATADIR="${GAMES_DATADIR}"
+		-DUSE_STATIC_BOOST=OFF
+		-DUSE_SYSTEM_TINYXML=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && emake -C docs
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if ! use dedicated; then
+		mv "${ED%/}${GAMES_BINDIR}/"{openclonk,clonk} || die
+		newgamesbin "${FILESDIR}"/${PN}-wrapper-script.sh ${PN}
+	fi
+	use doc && dohtml -r docs/online/*
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
diff --git a/games-action/orbital-eunuchs-sniper-1.30-r1 b/games-action/orbital-eunuchs-sniper-1.30-r1
deleted file mode 100644
index ef085b5dad88..000000000000
--- a/games-action/orbital-eunuchs-sniper-1.30-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=media-libs/libsdl[joystick,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] >=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=Snipe terrorists from your orbital base
-EAPI=6
-HOMEPAGE=http://icculus.org/oes/
-KEYWORDS=~amd64 ~x86
-LICENSE=ZLIB
-RDEPEND=media-libs/libsdl[joystick,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis]
-SLOT=0
-SRC_URI=http://filesingularity.timedoctor.org/orbital_eunuchs_sniper-1.30.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_=f5c6d76a4021d31f706bbc6f0b1325a6
diff --git a/games-action/orbital-eunuchs-sniper/Manifest b/games-action/orbital-eunuchs-sniper/Manifest
new file mode 100644
index 000000000000..3fb307073013
--- /dev/null
+++ b/games-action/orbital-eunuchs-sniper/Manifest
@@ -0,0 +1,5 @@
+AUX orbital-eunuchs-sniper-1.30-datadir.patch 1017 BLAKE2B 4898babd1fa2b5ec7a826fe0a7628521db341caeb2c97251f5d0fda71125eda0a3c9ad6a390a0386d5c0f6e565a1dc14d2cdc7c65f4bb6a424dd51160e6b56b7 SHA512 ad26d66bce8d90cb80360d113a55973a97131ab7dfda5580dd34539e9388acb08f171f6a266b83aa550642e395072f70e953ec01dadaeddfee3ec1508c34f5d0
+AUX orbital-eunuchs-sniper-1.30-gcc43.patch 210 BLAKE2B 8787f739d219ed731d5ae023444c8126a2520f932763e86d70cd3877473e69e8535a862e55f379b28239d41701201105d56173b4cd97ca722b8955c6d0a27fec SHA512 60e33b96494b078ab5d11c79494f7e3e44f46644ab5731a32d7b3c5c6365e31f5e81755d301ba1d623aedba3839ae23c08442f22f70adf63c6a133fdb5c7a3ac
+DIST orbital_eunuchs_sniper-1.30.tar.gz 4056847 BLAKE2B bbe62a23ea3ebcb3244c93189027dca0ef05f8be78b5dc0d4463883b4207a7493f2b1051337492aafe24813822c5678f27e482d1ce6785d2674cc60c49281794 SHA512 81da382bdb6cd25ea3f1a3ecebc2827173cd7c77903cd37b88f328ae2c42f5db5a668597ebb2fca1c5c307d6db2745614aebee6f5e1be48fade184381558f21a
+EBUILD orbital-eunuchs-sniper-1.30-r1.ebuild 817 BLAKE2B 4d4ac418a49a58e43ee7b72e80d531f5802cc8a027d518d03cf50a03bcacf173ea20b52580521bad537d799f4a3241acb61d1881b670d6a14ea096b2f88e56e3 SHA512 060dd8f745d7f7c011f128af6ad63e8f87d23bb3359363cf35651b774e32acb42fe400171aa662e8e84bd019882332baac583dc5a935854e663e5ff1ec8428ba
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/orbital-eunuchs-sniper/files/orbital-eunuchs-sniper-1.30-datadir.patch b/games-action/orbital-eunuchs-sniper/files/orbital-eunuchs-sniper-1.30-datadir.patch
new file mode 100644
index 000000000000..9492e1e8b967
--- /dev/null
+++ b/games-action/orbital-eunuchs-sniper/files/orbital-eunuchs-sniper-1.30-datadir.patch
@@ -0,0 +1,36 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -64,14 +64,12 @@
+  ,dnl default action of assigning shell value
+  with_games_dir="${runtime_datadir}/games"
+ )
+-AC_SUBST(datadir,"${with_games_dir}")
+ AC_DEFINE_UNQUOTED([GAMEDATADIR], "${datadir}/$PACKAGE_NAME",
+                                [Game data directory])
+ 
+ 
+ #These should be automagically determined somehow.
+ #CPU Instruction Set.  Should be automagic.
+-AC_SUBST(CPU_IS,`uname -m`)
+ 
+ 
+ echo $ac_n "ordering crap from http://www.amazon.com/gp/registry/296ST2NHEBO0Z" 1>&6
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,6 +1,4 @@
+-pkgdata_PROGRAMS = snipe2d.@CPU_IS@.dynamic snipe2d.@CPU_IS@.static
+-BUILT_SOURCES = snipe2d
+-bin_SCRIPTS = snipe2d
++bin_PROGRAMS = snipe2d
+ snipe2d_common = \
+  ai.cpp \
+  binds.cpp \
+@@ -28,7 +26,7 @@
+  sexpr/io.c \
+  sexpr/parser.c
+ 
+-snipe2d_@CPU_IS@_dynamic_SOURCES = $(snipe2d_common)
++snipe2d_SOURCES = $(snipe2d_common)
+ 
+ #snipe2d_@CPU_IS@_static_LDFLAGS = -static
+ snipe2d_@CPU_IS@_static_SOURCES = $(snipe2d_common)
diff --git a/games-action/orbital-eunuchs-sniper/files/orbital-eunuchs-sniper-1.30-gcc43.patch b/games-action/orbital-eunuchs-sniper/files/orbital-eunuchs-sniper-1.30-gcc43.patch
new file mode 100644
index 000000000000..d3747ed0802b
--- /dev/null
+++ b/games-action/orbital-eunuchs-sniper/files/orbital-eunuchs-sniper-1.30-gcc43.patch
@@ -0,0 +1,10 @@
+--- a/src/snipe2d.h
++++ b/src/snipe2d.h
+@@ -39,6 +39,7 @@
+ #include <stdlib.h>
+ #include <math.h>
+ #include <string.h>
++#include <climits>
+ #include <libgen.h>
+ #include <SDL/SDL.h>
+ #include <SDL/SDL_image.h>
diff --git a/games-action/orbital-eunuchs-sniper/metadata.xml b/games-action/orbital-eunuchs-sniper/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-action/orbital-eunuchs-sniper/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-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.30-r1.ebuild b/games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.30-r1.ebuild
new file mode 100644
index 000000000000..191962741a35
--- /dev/null
+++ b/games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.30-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils
+
+MY_P=${PN//-/_}-${PV}
+DESCRIPTION="Snipe terrorists from your orbital base"
+HOMEPAGE="http://icculus.org/oes/"
+SRC_URI="http://filesingularity.timedoctor.org/${MY_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl[joystick,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[vorbis]"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-datadir.patch
+	"${FILESDIR}"/${P}-gcc43.patch
+)
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/^sleep /d' \
+		configure.ac || die
+	eautoreconf
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog readme.txt README TODO" \
+		default
+	make_desktop_entry snipe2d "Orbital Eunuchs Sniper"
+}
diff --git a/games-action/phobiaii-1.1-r1 b/games-action/phobiaii-1.1-r1
deleted file mode 100644
index f28091e7c5af..000000000000
--- a/games-action/phobiaii-1.1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Just a moment ago, you were safe inside your ship, behind five inch armour
-EAPI=6
-HOMEPAGE=http://www.lynxlabs.com/games/linuxphobia/index.html
-KEYWORDS=~amd64 ~x86
-LICENSE=freedist
-RDEPEND=media-libs/libsdl[abi_x86_32(-)] media-libs/sdl-mixer[abi_x86_32(-)] sys-libs/lib-compat
-SLOT=0
-SRC_URI=http://www.lynxlabs.com/games/linuxphobia/linuxphobia-1.1-i386.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_=cfc559118acd000df02498933d3813c7
diff --git a/games-action/phobiaii/Manifest b/games-action/phobiaii/Manifest
new file mode 100644
index 000000000000..bca4aa793750
--- /dev/null
+++ b/games-action/phobiaii/Manifest
@@ -0,0 +1,3 @@
+DIST linuxphobia-1.1-i386.tar.bz2 7709686 BLAKE2B 67325f1a8dd7b9e06c1c54866f2fbea4c032c069a595582a9ed720bd8d34deb312fd79a71c1d2c4233368d8d63904e7d86fbb7aa89ddf1c0f437d3e02d5bf773 SHA512 c8a799eb1e9b25781ef37487951b4213be29a60613bb2455df44e484e3553f153e5872aa97c70286eaf64ba78c621941318f702e5dc680a5442728866d2f7a1d
+EBUILD phobiaii-1.1-r1.ebuild 968 BLAKE2B 20ad83937a34e9f34810806966882c8bc5535a6702448935f96994203c931eec2c9e1218989ee0adbb618d4936f4ac96f130e018130ad41fd641ae066cbc08a5 SHA512 b7ad3f9ef90c2e898d77391943d20b558081536e65d0aef6adb98c51e0176ec4a121653218ddfd82d9228bc4c1df854d72a7d6db692cc760475fddb71dd05d5d
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/phobiaii/metadata.xml b/games-action/phobiaii/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-action/phobiaii/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-action/phobiaii/phobiaii-1.1-r1.ebuild b/games-action/phobiaii/phobiaii-1.1-r1.ebuild
new file mode 100644
index 000000000000..4a1a879bf68a
--- /dev/null
+++ b/games-action/phobiaii/phobiaii-1.1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+MY_P="linuxphobia-${PV}"
+DESCRIPTION="Just a moment ago, you were safe inside your ship, behind five inch armour"
+HOMEPAGE="http://www.lynxlabs.com/games/linuxphobia/index.html"
+SRC_URI="http://www.lynxlabs.com/games/linuxphobia/${MY_P}-i386.tar.bz2"
+
+LICENSE="freedist"		#505612
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/libsdl[abi_x86_32(-)]
+	media-libs/sdl-mixer[abi_x86_32(-)]
+	sys-libs/lib-compat"
+
+S=${WORKDIR}/${MY_P}
+
+QA_PRESTRIPPED="opt/phobiaii/linuxphobia"
+QA_FLAGS_IGNORED="opt/phobiaii/linuxphobia"
+
+src_install() {
+	local dir=/opt/${PN}
+	make_wrapper phobiaII ./linuxphobia "${dir}"
+	newicon phobia2.ico ${PN}.ico
+	make_desktop_entry phobiaII "Phobia II" /usr/share/pixmaps/${PN}.ico
+	insinto "${dir}"
+	doins -r *
+	rm -rf "${D}/${dir}"/{*.desktop,*.sh,/pics/.xvpics}
+	fperms 775 "${dir}"/linuxphobia
+}
diff --git a/games-action/postalplus-1-r1 b/games-action/postalplus-1-r1
deleted file mode 100644
index 7d90c9e3557f..000000000000
--- a/games-action/postalplus-1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Ultraviolent and controversial game featuring the Postal Dude
-EAPI=6
-HOMEPAGE=http://www.lokigames.com/products/postal/
-KEYWORDS=~x86
-LICENSE=LOKI-EULA
-PROPERTIES=interactive
-RESTRICT=strip
-SLOT=0
-_eclasses_=cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=006bfa01d7534938cb31a821743502d5
diff --git a/games-action/postalplus/Manifest b/games-action/postalplus/Manifest
new file mode 100644
index 000000000000..5c6536dec6ae
--- /dev/null
+++ b/games-action/postalplus/Manifest
@@ -0,0 +1,2 @@
+EBUILD postalplus-1-r1.ebuild 821 BLAKE2B 751b7928b33ddfa68f752ccb0d1c2ac356df5ad7fa5dc0a49bd908564d4fea70d9f408e2295d68443c09f2859910d581373d4245ba08328ebf5b8705f5f0f59b SHA512 709242ec1096a0041ebecf97e890e6aef0561536efdabe6dda665c0fe7e9841568ee681fc543391419741837f55ad45cadce588ef73ccf4e2bb128f84b3a67df
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/postalplus/metadata.xml b/games-action/postalplus/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-action/postalplus/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-action/postalplus/postalplus-1-r1.ebuild b/games-action/postalplus/postalplus-1-r1.ebuild
new file mode 100644
index 000000000000..569d32f5fa13
--- /dev/null
+++ b/games-action/postalplus/postalplus-1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils cdrom
+
+DESCRIPTION="Ultraviolent and controversial game featuring the Postal Dude"
+HOMEPAGE="http://www.lokigames.com/products/postal/"
+SRC_URI=""
+
+LICENSE="LOKI-EULA"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+RESTRICT="strip"
+
+S=${WORKDIR}
+
+src_install() {
+	local dir=/opt/${PN}
+
+	cdrom_get_cds postal_plus.ini
+	exeinto "${dir}"
+	doexe "${CDROM_ROOT}"/bin/x86/postal
+	insinto "${dir}"
+	doins "${CDROM_ROOT}"/{icon.{bmp,xpm},postal_plus.ini,README}
+	cp "${CDROM_ROOT}"/icon.xpm ${PN}.xpm || die
+
+	cp -r "${CDROM_ROOT}"/res "${D}${dir}" || die
+	find "${D}" -name TRANS.TBL -exec rm '{}' + || die
+
+	make_wrapper ${PN} ./postal "${dir}"
+	doicon ${PN}.xpm
+	make_desktop_entry ${PN} "Postal Plus" ${PN}
+}
diff --git a/games-action/powermanga-0.93.1-r1 b/games-action/powermanga-0.93.1-r1
deleted file mode 100644
index 1d3d7d268df3..000000000000
--- a/games-action/powermanga-0.93.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=>=media-libs/libsdl-1.2[sound,joystick,video] media-libs/libpng:0 media-libs/sdl-mixer[mod] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga >=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=An arcade 2D shoot-em-up game
-EAPI=6
-HOMEPAGE=http://linux.tlk.fr/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=media-libs/libsdl-1.2[sound,joystick,video] media-libs/libpng:0 media-libs/sdl-mixer[mod] x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga
-SLOT=0
-SRC_URI=http://linux.tlk.fr/games/Powermanga/download/powermanga-0.93.1.tgz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a2e57bb569a1607f398c8fe89b51b2ea
diff --git a/games-action/powermanga/Manifest b/games-action/powermanga/Manifest
new file mode 100644
index 000000000000..c131f769c97c
--- /dev/null
+++ b/games-action/powermanga/Manifest
@@ -0,0 +1,4 @@
+AUX powermanga-0.93.1-flags.patch 394 BLAKE2B c86e0b22f8f856300f37d6e2e17d712769820314ce820ec625e38ca3d4123ad22e6de2097487fefc31ced8536640d0f7431ac831cfde858b88458a7d85413391 SHA512 16cb19ea59cd632b7d9c7b2b61f74e664e81160d9bfd25604613057e2dd08d84e112cb355a0e18e76069fcf2693bffb381ce467f8d86218850659cb6ce5bd756
+DIST powermanga-0.93.1.tgz 11855703 BLAKE2B e1fe88ded02e49538891472ef009bb58151ecece0c3df518d42ba2efd206b66f3aa556ddea5a8a26eb8365ebf1ba2ba9b3f69da7434cb435254d33ba88386ace SHA512 852c0b4550db6c9e4ecd380077d390327f6649b6e8ab4cad246f23e7335e8622008f9fc753e2f474bf9cf7a5654b071e3f117f6a2b5be72ea53709912f4a0f41
+EBUILD powermanga-0.93.1-r1.ebuild 1623 BLAKE2B 90c30f4fc6dd7673c83edd9502ab2cf1d240178f13ff4e7c79ddde45b672316958b1e1c7c8bb281e6f65bab81349eca3e3422089737bd1803df13c917558272e SHA512 097b59d1286f4f44dd8afe51ea9dbb3b4f511e63eefba71784a06353dcabe764870657f5630115c1c5bdfe213b9c1c402d0e934125ce91b19b3957402636ebf6
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/powermanga/files/powermanga-0.93.1-flags.patch b/games-action/powermanga/files/powermanga-0.93.1-flags.patch
new file mode 100644
index 000000000000..e8a013a2e04e
--- /dev/null
+++ b/games-action/powermanga/files/powermanga-0.93.1-flags.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac	2015-07-12 17:31:49.673817375 -0400
++++ b/configure.ac	2015-07-12 17:32:18.567700880 -0400
+@@ -54,7 +54,7 @@
+   AC_DEFINE(USE_MALLOC_WRAPPER, 1, Define to use a malloc wrapper)
+   CFLAGS="-Wall -Werror -pedantic -Wextra -std=gnu99 -g $CFLAGS"
+ else
+-  CFLAGS="-O3 -Wall -Wextra -std=gnu99 $CFLAGS"
++  CFLAGS="$CFLAGS -Wall -Wextra -std=gnu99"
+ fi
+ 
+ dnl  Check for SDL_mixer
diff --git a/games-action/powermanga/metadata.xml b/games-action/powermanga/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-action/powermanga/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-action/powermanga/powermanga-0.93.1-r1.ebuild b/games-action/powermanga/powermanga-0.93.1-r1.ebuild
new file mode 100644
index 000000000000..01a45a6d43cd
--- /dev/null
+++ b/games-action/powermanga/powermanga-0.93.1-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils autotools user
+
+DESCRIPTION="An arcade 2D shoot-em-up game"
+HOMEPAGE="http://linux.tlk.fr/"
+SRC_URI="http://linux.tlk.fr/games/Powermanga/download/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libsdl-1.2[sound,joystick,video]
+	media-libs/libpng:0
+	media-libs/sdl-mixer[mod]
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXxf86dga"
+DEPEND=${RDEPEND}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-flags.patch
+)
+
+pkg_setup(){
+	enewgroup gamestat 36
+}
+
+src_prepare() {
+	default
+
+	local f
+	for f in src/assembler.S src/assembler_opt.S ; do
+		einfo "patching $f"
+		cat <<-EOF >> ${f}
+		#if defined(__linux__) && defined(__ELF__)
+		.section .note.GNU-stack,"",%progbits
+		#endif
+		EOF
+	done
+	eautoreconf
+}
+
+src_install() {
+	newbin src/powermanga powermanga.bin
+	doman powermanga.6
+	dodoc AUTHORS CHANGES README
+
+	insinto "/usr/share/${PN}"
+	doins -r data sounds graphics texts
+
+	find "${D}/usr/share/${PN}" -name "Makefil*" -execdir rm -f \{\} +
+
+	dodir "/var/games/${PN}"
+	fowners root:gamestat /var/games/${PN} /usr/bin/${PN}.bin
+	fperms 660 /var/games/${PN}
+	fperms 2755 /usr/bin/${PN}.bin
+
+	local f
+	for f in powermanga.hi-easy powermanga.hi powermanga.hi-hard ; do
+		touch "${D}/var/games/${f}" || die
+		fperms 660 "/var/games/${f}"
+	done
+
+	make_wrapper powermanga powermanga.bin "/usr/share/${PN}"
+	make_desktop_entry powermanga Powermanga
+}
+
+pkg_postinst() {
+	ewarn "NOTE: The highscore file format has changed."
+	ewarn "Older highscores will not be retained."
+}
diff --git a/games-action/rafkill-1.2.3-r1 b/games-action/rafkill-1.2.3-r1
deleted file mode 100644
index e5549f7a242f..000000000000
--- a/games-action/rafkill-1.2.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=<media-libs/allegro-5 media-libs/aldumb dev-util/scons[python_targets_python2_7]
-DESCRIPTION=Space shoot-em-up game
-EAPI=6
-HOMEPAGE=http://raptorv2.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=<media-libs/allegro-5 media-libs/aldumb
-SLOT=0
-SRC_URI=mirror://sourceforge/raptorv2/rafkill-1.2.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=33374d8c475a2bb5806623a1ca842579
diff --git a/games-action/rafkill/Manifest b/games-action/rafkill/Manifest
new file mode 100644
index 000000000000..3446bb719692
--- /dev/null
+++ b/games-action/rafkill/Manifest
@@ -0,0 +1,7 @@
+AUX rafkill-1.2.3-build.patch 779 BLAKE2B e64d1c0f1e822423a0a7c75bcff1bbb2467ffc5a804af63585a1058c914e212c03a044467e4e14c78da9dc75def7b18790a497d27106df4f6c6eae0a1c41d1df SHA512 8b74f5de9b868beb436c7d63d444b5e375edfab22e1f80be2cc6b81b5b6ffe76970357a11f24c4a72ea8ad8b7ed660e7ebb2d4a1378411681a8780b5e18f151d
+AUX rafkill-1.2.3-gcc43.patch 3780 BLAKE2B f216c55a0a198f75492a72faed3a901aa695250e8cbe3cf3d8f5a10f2f79330d7452a83434204f1c1857241e778f881bd57d893fab10c59019d7ae87548b1433 SHA512 5201e8d4d357780d94286387b673a5feb8f8392a4e13a154025841a4242c0be96fbf7af3a4a6224d429e1abb16bf8726983be69abef72de73ec97b902b381c6f
+AUX rafkill-1.2.3-gcc47.patch 283 BLAKE2B 19cc97b69ad4941f8eabc2a47474ba006ca09820b0f059cf0102693e8102feb23a29d7b1abefc6b387de60894cd03de0f3b6c0200a1847e49b93d1055d64482b SHA512 135a0b48bc5020870b45836c38f30c73f5f2ea798016ee5f96d01870d59a71712f277f9c151facdd358c3106b625d4d1884316dd4f8cc7958d0f22bc606c21ae
+AUX rafkill-1.2.3-ldflags.patch 511 BLAKE2B 7156ee6d996605bf67ba8d25710d1c29fc9c2b79da5a3ca9c754292dc380ad7d51c62dad911937d848cfb9298afc153e8a44a237860cf8d8a645c58d74ead832 SHA512 b52f17e4ac5dc2d8f1ea61860cb51342add7cd7621fb8dcf452ee523c2eab6d18d712a74d94a7ac69d4d64c7134d31be9153d4dd354ce30d448187363c39cc27
+DIST rafkill-1.2.3.tar.gz 6221729 BLAKE2B e3ea686f95299f3e6726e75ccf25231dcd57e5c1e03e3212b55b8179b3961a59935c3c5be9d4557bc38f8a29c90dbd758ff8d4de01e1abdcf4f7a7f10e664b7c SHA512 1ab8ce90f9b823092432519dbafed43db3eb6f9189dda4ced1bbce78b826b37759d0768fffdd2df1c77cbbbf1c3c88db1cc9fe1b59c815d832ebc9aed279d03c
+EBUILD rafkill-1.2.3-r1.ebuild 844 BLAKE2B 97dff58eab0a0792e1aefdd61f0ebfcbf8322d849802e4da07ce865565fa70498fb637a8f87243d6d22d9523a8456ca5596a9c893cb78c013164175e9fcf7f95 SHA512 214925f66904d69ed5c3d6fe4b512d48dc217361f7c481a1bdc1b0136927a1469c5ad1e06a6b58b81d6ce3b5db8cd5881e1db59ec6a37a59737f71116b47c99e
+MISC metadata.xml 331 BLAKE2B b00c7e1452d9e053a0d481d2a5ee0d39e7b6ccb00b7a9d5fee3285bddc413a24c4424080df2fbda1374f52bfe9d9fae75273c87d2cee71a6dbfd24922d741a2e SHA512 ed3115f06f8e3884e5b1944f244adc2b396bdc0c6b51436f443868ed3c92651157157eaf9a4fe22d6cd352ad6fa856b39d35ef72503a622c4fff8d70a6ba5232
diff --git a/games-action/rafkill/files/rafkill-1.2.3-build.patch b/games-action/rafkill/files/rafkill-1.2.3-build.patch
new file mode 100644
index 000000000000..26e5aa64c101
--- /dev/null
+++ b/games-action/rafkill/files/rafkill-1.2.3-build.patch
@@ -0,0 +1,27 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -8,8 +8,8 @@
+ 
+ print "Use 'scons -h' for help"
+ 
+-prefix = '/usr/local/games'
+-bin = '/usr/local/bin'
++prefix = 'data'
++bin = 'src'
+ if sys.platform == 'win32':
+ 	try:
+ 		Execute(Mkdir('gen'))
+@@ -46,7 +46,12 @@
+ # print "Install directory = $prefix"
+ # print "Directory where symlinked binary will go = $bin"
+ 
+-flags = [ '-g3', '-Wall', '-fno-rtti', '-Woverloaded-virtual', '-O2', '-DINSTALL_DIR=\\\"$prefix\\\"' ];
++SConsignFile()
++env.Replace(CXX = os.environ['CXX'])
++if os.environ.get('CXXFLAGS'):
++	env.Replace(CPPFLAGS = os.environ['CXXFLAGS'])
++
++flags = [ '-Wall', '-fno-rtti', '-Woverloaded-virtual' ];
+ env.Append( CCFLAGS = flags, CPPPATH = [ "build" ] )
+ 
+ # SConscript( 'src/SConscript', build_dir='build', exports = 'env' );
diff --git a/games-action/rafkill/files/rafkill-1.2.3-gcc43.patch b/games-action/rafkill/files/rafkill-1.2.3-gcc43.patch
new file mode 100644
index 000000000000..7284a74a1ac5
--- /dev/null
+++ b/games-action/rafkill/files/rafkill-1.2.3-gcc43.patch
@@ -0,0 +1,106 @@
+Index: rafkill-1.2.2/src/guns/gun_findgun.cpp
+===================================================================
+--- rafkill-1.2.2.orig/src/guns/gun_findgun.cpp	2006-05-07 15:50:04.000000000 +0100
++++ rafkill-1.2.2/src/guns/gun_findgun.cpp	2008-04-09 22:54:54.000000000 +0100
+@@ -5,6 +5,7 @@
+ #include "weaponobj.h"
+ #include "hulls/hull_weapon_machine.h"
+ #include "spaceobj.h"
++#include <cstdlib>
+ #include <vector>
+ #include <math.h>
+ 
+Index: rafkill-1.2.2/src/guns/gun_machine_circle.cpp
+===================================================================
+--- rafkill-1.2.2.orig/src/guns/gun_machine_circle.cpp	2006-05-02 02:50:40.000000000 +0100
++++ rafkill-1.2.2/src/guns/gun_machine_circle.cpp	2008-04-09 22:54:54.000000000 +0100
+@@ -3,6 +3,7 @@
+ #include "weaponobj.h"
+ #include "hulls/hull_weapon_machine.h"
+ #include "trigtable.h"
++#include <cstdlib>
+ 
+ // #define d_circle_move (2.9*8)
+ 
+Index: rafkill-1.2.2/src/guns/gun_saber.cpp
+===================================================================
+--- rafkill-1.2.2.orig/src/guns/gun_saber.cpp	2006-05-02 02:52:23.000000000 +0100
++++ rafkill-1.2.2/src/guns/gun_saber.cpp	2008-04-09 22:54:54.000000000 +0100
+@@ -5,6 +5,7 @@
+ #include "weapons/weapon_beam.h"
+ #include "spaceobj.h"
+ #include "ebox.h"
++#include <cstdlib>
+ #include <vector>
+ 
+ using namespace std;
+Index: rafkill-1.2.2/src/menu.cpp
+===================================================================
+--- rafkill-1.2.2.orig/src/menu.cpp	2008-04-09 22:53:35.000000000 +0100
++++ rafkill-1.2.2/src/menu.cpp	2008-04-09 22:54:54.000000000 +0100
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <cstdlib>
+ #include "defs.h"
+ #include "menu.h"
+ #include "loadsave.h"
+Index: rafkill-1.2.2/src/weapons/weapon_follow.cpp
+===================================================================
+--- rafkill-1.2.2.orig/src/weapons/weapon_follow.cpp	2006-03-25 23:29:05.000000000 +0000
++++ rafkill-1.2.2/src/weapons/weapon_follow.cpp	2008-04-09 22:54:54.000000000 +0100
+@@ -3,6 +3,7 @@
+ #include "weapon_follow.h"
+ #include "hulls/hull_weapon_follow.h"
+ #include "spaceobj.h"
++#include <cstdlib>
+ #include <vector>
+ 
+ using namespace std;
+Index: rafkill-1.2.2/src/hulls/hull_weapon_beam.cpp
+===================================================================
+--- rafkill-1.2.2.orig/src/hulls/hull_weapon_beam.cpp	2006-05-02 03:12:50.000000000 +0100
++++ rafkill-1.2.2/src/hulls/hull_weapon_beam.cpp	2008-04-09 22:54:54.000000000 +0100
+@@ -4,6 +4,7 @@
+ #include "hull_weapon_beam.h"
+ #include "trigtable.h"
+ #include "ebox.h"
++#include <cstdlib>
+ 
+ #ifndef debug
+ #include <iostream>
+Index: rafkill-1.2.2/src/drawer.cpp
+===================================================================
+--- rafkill-1.2.2.orig/src/drawer.cpp	2008-04-09 22:55:06.000000000 +0100
++++ rafkill-1.2.2/src/drawer.cpp	2008-04-09 22:55:55.000000000 +0100
+@@ -11,6 +11,7 @@
+ #include "trigtable.h"
+ #include "pck.h"
+ #include <iostream>
++#include <cstring>
+ 
+ /* TODO:
+  * Add weapon icons to HUD
+Index: rafkill-1.2.2/src/loadsave.cpp
+===================================================================
+--- rafkill-1.2.2.orig/src/loadsave.cpp	2008-04-09 22:55:19.000000000 +0100
++++ rafkill-1.2.2/src/loadsave.cpp	2008-04-09 22:55:55.000000000 +0100
+@@ -7,6 +7,7 @@
+ #include "spaceobj.h"
+ #include "strings.h"
+ #include <string>
++#include <cstring>
+ #include <vector>
+ #include "gunobj.h"
+ #include "hull.h"
+Index: rafkill-1.2.2/src/system.cpp
+===================================================================
+--- rafkill-1.2.2.orig/src/system.cpp	2008-04-09 22:55:29.000000000 +0100
++++ rafkill-1.2.2/src/system.cpp	2008-04-09 22:55:55.000000000 +0100
+@@ -1,6 +1,7 @@
+ #include "system.h"
+ #include <strings.h>
+ #include <string>
++#include <cstring>
+ 
+ #ifdef WINDOWS
+ static const char * type(){
diff --git a/games-action/rafkill/files/rafkill-1.2.3-gcc47.patch b/games-action/rafkill/files/rafkill-1.2.3-gcc47.patch
new file mode 100644
index 000000000000..3c95e02869d1
--- /dev/null
+++ b/games-action/rafkill/files/rafkill-1.2.3-gcc47.patch
@@ -0,0 +1,11 @@
+--- a/src/system.cpp	2012-07-19 13:37:12.324303303 +0200
++++ b/src/system.cpp	2012-07-19 13:38:05.451584273 +0200
+@@ -2,6 +2,8 @@
+ #include <strings.h>
+ #include <string>
+ #include <cstring>
++#include <unistd.h>
++#include <sys/types.h>
+ 
+ #ifdef WINDOWS
+ static const char * type(){
diff --git a/games-action/rafkill/files/rafkill-1.2.3-ldflags.patch b/games-action/rafkill/files/rafkill-1.2.3-ldflags.patch
new file mode 100644
index 000000000000..4adf853e912a
--- /dev/null
+++ b/games-action/rafkill/files/rafkill-1.2.3-ldflags.patch
@@ -0,0 +1,17 @@
+--- a/SConstruct	2010-10-07 10:37:26.000000000 +0200
++++ b/SConstruct	2010-10-07 10:39:33.000000000 +0200
+@@ -1,5 +1,6 @@
+ import os
+ import sys
++import SCons.Util
+ 
+ env = Environment( ENV = os.environ );
+ config = env.Configure();
+@@ -36,6 +37,7 @@
+ 
+ env.BuildDir( 'build/', 'src/' )
+ env.Append( LIBS = [ 'aldmb', 'dumb' ] );
++env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
+ if sys.platform == 'win32':
+ 	env.Append( CCFLAGS = [ '-DWINDOWS' ] )
+ 	env.Append( LIBS = [ 'alleg', 'pthreadGC2' ] )
diff --git a/games-action/rafkill/metadata.xml b/games-action/rafkill/metadata.xml
new file mode 100644
index 000000000000..cf6a276e7664
--- /dev/null
+++ b/games-action/rafkill/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">raptorv2</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/rafkill/rafkill-1.2.3-r1.ebuild b/games-action/rafkill/rafkill-1.2.3-r1.ebuild
new file mode 100644
index 000000000000..7a28f29f9448
--- /dev/null
+++ b/games-action/rafkill/rafkill-1.2.3-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils scons-utils toolchain-funcs
+
+DESCRIPTION="Space shoot-em-up game"
+HOMEPAGE="http://raptorv2.sourceforge.net/"
+SRC_URI="mirror://sourceforge/raptorv2/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="<media-libs/allegro-5
+	media-libs/aldumb"
+RDEPEND=${DEPEND}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-gcc47.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+)
+
+src_prepare() {
+	default
+
+	rm -f {data,music}/.sconsign || die
+
+	sed -i \
+		-e "/^#define INSTALL_DIR/s:\.:/usr/share:" \
+		src/defs.cpp || die
+}
+
+src_compile() {
+	tc-export CXX
+	escons
+}
+
+src_install() {
+	dobin ${PN}
+	insinto /usr/share/${PN}
+	doins -r data music
+	dodoc README
+}
diff --git a/games-action/rrootage-0.23a-r1 b/games-action/rrootage-0.23a-r1
deleted file mode 100644
index d94cbc676d02..000000000000
--- a/games-action/rrootage-0.23a-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=>=dev-libs/libbulletml-0.0.3 media-libs/libsdl[video] media-libs/sdl-mixer[vorbis] virtual/glu virtual/opengl
-DESCRIPTION=Abstract shooter - defeat auto-created huge battleships
-EAPI=6
-HOMEPAGE=http://www.asahi-net.or.jp/~cs8k-cyu/windows/rr_e.html http://rrootage.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/libbulletml-0.0.3 media-libs/libsdl[video] media-libs/sdl-mixer[vorbis] virtual/glu virtual/opengl
-SLOT=0
-SRC_URI=mirror://sourceforge/rrootage/rRootage-0.23a.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_=47e4f970e3db634b1c953550ae1af4c6
diff --git a/games-action/rrootage/Manifest b/games-action/rrootage/Manifest
new file mode 100644
index 000000000000..4df38bd56370
--- /dev/null
+++ b/games-action/rrootage/Manifest
@@ -0,0 +1,4 @@
+AUX rrootage-0.23a-gcc41.patch 959 BLAKE2B 121e1a5b9a39306badb614c9fdb0da6c6c55f6a26f43d095a38404f54a5958875735d35a543c4518d8bc5250ee17dcc21355aad3d96e3370fd7f9e51199fb660 SHA512 9eb927ad7389cc77823903b641608248330046034010551badd06be7dc0def5a04d2e1f78ef2e4631c97279d0eacae10006b1564c4ad21dae306a427a95972fc
+DIST rRootage-0.23a.tar.gz 3910941 BLAKE2B ac5e2e3f0966e3d99cee5e7b90fcfe088a11453e71a120db66ddabf5092a4c6b128b98ce73dce7b9f599c3627f065c3b205bc7599161671d6a4647fcdb161e4f SHA512 29af79ef7bae46a103abf31696209b1ff5915caeb614d474b6a83f7e9657c19dea586e64a99437bba3e1121bfacc92c8d8b3c8a6831214d0d7da89927ca64f66
+EBUILD rrootage-0.23a-r1.ebuild 1589 BLAKE2B cef955c65bce4de4ff696c083707ffddfe13f30650f63cd63cc54aa092ea225b217e77378e608993e7c1a62eb4cd26e0d0f80586cf76ce60a76af4ad724e3813 SHA512 ec1980bab563671d7380e418d3a6842dbe8a6682d800b8b814780fea028a3fe9675fe2b85c6d4322f8309a88e6ed8f6bb1dd17f6cb4d8aac1b90c5acca218a94
+MISC metadata.xml 331 BLAKE2B 6235455dffd3d6687832c55e58c0151c35f9f44dd006a83fb57b81f27ecbdd7832bad0b207acf9214061259543668d57ec231bfb58da1f543e23178e25a9d854 SHA512 28663cb0e771cf17a0face9241359ca7eab7360b0dbcec162a3238c9fd89a81ea858cb3c66948b18ecca17cd26b6d855be24d955588aa4f38af54eaa6775278b
diff --git a/games-action/rrootage/files/rrootage-0.23a-gcc41.patch b/games-action/rrootage/files/rrootage-0.23a-gcc41.patch
new file mode 100644
index 000000000000..1e6e50e683fd
--- /dev/null
+++ b/games-action/rrootage/files/rrootage-0.23a-gcc41.patch
@@ -0,0 +1,28 @@
+--- src/foecommand.h.old	2006-04-21 23:26:03.000000000 +0200
++++ src/foecommand.h	2006-04-21 23:26:26.000000000 +0200
+@@ -39,10 +39,10 @@
+   
+   virtual void doChangeDirection(double d);
+   virtual void doChangeSpeed(double s);
+-  virtual void FoeCommand::doAccelX(double ax);
+-  virtual void FoeCommand::doAccelY(double ay);
+-  virtual double FoeCommand::getBulletSpeedX();
+-  virtual double FoeCommand::getBulletSpeedY();
++  virtual void doAccelX(double ax);
++  virtual void doAccelY(double ay);
++  virtual double getBulletSpeedX();
++  virtual double getBulletSpeedY();
+   
+  private:
+   struct foe *foe;
+--- src/screen.c.old	2006-04-21 23:50:01.000000000 +0200
++++ src/screen.c	2006-04-21 23:50:30.000000000 +0200
+@@ -73,7 +73,7 @@
+ void loadGLTexture(char *fileName, GLuint *texture) {
+   SDL_Surface *surface;
+ 
+-  char name[32];
++  char name[128];
+   strcpy(name, SHARE_LOC);
+   strcat(name, "images/");
+   strcat(name, fileName);
diff --git a/games-action/rrootage/metadata.xml b/games-action/rrootage/metadata.xml
new file mode 100644
index 000000000000..dbea52d36fff
--- /dev/null
+++ b/games-action/rrootage/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">rrootage</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/rrootage/rrootage-0.23a-r1.ebuild b/games-action/rrootage/rrootage-0.23a-r1.ebuild
new file mode 100644
index 000000000000..a36a0047c48b
--- /dev/null
+++ b/games-action/rrootage/rrootage-0.23a-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+MY_PN="rRootage"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Abstract shooter - defeat auto-created huge battleships"
+HOMEPAGE="http://www.asahi-net.or.jp/~cs8k-cyu/windows/rr_e.html
+	http://rrootage.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-libs/libbulletml-0.0.3
+	media-libs/libsdl[video]
+	media-libs/sdl-mixer[vorbis]
+	virtual/glu
+	virtual/opengl"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${MY_PN}/src
+
+PATCHES=(
+	"${FILESDIR}/${P}"-gcc41.patch
+)
+
+src_prepare() {
+	default
+
+	sed \
+		-e "s/-lglut/-lGL -lGLU -lm/" \
+		-e "/^CC/d" \
+		-e "/^CXX/d" \
+		-e "/^LDFLAGS/s/=/+=/" \
+		-e "/^CPPFLAGS/s/MORE_CFLAGS/MORE_CXXFLAGS/" \
+		-e "/^CPPFLAGS/s/MORE_CFLAGS/MORE_CXXFLAGS/" \
+		-e "s/ -mwindows//" \
+		-e "s:-I./bulletml/:-I/usr/include/bulletml:" \
+		makefile.lin > Makefile || die
+
+	sed -i \
+		-e "s:/usr/share/games:/usr/share:" \
+		barragemanager.cc screen.c soundmanager.c || die
+}
+
+src_compile() {
+	emake \
+		MORE_CFLAGS="-DLINUX ${CFLAGS}" \
+		MORE_CXXFLAGS="-DLINUX ${CXXFLAGS}"
+}
+
+src_install() {
+	newbin rr ${PN}
+	dodir "/usr/share/${MY_PN}"
+	cp -r ../rr_share/* "${D}/usr/share/${MY_PN}" || die
+	dodoc ../readme*
+}
+
+pkg_postinst() {
+	if ! has_version "media-libs/sdl-mixer[vorbis]" ; then
+		elog "${PN} will not have sound since sdl-mixer"
+		elog "is built with USE=-vorbis"
+		elog "Please emerge sdl-mixer with USE=vorbis"
+		elog "if you want sound support"
+	fi
+}
diff --git a/games-action/rune-1.07-r3 b/games-action/rune-1.07-r3
deleted file mode 100644
index 4e27a9dd348e..000000000000
--- a/games-action/rune-1.07-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Viking hack and slay game
-EAPI=6
-HOMEPAGE=http://www.runegame.com
-KEYWORDS=~amd64 ~x86
-LICENSE=LOKI-EULA
-PROPERTIES=interactive
-RDEPEND=dev-util/xdelta:0 >=media-libs/libsdl-1.2.9-r1[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)]
-RESTRICT=strip
-SLOT=0
-SRC_URI=mirror://gentoo/rune-all-0.2.tar.bz2
-_eclasses_=cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=33dba71bfd8b48a00b92a1d8681d03bd
diff --git a/games-action/rune/Manifest b/games-action/rune/Manifest
new file mode 100644
index 000000000000..874c47c9d3dd
--- /dev/null
+++ b/games-action/rune/Manifest
@@ -0,0 +1,3 @@
+DIST rune-all-0.2.tar.bz2 6507237 BLAKE2B 98afc23e076801bdf8de2fd80e5d95dfbdc74399cad91dbe2a19c3d41b1107b8b07aee5b480e212c7483e4215d9cd3c9101f8d189191aa779ed9f22f73ef9af4 SHA512 5c86306c84a6b606e13c3b1eebf676479cfe8d1112a2c5b31d6332fc7305fea74485d9a4b89286db38b968f473a40d7b5e500c17aaa8b2010edb17cc95b1695b
+EBUILD rune-1.07-r3.ebuild 3287 BLAKE2B d84df4e0e016ddb27d13e656e5a4722c15b886ae47f572819a2bc54fd83280118a20c6ae6ceb060ed5f97da047f9015794e3f557b7d3d1822953404d156c6825 SHA512 b911960b002dbe6c5052054c8a83ab6a3049f06ef72b671a7a3992d6b09342fa78f4b76ef20da53b1f63a536cc7a870af71847ff93b584873cf0cefb8f49b4a3
+MISC metadata.xml 2118 BLAKE2B 2c390a7a3fdfe18a338dacd5d568a2912aaeacba4e75d260474a2a9c7474a9d30b0072d34b364f83ea25ae188df0a26f9f5550b25a94581a0dea1b64bd4ee055 SHA512 64d64e07f93b267b5e8682f716f2fc6cfeef77732a5c2a583d3c00bf20f5be1c257f8259c52a5c0962d5ce96bfc892b2bf1185c9219016808876164700f2ebdc
diff --git a/games-action/rune/metadata.xml b/games-action/rune/metadata.xml
new file mode 100644
index 000000000000..51b5f12f9019
--- /dev/null
+++ b/games-action/rune/metadata.xml
@@ -0,0 +1,40 @@
+<?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>
+Loki, god of deception and mischief was the bane of the gods, a black sheep who
+tormented all the heavens with his persistent schemes for personal power.
+Asgard, the high heaven where the gods dwelt while determining the fates of man
+and beast was often filled with the howls of pain and anguish as god after god
+fell victim to one of Loki's plots. Having one day taken these malicious schemes
+against his Asgardian brethren too far for a final time, Loki, lord of lies, was
+imprisoned by Odin the All Father and his, Thor, the god of thunder:
+
+Loki was chained to a bleak promontory hundreds of miles below the surface of
+the earth. A venomous snake of immense proportions was wound around the
+stalactites above him. From the mouth of this fearsome reptile dripped a steady
+supply of acidic venom. The torment was horrific. The steady drops would eat
+away the exiled god's midriff right down to the backbone. In turn, his immortal
+powers of healing would slowly re-issue the flesh, only to have it burned away
+again. The snake was unfailing, as were Loki's immortal healing powers.
+
+And the excruciating agony for Loki was unending.
+
+As Thor chained him to the rock, Odin All Father proclaimed that Loki would
+remain under the constant drip of the venom until the day of Ragnarok; when
+gods, men and giants would enter into a final battle and all reality as it
+existed would perish. Then, and only then, would Loki be freed from his torment.
+
+In that distant climactic battle between the gods of heaven and the monsters who
+dwelt deep in the earth, it was assumed that Loki would fulfill his fate and
+take up sides against the Asgardians. Of course, Loki was the bane of fate, and
+he had other plans.
+
+Rune was ported to Linux by Loki Entertainment Software and is a commercial
+game, requiring the original media for installation.
+</longdescription>
+</pkgmetadata>
diff --git a/games-action/rune/rune-1.07-r3.ebuild b/games-action/rune/rune-1.07-r3.ebuild
new file mode 100644
index 000000000000..2f649202e4e4
--- /dev/null
+++ b/games-action/rune/rune-1.07-r3.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils cdrom
+
+DESCRIPTION="Viking hack and slay game"
+HOMEPAGE="http://www.runegame.com"
+SRC_URI="mirror://gentoo/rune-all-0.2.tar.bz2"
+
+LICENSE="LOKI-EULA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="strip"
+
+RDEPEND="dev-util/xdelta:0
+	>=media-libs/libsdl-1.2.9-r1[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]"
+
+S=${WORKDIR}
+
+dir=/opt/${PN}
+Ddir=${D}/${dir}
+
+src_unpack() {
+	export CDROM_SET_NAMES=("Linux Rune CD" "Windows Rune CD")
+	cdrom_get_cds System/rune-bin:System/Rune.exe
+	dodir "${dir}"
+	if [[ ${CDROM_SET} -eq 0 ]]
+	then
+		# unpack the data files
+		tar xzf "${CDROM_ROOT}"/data.tar.gz || die
+	elif [[ ${CDROM_SET} -eq 1 ]]
+	then
+		# unpack the runelinuxfiles.tar.gz
+		unpack ${A}
+	fi
+}
+
+src_install() {
+	insinto "${dir}"
+	exeinto "${dir}"
+	einfo "Copying files... this may take a while..."
+
+	case ${CDROM_SET} in
+	0)
+		for x in Help Maps Meshes Sounds System Textures Web
+		do
+			doins -r $x
+		done
+
+		# copy linux specific files
+		doins -r "${CDROM_ROOT}"/System
+
+		# the most important things: rune and ucc :)
+		doexe "${CDROM_ROOT}"/bin/x86/rune
+		fperms 750 "${dir}"/System/{ucc{,-bin},rune-bin}
+
+		# installing documentation/icon
+		dodoc "${CDROM_ROOT}"/{README,CREDITS}
+		newicon "${CDROM_ROOT}"/icon.xpm rune.xpm
+	;;
+	1)
+		# copying Maps Sounds and Web
+		for x in Maps Sounds Web
+		do
+			doins -r "${CDROM_ROOT}"/$x
+		done
+
+		# copying the texture files
+		dodir "${dir}"/Textures
+		for x in $(find "${CDROM_ROOT}"/Textures/ -type f -printf '%f ')
+		do
+			echo -ne '\271\325\036\214' | cat - "${CDROM_ROOT}"/Textures/$x \
+				| sed -e '1 s/\(....\)..../\1/' > "${Ddir}"/Textures/$x \
+				|| die
+		done
+
+		doins -r "${S}"/System
+		doins -r "${S}"/Help
+		sed -e "s:.*\(\w+/\w+\)\w:\1:"
+		for x in $(ls "${S}"/patch/{System,Maps,Meshes} | sed -e \
+			"s:.*/\([^/]\+/[^/]\+\).patch$:\1:")
+		do
+			xdelta patch "${S}"/patch/${x}.patch "${CDROM_ROOT}"/${x} "${S}"/patch/${x}
+			doins "${S}"/patch/${x}
+		done
+
+		insinto "${dir}"/System
+
+		# copying system files from the Windows CD
+		for x in "${CDROM_ROOT}"/System/*.{int,u,url}; do
+			doins $x
+		done
+
+		# modify the files
+		mv "${Ddir}"/System/OpenGlDrv.int "${Ddir}"/System/OpenGLDrv.int \
+			|| die
+		mv "${Ddir}"/Textures/bloodFX.utx "${Ddir}"/Textures/BloodFX.utx \
+			|| die
+		mv "${Ddir}"/Textures/RUNESTONES.UTX "${Ddir}"/Textures/RUNESTONES.utx \
+			|| die
+		mv "${Ddir}"/Textures/tedd.utx "${Ddir}"/Textures/Tedd.utx \
+			|| die
+		mv "${Ddir}"/Textures/UNDERANCIENT.utx "${Ddir}"/Textures/UnderAncient.utx \
+			|| die
+		rm "${Ddir}"/System/{Setup.int,SGLDrv.int,MeTaLDrv.int,Manifest.int,D3DDrv.int,Galaxy.int,SoftDrv.int,WinDrv.int,Window.int} \
+			|| die
+
+		# the most important things: rune and ucc :)
+		doexe "${S}"/bin/x86/rune
+		fperms 750 "${dir}"/System/{ucc,ucc-bin,rune-bin}
+
+		# installing documentation/icon
+		dodoc "${S}"/{README,CREDITS}
+		doicon "${S}"/rune.xpm rune.xpm
+	;;
+	esac
+
+	use amd64 && mv "${Ddir}"/System/libSDL-1.2.so.0 \
+		"${Ddir}"/System/libSDL-1.2.so.0.backup
+
+	make_wrapper rune ./rune "${dir}" "${dir}"
+	make_desktop_entry rune "Rune" rune
+	find "${Ddir}" -exec touch '{}' \; || die
+}
diff --git a/games-action/shadowgrounds-bin-0_p1 b/games-action/shadowgrounds-bin-0_p1
deleted file mode 100644
index 17b81e95fbf7..000000000000
--- a/games-action/shadowgrounds-bin-0_p1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=an epic action experience combining modern technology with addictive playability
-EAPI=5
-HOMEPAGE=http://shadowgroundsgame.com/
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=frozenbyte-eula
-RDEPEND=>=sys-libs/glibc-2.4 >=sys-devel/gcc-4.3.0 !amd64? ( gnome-base/libglade sys-libs/zlib ) amd64? ( >=gnome-base/libglade-2.6.4-r1[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] ) games-misc/games-envd
-RESTRICT=fetch strip
-SLOT=0
-SRC_URI=shadowgroundsUpdate1.run
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=ed70f8ac2383ded40cb0ec92dfb9b5e9
diff --git a/games-action/shadowgrounds-bin/Manifest b/games-action/shadowgrounds-bin/Manifest
new file mode 100644
index 000000000000..f1f0932b39b2
--- /dev/null
+++ b/games-action/shadowgrounds-bin/Manifest
@@ -0,0 +1,3 @@
+DIST shadowgroundsUpdate1.run 817462983 BLAKE2B 52f49f9777fc909cd4aba0b77513726db5257e97e6f667710e728fd012522810c1caad2130cfeb6bc09ffc0056e2aa5024fcb330789320c4b1242584f67697cd SHA512 8e2cc340d4917e7e0ac6b0a6f3d36aeadc0217c437da8ed5641c82b7da7632f8e0c4f59d21088dcc922cc3f740a5eadb27143bd73ba774c258ff9b668a7b3da6
+EBUILD shadowgrounds-bin-0_p1.ebuild 1604 BLAKE2B 48071fac42ca8595bfb077cd0afcb0efae10b71dc89ba8afa8aa937c72af167a904478c9d0ebdcc8e6bdcf7cd563730e4670af63481ee0639dca0a2463513ec6 SHA512 c95f8e79bd70eb4ac4faf4c8028f42181b26c582ebc006be599169a6025bdc7ca97da206eeea919cdc5bce92b9179848b7498b906800495d8a59e9a7f8ea94d0
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/shadowgrounds-bin/metadata.xml b/games-action/shadowgrounds-bin/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-action/shadowgrounds-bin/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-action/shadowgrounds-bin/shadowgrounds-bin-0_p1.ebuild b/games-action/shadowgrounds-bin/shadowgrounds-bin-0_p1.ebuild
new file mode 100644
index 000000000000..3a8863f6bb90
--- /dev/null
+++ b/games-action/shadowgrounds-bin/shadowgrounds-bin-0_p1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit unpacker games eutils versionator
+
+DIST_PV=$(get_version_component_range 2)
+
+DESCRIPTION="an epic action experience combining modern technology with addictive playability"
+HOMEPAGE="http://shadowgroundsgame.com/"
+# FIXME: PV should perhaps be 0_p1, in which case a filter is in order
+SRC_URI="shadowgroundsUpdate${DIST_PV/p/}.run"
+
+LICENSE="frozenbyte-eula"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+RESTRICT="fetch strip"
+
+DEPEND="app-arch/unzip"
+RDEPEND=">=sys-libs/glibc-2.4
+	>=sys-devel/gcc-4.3.0
+	!amd64? (
+		gnome-base/libglade
+		sys-libs/zlib
+	)
+	amd64? (
+		>=gnome-base/libglade-2.6.4-r1[abi_x86_32(-)]
+		sys-libs/zlib[abi_x86_32(-)]
+	)"
+
+S=${WORKDIR}
+
+d="${GAMES_PREFIX_OPT}/${PN}"
+QA_TEXTRELS_x86="`echo ${d#/}/lib32/lib{avcodec.so.51,avformat.so.52,avutil.so.49,FLAC.so.8}`"
+QA_TEXTRELS_amd64=${QA_TEXTRELS_x86}
+
+pkg_nofetch() {
+	einfo "Fetch ${SRC_URI} and put it into ${DISTDIR}"
+	einfo "See http://www.humblebundle.com/ for more info."
+}
+
+src_unpack() {
+	# manually run unzip as the initial seek causes it to exit(1)
+	unpack_zip ${A}
+	rm lib*/lib{gcc_s,m,rt,selinux,z}.so.?
+}
+
+src_install() {
+	local b bb
+
+	doicon Shadowgrounds.xpm
+	for b in bin launcher ; do
+		bb="shadowgrounds-${b}"
+		exeinto ${d}
+		newexe ${bb} ${bb} || die
+		games_make_wrapper ${bb} "./${bb}" "${d}"
+		make_desktop_entry ${bb} "Shadowgrounds ${b}" Shadowgrounds
+	done
+
+	exeinto ${d}/lib32
+	doexe lib32/*
+
+	insinto ${d}
+	doins -r Config data Profiles *.fbz *.glade *-logo.png
+
+	prepgamesdirs
+}
diff --git a/games-action/shadowgrounds-survivor-bin-0_p1 b/games-action/shadowgrounds-survivor-bin-0_p1
deleted file mode 100644
index b458525acb87..000000000000
--- a/games-action/shadowgrounds-survivor-bin-0_p1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=human survivors who battle against the ongoing alien onslaught
-EAPI=5
-HOMEPAGE=http://shadowgroundsgame.com/survivor/
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=frozenbyte-eula
-RDEPEND=>=sys-libs/glibc-2.4 >=sys-devel/gcc-4.3.0 !amd64? ( gnome-base/libglade ) amd64? ( >=gnome-base/libglade-2.6.4-r1[abi_x86_32(-)] ) games-misc/games-envd
-RESTRICT=fetch strip
-SLOT=0
-SRC_URI=survivorUpdate1.run
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5cd156d3f89cf408cd54f64d00aef9d3
diff --git a/games-action/shadowgrounds-survivor-bin/Manifest b/games-action/shadowgrounds-survivor-bin/Manifest
new file mode 100644
index 000000000000..9a351f47acb0
--- /dev/null
+++ b/games-action/shadowgrounds-survivor-bin/Manifest
@@ -0,0 +1,3 @@
+DIST survivorUpdate1.run 1157907155 BLAKE2B a3c4b8ffc6ae6fd1c0537feea635326736b3316db6ee9daf2ef0f8883410cf80580dc0326455b36d0dfabb79792cce793f5ac0dd93645333285af9c0307cdfd1 SHA512 59c911382d120b0b45dd8dc21f5fdeb78b59155514a422c587fba9970a73b46238b170e3e80810e0fc5a6b5dedbb069ec3d2e2a552657eb5bfc101736a0afc36
+EBUILD shadowgrounds-survivor-bin-0_p1.ebuild 1480 BLAKE2B 41b67ca2bb3d0d7b99d959a3140cc49cccf5d9fec8e6d009c6558335dd42aed14c8a2709f50ec166c72fbe47108f84a78fddefc37ff7fe46fc92586eef53e54a SHA512 1c67839bcd528cb5ef80d589ac18b0db7f5fc520e174598b2c0dba51d447b2f9e66f6dd0f62159efbe69d9742ba48c31aca901fcd3d5f9003f1d98d469080d30
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/shadowgrounds-survivor-bin/metadata.xml b/games-action/shadowgrounds-survivor-bin/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-action/shadowgrounds-survivor-bin/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-action/shadowgrounds-survivor-bin/shadowgrounds-survivor-bin-0_p1.ebuild b/games-action/shadowgrounds-survivor-bin/shadowgrounds-survivor-bin-0_p1.ebuild
new file mode 100644
index 000000000000..336d592a3471
--- /dev/null
+++ b/games-action/shadowgrounds-survivor-bin/shadowgrounds-survivor-bin-0_p1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit unpacker eutils games versionator
+
+DIST_PV=$(get_version_component_range 2)
+
+DESCRIPTION="human survivors who battle against the ongoing alien onslaught"
+HOMEPAGE="http://shadowgroundsgame.com/survivor/"
+SRC_URI="survivorUpdate${DIST_PV/p/}.run"
+
+LICENSE="frozenbyte-eula"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+RESTRICT="fetch strip"
+
+DEPEND="app-arch/unzip"
+RDEPEND=">=sys-libs/glibc-2.4
+	>=sys-devel/gcc-4.3.0
+	!amd64? (
+		gnome-base/libglade
+	)
+	amd64? (
+		>=gnome-base/libglade-2.6.4-r1[abi_x86_32(-)]
+	)"
+
+S=${WORKDIR}
+
+d="${GAMES_PREFIX_OPT}/${PN}"
+QA_TEXTRELS_x86="`echo ${d#/}/lib32/lib{avcodec.so.51,avformat.so.52,avutil.so.49,FLAC.so.8}`"
+QA_TEXTRELS_amd64=${QA_TEXTRELS_x86}
+
+pkg_nofetch() {
+	einfo "Fetch ${SRC_URI} and put it into ${DISTDIR}"
+	einfo "See http://www.humblebundle.com/ for more info."
+}
+
+src_unpack() {
+	# manually run unzip as the initial seek causes it to exit(1)
+	unpack_zip ${A}
+	rm lib*/lib{gcc_s,m,rt,selinux}.so.?
+}
+
+src_install() {
+	local b bb
+
+	doicon Survivor.xpm || die
+	for b in bin launcher ; do
+		bb="survivor-${b}"
+		exeinto ${d}
+		newexe ${bb} ${bb}
+		games_make_wrapper ${bb} "./${bb}" "${d}"
+		make_desktop_entry ${bb} "Shadowgrounds Survivor ${b}" "Shadowgrounds Survivor"
+	done
+
+	exeinto ${d}/lib32
+	doexe lib32/*
+
+	insinto ${d}
+	doins -r Config data Profiles *.fbz *.glade *-logo.png
+
+	prepgamesdirs
+}
diff --git a/games-action/shootingstar-1.2.0-r1 b/games-action/shootingstar-1.2.0-r1
deleted file mode 100644
index 16fc4c847b24..000000000000
--- a/games-action/shootingstar-1.2.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare
-DEPEND=media-libs/libsdl[video] media-libs/sdl-image media-libs/sdl-mixer virtual/glu virtual/opengl >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=A topdown shooter
-EAPI=6
-HOMEPAGE=http://linux.softpedia.com/get/GAMES-ENTERTAINMENT/Arcade/Shooting-Star-19754.shtml
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[video] media-libs/sdl-image media-libs/sdl-mixer virtual/glu virtual/opengl
-SLOT=0
-SRC_URI=mirror://gentoo/shootingstar-1.2.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=214a1c278e454a7e4dbad5f0e1fd68ab
diff --git a/games-action/shootingstar/Manifest b/games-action/shootingstar/Manifest
new file mode 100644
index 000000000000..8cbb6a1b100b
--- /dev/null
+++ b/games-action/shootingstar/Manifest
@@ -0,0 +1,5 @@
+AUX 1.2.0-gcc34.patch 1053 BLAKE2B 7e10e3fa04dcc4431c7991755ede638a59906c2c545d72bff6156825662fc9246e00a4f5dd84e36a6eb8b88c10685ea59938b2aff91bcc20e4f2c341efe46260 SHA512 0941733f645f1fa97dfc860d2f9d33bf6e96a75ada97fd477d60d9aa21a693a067731834df3c31fd2abfde3e7d2a4fe429b8aeeb154100cd730c0713a70cd247
+AUX shootingstar-1.2.0-gcc44.patch 324 BLAKE2B 392579c1792b3863134047f64b0df1d2dfe44ee11eeb640d6b738565ad349cf1df211679121f8e0b0c1ea559fcf0e25a843d4d3dbb675bc5849d2396ea94d893 SHA512 3bda8a966ed6d6536390b228606bc65b4789d8c2adde8e993089b8e63a62bbdceae4d0ec97c3c7f5d87b5b9c3149eb85d4eee64db295b5aa8c67f2f5349b21f1
+DIST shootingstar-1.2.0.tar.gz 7755911 BLAKE2B 22e48044a4a17d7282abd408a6ccc727d60c56da16d170230b287927adb95729a0c6da0b0a9f70ad7d39e647be16dff96cf55aef9e3efbf3396402b4a684527a SHA512 5bc13a444c925ab834482fad7f055ea02eac471f454a3f0ed80e50c3b0956586b7bfa68db82e3034696fa2e8ce5beaf10fc8b8583508e1c29c276469ef7b2b74
+EBUILD shootingstar-1.2.0-r1.ebuild 992 BLAKE2B 366b5cdba862ab7eea6f4bea8e384ac05434c7a1c543f9772e87551655a9751cedceb7e60b229cca2ca61f4a8d4bac23d6dcb99b2db6443f3e6505922d0a4bcc SHA512 cc9efb4a567400d14b86a62081e94f66306322d110c07c3868efdde08b74b8e57101426cdbbe27fcfb05da768e61065529cb4e88e55b40fd4c7a6b57c17041fb
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/shootingstar/files/1.2.0-gcc34.patch b/games-action/shootingstar/files/1.2.0-gcc34.patch
new file mode 100644
index 000000000000..b55997552fc8
--- /dev/null
+++ b/games-action/shootingstar/files/1.2.0-gcc34.patch
@@ -0,0 +1,23 @@
+diff -ur shootingstar-1.2.0/src/engine/cTextureFont.cpp shootingstar-1.2.0.loz/src/engine/cTextureFont.cpp
+--- shootingstar-1.2.0/src/engine/cTextureFont.cpp	2003-07-06 19:31:10.000000000 +0100
++++ shootingstar-1.2.0.loz/src/engine/cTextureFont.cpp	2004-07-26 20:51:16.992768063 +0100
+@@ -31,6 +31,7 @@
+ #include <stdio.h>
+ #include <GL/gl.h>
+ #include <GL/glu.h>
++#include <math.h>
+ #include "cTextureManager.hpp"
+ #include "Debug.hpp"
+ //------------------------------------------------------------------------------
+diff -ur shootingstar-1.2.0/src/game/cOptions.cpp shootingstar-1.2.0.loz/src/game/cOptions.cpp
+--- shootingstar-1.2.0/src/game/cOptions.cpp	2003-12-22 05:09:06.000000000 +0000
++++ shootingstar-1.2.0.loz/src/game/cOptions.cpp	2004-07-26 21:00:25.265284270 +0100
+@@ -201,7 +201,7 @@
+ 			dbgError () << "Unable to read from options file\n";
+ 			throw runtime_error ("Unable to load options");
+ 		}
+-		int (keys.keys[i]) = key;	// IS THIS SAFE?
++		keys.keys[i] = (SDLKey)key;	// IS THIS SAFE?
+ 		
+ 		fin >> key;
+ 		keys.buttons[i] = key;
diff --git a/games-action/shootingstar/files/shootingstar-1.2.0-gcc44.patch b/games-action/shootingstar/files/shootingstar-1.2.0-gcc44.patch
new file mode 100644
index 000000000000..dfc1a8d8e77e
--- /dev/null
+++ b/games-action/shootingstar/files/shootingstar-1.2.0-gcc44.patch
@@ -0,0 +1,10 @@
+--- a/src/engine/dbg.cpp	2009-06-03 15:15:46.000000000 +0200
++++ b/src/engine/dbg.cpp	2009-06-03 16:09:19.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include <vector>
+ #include <map>
+ #include <algorithm>
++#include <cstdio>
+ 
+     /**********************************************************************
+      * Implementation notes
diff --git a/games-action/shootingstar/metadata.xml b/games-action/shootingstar/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-action/shootingstar/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-action/shootingstar/shootingstar-1.2.0-r1.ebuild b/games-action/shootingstar/shootingstar-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..11411f402d59
--- /dev/null
+++ b/games-action/shootingstar/shootingstar-1.2.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils gnome2-utils
+
+# Note: currently segfaults on startup, but that's also in the previous ebuild
+# See https://bugs.gentoo.org/607428
+
+DESCRIPTION="A topdown shooter"
+HOMEPAGE="http://linux.softpedia.com/get/GAMES-ENTERTAINMENT/Arcade/Shooting-Star-19754.shtml"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	media-libs/libsdl[video]
+	media-libs/sdl-image
+	media-libs/sdl-mixer
+	virtual/glu
+	virtual/opengl"
+RDEPEND=${DEPEND}
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-gcc34.patch
+	"${FILESDIR}"/${P}-gcc44.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install () {
+	default
+	newicon -s 128 data/textures/body1.png ${PN}.png
+	make_desktop_entry ${PN} "Shooting Star"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-action/slune-1.0.15-r1 b/games-action/slune-1.0.15-r1
deleted file mode 100644
index 59f69989a7d0..000000000000
--- a/games-action/slune-1.0.15-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=virtual/opengl >=media-libs/libsdl-1.2.6 >=dev-python/soya-0.9 >=dev-python/py2play-0.1.9 >=dev-python/pyopenal-0.1.3 >=dev-python/pyogg-1.1 >=dev-python/pyvorbis-1.1 >=sys-apps/sed-4 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A 3D action game with multiplayer mode and amazing graphics
-EAPI=5
-HOMEPAGE=http://oomadness.tuxfamily.org/en/slune/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/opengl >=media-libs/libsdl-1.2.6 >=dev-python/soya-0.9 >=dev-python/py2play-0.1.9 >=dev-python/pyopenal-0.1.3 >=dev-python/pyogg-1.1 >=dev-python/pyvorbis-1.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] games-misc/games-envd
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://download.gna.org/slune/Slune-1.0.15.tar.bz2
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=038cce468ea051bf734db626ec015d00
diff --git a/games-action/slune/Manifest b/games-action/slune/Manifest
new file mode 100644
index 000000000000..8cfbf797dee7
--- /dev/null
+++ b/games-action/slune/Manifest
@@ -0,0 +1,3 @@
+DIST Slune-1.0.15.tar.bz2 9549694 BLAKE2B 2178f5bc5f111cc408a7e1391e87bca1a9bd934668c2519b604a9aecc889a560e9bd576e70d1738f51fb9afd9450f47e331c3c036258b6223ed059546d12ee31 SHA512 7f26f91a7db5ccfd2b7063592c53a0b5791f5db5dee582c0f2208af7615c3b7f0b1ed420ecef1f1396a6b1573cb99cc40e886bc47bc22d064bc3ad4814421920
+EBUILD slune-1.0.15-r1.ebuild 1533 BLAKE2B 86194282f7ab45cfc7ed86ca936284bfb267223d3deeefdab3e6730f1f9336680b9bd1a0891afe448c77151fb5dd8e5cdd3c66b7e44eba4596ef55a1923770b1 SHA512 2d37508d9f997c5eb281ebe0af3c80c34146360d91eefb9bc987c4a982e541c9a9802c97a1847bbcb9a2d6e4c9ec0647f452f9361947438da9964cc9987016f5
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/slune/metadata.xml b/games-action/slune/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-action/slune/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-action/slune/slune-1.0.15-r1.ebuild b/games-action/slune/slune-1.0.15-r1.ebuild
new file mode 100644
index 000000000000..a6e9ecaf1c09
--- /dev/null
+++ b/games-action/slune/slune-1.0.15-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2-utils python-utils-r1 distutils-r1 games
+
+DESCRIPTION="A 3D action game with multiplayer mode and amazing graphics"
+HOMEPAGE="http://oomadness.tuxfamily.org/en/slune/"
+SRC_URI="http://download.gna.org/slune/Slune-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="virtual/opengl
+	>=media-libs/libsdl-1.2.6
+	>=dev-python/soya-0.9
+	>=dev-python/py2play-0.1.9
+	>=dev-python/pyopenal-0.1.3
+	>=dev-python/pyogg-1.1
+	>=dev-python/pyvorbis-1.1"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/Slune-${PV}
+
+python_install() {
+	distutils-r1_python_install \
+		--install-scripts="${GAMES_BINDIR}" \
+		--install-data="${GAMES_DATADIR}" \
+		--install-lib="$(python_get_sitedir)"
+
+	# FHS broke the logic, fix it
+	local i
+	for i in $(ls -I locale "${ED}${GAMES_DATADIR}"/${PN}) ; do
+		dosym "${GAMES_DATADIR}/${PN}/${i}" "$(python_get_sitedir)/${PN}/${i}"
+	done
+}
+
+src_prepare() {
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	# fix install dest of locales
+	mv "${ED}${GAMES_DATADIR}"/${PN}/locale "${ED}"/usr/share/locale || die
+
+	newicon -s 48 images/${PN}.48.png ${PN}.png
+	make_desktop_entry ${PN} "Slune"
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-action/snipes-1.0.4-r1 b/games-action/snipes-1.0.4-r1
deleted file mode 100644
index dd1dd2ceb65c..000000000000
--- a/games-action/snipes-1.0.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=media-libs/libsdl[sound,video]
-DESCRIPTION=2D scrolling shooter, resembles the old DOS game of same name
-EAPI=6
-HOMEPAGE=https://cyp.github.com/snipes/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl[sound,video]
-SLOT=0
-SRC_URI=https://cyp.github.com/snipes/snipes-1.0.4.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_=a1677fc676ab02ce79b0f5668b59223e
diff --git a/games-action/snipes/Manifest b/games-action/snipes/Manifest
new file mode 100644
index 000000000000..c898af018215
--- /dev/null
+++ b/games-action/snipes/Manifest
@@ -0,0 +1,4 @@
+AUX snipes-1.0.4-nongnulinker.patch 711 BLAKE2B a4eca8ee51b349b652405b8d7b5565d2da7bfd88873088683f7252fd61640a372f228f41d39d782be23de5ab4dbe0fe2dece9fd8d5188a1822a24b78b117d721 SHA512 20ecb0e76e79b91fae7d9a8f3448cc88161ebbb8ee10e82c3f3eabf120c53c14392e0df4eb61530ae89f2ebbcf84db69affa9239e376c6a3d93b4f2f5dca1259
+DIST snipes-1.0.4.tar.gz 39150 BLAKE2B 00bf82f65720a86a7eb32ce50edd92db434dd8cbcfd76caad102bf5bd5087141f0b97d41260d7c0fc2709a7506470d53c08672c2b2c6733fcb3ee718b5875755 SHA512 de2cfdc3062055bfd04766f11894786af2ccd57ee1c8bcfe28d2d6894fe543830061ad7d16fa5e0363a25dcfd4a4c297ec0b81e449392a7b2b7d65da2e2a2f9b
+EBUILD snipes-1.0.4-r1.ebuild 643 BLAKE2B be79978b81f91f3756e53fcb0b12f7d0fd5a1652e5fd91a4c9d09fdc89cf00fb277a1f6307bfb0aca1b75098b1efbb4e8c0e67bab73ab56096e2877f71dd5c08 SHA512 dc9b4c48a03190d611ea15d32b2a4177748f522808c776c7211a1cf891a043588b9f1f16bd30b5a3af713a9f5e309f738e92a831de78274ed099164819fae7b3
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/snipes/files/snipes-1.0.4-nongnulinker.patch b/games-action/snipes/files/snipes-1.0.4-nongnulinker.patch
new file mode 100644
index 000000000000..8bdaeef3e356
--- /dev/null
+++ b/games-action/snipes/files/snipes-1.0.4-nongnulinker.patch
@@ -0,0 +1,20 @@
+--- a/Makefile	2011-12-18 17:24:28.795315064 +0100
++++ b/Makefile	2011-12-18 17:24:59.005311478 +0100
+@@ -33,7 +33,7 @@
+ IMGOBJ = $(OIMGS:%.pbm=$(INTERMEDIATE)/%.o)
+ 
+ CFLAGS += `sdl-config --cflags` -I$(INTERMEDIATE)
+-LDLIBS += `sdl-config --libs`
++LDLIBS += `sdl-config --libs` -lm
+ LDFLAGS += -Wl,-z,noexecstack
+ 
+ 
+@@ -52,7 +52,7 @@
+ 
+ # Why does this result in an executable stack? Can I run my bitmaps? Do bitmaps behave like Conway's game of life, when run?
+ $(INTERMEDIATE)/%.o: $(IMG)/%.pbm
+-	$(LD) -r -b binary -z noexecstack -z really_noexecstack -z pretty_please_noexecstack -o $@ $<
++	$(LD) -r -b binary -z noexecstack -o $@ $<
+ 
+ snipes.6: snipes.6.in
+ 	sed s/'`VERSION`'/`cat VERSION`/ < $< > $@
diff --git a/games-action/snipes/metadata.xml b/games-action/snipes/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-action/snipes/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-action/snipes/snipes-1.0.4-r1.ebuild b/games-action/snipes/snipes-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..9d8e9a36c48b
--- /dev/null
+++ b/games-action/snipes/snipes-1.0.4-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs eutils
+
+DESCRIPTION="2D scrolling shooter, resembles the old DOS game of same name"
+HOMEPAGE="https://cyp.github.com/snipes/"
+SRC_URI="https://cyp.github.com/snipes/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl[sound,video]"
+RDEPEND=${DEPEND}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-nongnulinker.patch
+)
+
+src_compile() {
+	tc-getLD
+	default
+}
+
+src_install() {
+	dobin snipes
+	doman snipes.6
+	dodoc ChangeLog
+	doicon ${PN}.png
+	make_desktop_entry snipes "Snipes"
+}
diff --git a/games-action/solar2-1.10 b/games-action/solar2-1.10
deleted file mode 100644
index 3ba66e8f44c6..000000000000
--- a/games-action/solar2-1.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=An open-world, sandbox game set in an infinite abstract universe
-EAPI=5
-HOMEPAGE=http://murudai.com/solar/
-IUSE=bundled-libs
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=virtual/opengl amd64? ( >=media-libs/flac-1.2.1-r5[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[X,sound,video,joystick,abi_x86_32(-)] >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] !bundled-libs? ( >=media-libs/libmad-0.15.1b-r8[abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] >=media-libs/sdl-mixer-1.2.12-r4[flac,mikmod,mad,mp3,vorbis,abi_x86_32(-)] >=media-libs/libmikmod-3.2.0[abi_x86_32(-)] ) ) x86? ( media-libs/flac media-libs/libsdl[X,sound,video,joystick] media-libs/libvorbis !bundled-libs? ( dev-lang/mono media-libs/libmad media-libs/libmikmod media-libs/openal media-libs/sdl-mixer[flac,mikmod,mad,mp3,vorbis] ) ) games-misc/games-envd
-RESTRICT=bindist fetch splitdebug
-SLOT=0
-SRC_URI=solar2-linux-1.10.tar.gz https://dev.gentoo.org/~chewi/distfiles/solar2.png
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d99222fdb99181f959cd00238241d9d3
diff --git a/games-action/solar2/Manifest b/games-action/solar2/Manifest
new file mode 100644
index 000000000000..12ee5c767763
--- /dev/null
+++ b/games-action/solar2/Manifest
@@ -0,0 +1,4 @@
+DIST solar2-linux-1.10.tar.gz 106202569 BLAKE2B 4dc1f0c273aa8363178c581a516969a22707a5345eb11a373f96dd8136af3b390451cd72e7b06bc661ef3e8926f0339d3dad70e9b950210e7820efe9913fe9af SHA512 68475cfe9220a1f19608cd2dfb575979e231dcf1bc61e12230db5a39856a03afceeb8c3f2b0ea6d958b36a53945bdb2768261f2b0bcc50a88f2b3eeddc48df9d
+DIST solar2.png 8260 BLAKE2B cf154377ee73b6d0f3c86e0377b29ca7208ef030183db7bae88b352d5684f3c513d0ad57119121a79906287e72d0a863891285224b631fa44d2ccee12a1eacef SHA512 a85e875e3a159670ea2a3f32687e7e52cf369f29add86f19e6431f05e7835c1a30303ddd4ff406a525c1086298807c2f94773dd987d4d99b89bc7c63150c9c85
+EBUILD solar2-1.10.ebuild 2565 BLAKE2B 54e3e442833df5219b50802340278d5497ab66cf56e9c165557b7d36a06734104a9f2773985ccd5af98befcf69d28b7623968aa96e8066ac8715c63376ef30a1 SHA512 ef5c7201c482e36d987ba02c78324edc0f2b179449915139fa5f695ef18b4f7cc25e3ea11cfa0f3ae3f2a83cf54193bbd457edbd465095cc2bd6ad11db831e0c
+MISC metadata.xml 355 BLAKE2B 2ebe0923f754bb09445457bb7f266a9fb673682281d31d70b39a05f1cd0beb682fa26e89861c46e9dab0f77428b916f9f99d8324b3780c795f317b6e06efde84 SHA512 78f8cc8f1f1be915da206e4b8be196a21b58a6f209023594755e481136a1b86ee31c8d0dfedd516d756a47db624e89728875b073b71c3b08ac94a5cde8ff3b83
diff --git a/games-action/solar2/metadata.xml b/games-action/solar2/metadata.xml
new file mode 100644
index 000000000000..b878aaa1812d
--- /dev/null
+++ b/games-action/solar2/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="bundled-libs">
+			Use the upstream provided bundled libraries.
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/games-action/solar2/solar2-1.10.ebuild b/games-action/solar2/solar2-1.10.ebuild
new file mode 100644
index 000000000000..2a092f697e3a
--- /dev/null
+++ b/games-action/solar2/solar2-1.10.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: - unbundle libmono for 64bit
+#       - unbundling libSDL_mixer breaks the game
+#       - provide icon
+#       - test useflags for libsdl on x86
+
+EAPI=5
+
+inherit eutils gnome2-utils games
+
+DESCRIPTION="An open-world, sandbox game set in an infinite abstract universe"
+HOMEPAGE="http://murudai.com/solar/"
+GAMEBALL="${PN}-linux-${PV}.tar.gz"
+ICONFILE="https://dev.gentoo.org/~chewi/distfiles/${PN}.png"
+SRC_URI="${GAMEBALL} ${ICONFILE}"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="bundled-libs"
+RESTRICT="bindist fetch splitdebug"
+
+MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
+QA_PREBUILT="${MYGAMEDIR#/}/lib/*
+	${MYGAMEDIR#/}/Solar2.bin.x86"
+
+RDEPEND="
+	virtual/opengl
+	amd64? (
+		>=media-libs/flac-1.2.1-r5[abi_x86_32(-)]
+		>=media-libs/libsdl-1.2.15-r4[X,sound,video,joystick,abi_x86_32(-)]
+		>=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)]
+		>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+		!bundled-libs? (
+			>=media-libs/libmad-0.15.1b-r8[abi_x86_32(-)]
+			>=media-libs/openal-1.15.1[abi_x86_32(-)]
+			>=media-libs/sdl-mixer-1.2.12-r4[flac,mikmod,mad,mp3,vorbis,abi_x86_32(-)]
+			>=media-libs/libmikmod-3.2.0[abi_x86_32(-)]
+		)
+	)
+	x86? (
+		media-libs/flac
+		media-libs/libsdl[X,sound,video,joystick]
+		media-libs/libvorbis
+		!bundled-libs? (
+			dev-lang/mono
+			media-libs/libmad
+			media-libs/libmikmod
+			media-libs/openal
+			media-libs/sdl-mixer[flac,mikmod,mad,mp3,vorbis]
+		)
+	)"
+
+S=${WORKDIR}/Solar2
+
+pkg_nofetch() {
+	einfo "Please buy and download ${GAMEBALL} from:"
+	einfo "  ${HOMEPAGE}"
+	einfo "Also download ${ICONFILE}"
+	einfo "and move both to your distfiles directory. The Humble Bundle download"
+	einfo "may have a timestamp appended to the filename."
+}
+
+src_prepare() {
+	# remove unused files
+	rm solar2.sh || die
+
+	if ! use bundled-libs ; then
+		einfo "Removing bundled libs..."
+		if use amd64 ; then
+			# no mono 32bit libs on amd64 yet
+			rm -v lib/libmad.so* lib/libmikmod.so* lib/libopenal.so* || die
+		else
+			rm -v lib/libmad.so* lib/libmikmod.so* lib/libopenal.so* lib/libmono-2.0.so* || die
+		fi
+	fi
+}
+
+src_install() {
+	insinto "${MYGAMEDIR}"
+	doins -r *
+
+	games_make_wrapper ${PN} "./Solar2.bin.x86" "${MYGAMEDIR}"
+	make_desktop_entry ${PN}
+	doicon -s 64 "${DISTDIR}"/${PN}.png
+
+	fperms +x "${MYGAMEDIR}"/Solar2.bin.x86
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-action/spacearyarya-kxl-1.0.2-r2 b/games-action/spacearyarya-kxl-1.0.2-r2
deleted file mode 100644
index 54d2fd6a19be..000000000000
--- a/games-action/spacearyarya-kxl-1.0.2-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-games/KXL >=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 2D/3D shooting game
-EAPI=6
-HOMEPAGE=http://triring.net/ps2linux/games/kxl/kxlgames.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-games/KXL media-fonts/font-adobe-100dpi media-fonts/font-bitstream-100dpi
-SLOT=0
-SRC_URI=mirror://gentoo/SpaceAryarya-KXL-1.0.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_=1f8411ba789702515396e941f0f9bb43
diff --git a/games-action/spacearyarya-kxl/Manifest b/games-action/spacearyarya-kxl/Manifest
new file mode 100644
index 000000000000..9c84c9f78a40
--- /dev/null
+++ b/games-action/spacearyarya-kxl/Manifest
@@ -0,0 +1,6 @@
+AUX spacearyarya-kxl-1.0.2-clang.patch 304 BLAKE2B fe2a557607f3aaca0e22636b86c431938bbda63e0fb6826cd8884180ce3ac1361ca8c5d589d82037b17206fea94e645740122a1fe7878a61e38d98102105d472 SHA512 b70d09c918a80af4432d72d3bfe1c89c4e4b5d1c1ae2eb2eb0a9073e5410a144e1e8164d243d070f37b30e0d29d64c932d2525b83efc19a7adf570d44ba9cca1
+AUX spacearyarya-kxl-1.0.2-flags.patch 304 BLAKE2B e3a422c2bd0c5975aa43442ee1699218052dd1fdde29e24117f955599de6e1ef0326db4c5d1778d2fcadc129fcabcf575586b07e5c5f34407255b78fe56e6d9a SHA512 bc341e05daed7c4f2d0009dec73f068bc2d4bca3d627a3eed040360c41d96967211f4bd186f203aa41a713c31191e4a16c4754c4b22a7607ae2eebba3ddb3394
+AUX spacearyarya-kxl-1.0.2-gentoo-paths.patch 2384 BLAKE2B dfbe2b63832a5adb318b4fbcf68496ef7336651b55749a3dcb2f7b0a1a7a2cbec7667e1360b147d36a051c1af6ba266b3d4a4f62096b6c489f5d11022706ba71 SHA512 93351d22824d3fcc525ca33b2ae1b9949283541e62a717530d675bf63981f450a1667df22097d07ec27c1e43ed0386142ec424fa89601df0158821924ae06011
+DIST SpaceAryarya-KXL-1.0.2.tar.gz 279894 BLAKE2B 1e7d24107d21396d4463924c7e5665271c14c6ba84f600f126128195ac9d6a08bd112cb6730b1931cf113700d7cae18367359639c8c8a10073a2395bcdc87948 SHA512 1109606741bab6c290395cdfd8d19cf12e68cfef41f50164586c316fc425a32232e0f8dd822207d969c27c3f7a8478d1a65f36fe5468f3cfa8932c99ab3cb125
+EBUILD spacearyarya-kxl-1.0.2-r2.ebuild 830 BLAKE2B 55c84ba48c913209811ec70a7db5b9c194288ba083965aabf4632a70dfc62c2b0344c4130f0406b9959d9b02890dec3f391fb188b8a0fb2cefcd7bf343281cd4 SHA512 9491e2c8658923ebda634a635e750bc12542c41252fa41d2ecc8a1c8a373e530abc670fb27d91f2b7428b8e900f4cc4b7aecf75e112f5aba3c48a2dd470f44f9
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-clang.patch b/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-clang.patch
new file mode 100644
index 000000000000..3b9b68b745c0
--- /dev/null
+++ b/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-clang.patch
@@ -0,0 +1,11 @@
+--- a/src/ranking.c.bak	2016-07-27 16:42:34.367945713 -0500
++++ b/src/ranking.c	2016-07-27 16:43:34.679949783 -0500
+@@ -5,7 +5,7 @@
+ /**********************
+   ��������󥭥�
+  **********************/
+-int ScoreRanking(void)
++void ScoreRanking(void)
+ {
+   Uint16 i, j, k;
+   struct passwd *pw;
diff --git a/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-flags.patch b/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-flags.patch
new file mode 100644
index 000000000000..2239858be998
--- /dev/null
+++ b/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-flags.patch
@@ -0,0 +1,11 @@
+respect CFLAGS
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -5,5 +5,5 @@ spacearyarya_SOURCES = extern.h \
+                your.c your.h ranking.c ranking.h \
+                boss.c boss.h
+
+-CFLAGS = @X_CFLAGS@ @KXL_CFLAGS@
++AM_CFLAGS = @X_CFLAGS@ @KXL_CFLAGS@
+ LIBS = @X_LIBS@ -lX11 @KXL_LIBS@ -lKXL
diff --git a/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-gentoo-paths.patch b/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-gentoo-paths.patch
new file mode 100644
index 000000000000..81321b76857a
--- /dev/null
+++ b/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-gentoo-paths.patch
@@ -0,0 +1,74 @@
+--- a/bmp/Makefile.am
++++ b/bmp/Makefile.am
+@@ -1,4 +1,4 @@
+-bmpdir = $(prefix)/share/SpaceAryarya/bmp
++bmpdir = $(BMP_PATH)
+ bmp_DATA =   my.bmp enemy1.bmp shot.bmp bomb.bmp\
+ 	     enemy2.bmp kage.bmp wall.bmp wall2.bmp eshot.bmp\
+ 	     boss1_b.bmp  boss1_do.bmp  boss1_f.bmp\
+--- a/configure.in
++++ b/configure.in
+@@ -25,17 +25,20 @@
+         BMP_PATH=/usr/local/share/SpaceAryarya/bmp
+         WAV_PATH=/usr/local/share/SpaceAryarya/wav
+ else
+-        DATA_PATH=$prefix/share/SpaceAryarya/data
+-        BMP_PATH=$prefix/share/SpaceAryarya/bmp
+-        WAV_PATH=$prefix/share/SpaceAryarya/wav
++        DATA_PATH=$datadir/SpaceAryarya/data
++        BMP_PATH=$datadir/SpaceAryarya/bmp
++        WAV_PATH=$datadir/SpaceAryarya/wav
++        SCORE_PATH=$localstatedir/SpaceAryarya
+ fi
+ AC_DEFINE_UNQUOTED(DATA_PATH,"$DATA_PATH")
+ AC_DEFINE_UNQUOTED(BMP_PATH,"$BMP_PATH")
+ AC_DEFINE_UNQUOTED(WAV_PATH,"$WAV_PATH")
++AC_DEFINE_UNQUOTED(SCORE_PATH,"$SCORE_PATH")
+ AC_DEFINE_UNQUOTED(TITLE,"$PACKAGE $VERSION")
+ AC_SUBST(DATA_PATH)
+ AC_SUBST(BMP_PATH)
+ AC_SUBST(WAV_PATH)
++AC_SUBST(SCORE_PATH)
+ 
+ AC_OUTPUT([data/Makefile wav/Makefile bmp/Makefile src/Makefile
+ spacearyarya.spec Makefile])
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -1,6 +1,7 @@
+-datadir = $(prefix)/share/SpaceAryarya/data
++datadir = $(DATA_PATH)
+ data_DATA  = stage1.dat stage2.dat
+ EXTRA_DIST = stage1.dat stage2.dat .score
+ 
+-install:
+-	$(INSTALL) -c -m 666 ./.score $(DESTDIR)$(DATA_PATH)
++install-data-local:
++	$(mkinstalldirs) $(DESTDIR)$(SCORE_PATH)
++	$(INSTALL) -m 660 .score $(DESTDIR)$(SCORE_PATH)
+--- a/src/ranking.c
++++ b/src/ranking.c
+@@ -36,7 +36,7 @@
+   FILE *fp;
+   Uint16 i;
+ 
+-  if ((fp = fopen(DATA_PATH "/.score", "r"))) {
++  if ((fp = fopen(SCORE_PATH "/.score", "r"))) {
+     fscanf(fp, "%d", &(Root->HiScore));
+     for (i = 0; i < 5; i ++)
+       fscanf(fp, "%d %d %s",
+@@ -65,7 +65,7 @@
+   FILE *fp;
+   Uint16 i;
+ 
+-  if ((fp = fopen(DATA_PATH "/.score", "w"))) {
++  if ((fp = fopen(SCORE_PATH "/.score", "w"))) {
+     fprintf(fp, "%d\n", Root->HiScore);
+     for (i = 0; i < 5; i ++)
+       fprintf(fp, "%d %d %s\n",
+--- a/wav/Makefile.am
++++ b/wav/Makefile.am
+@@ -1,3 +1,3 @@
+-wavdir = $(prefix)/share/SpaceAryarya/wav
++wavdir = $(WAV_PATH)
+ wav_DATA =   bgm1.wav bomb.wav hit.wav fire.wav die.wav boss.wav
+ EXTRA_DIST = bgm1.wav bomb.wav hit.wav fire.wav die.wav boss.wav
diff --git a/games-action/spacearyarya-kxl/metadata.xml b/games-action/spacearyarya-kxl/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-action/spacearyarya-kxl/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-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r2.ebuild b/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..2396a9a92a19
--- /dev/null
+++ b/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils
+
+MY_P=SpaceAryarya-KXL-${PV}
+DESCRIPTION="A 2D/3D shooting game"
+HOMEPAGE="http://triring.net/ps2linux/games/kxl/kxlgames.html"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-games/KXL"
+RDEPEND="${DEPEND}
+	media-fonts/font-adobe-100dpi
+	media-fonts/font-bitstream-100dpi"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo-paths.patch
+	"${FILESDIR}"/${P}-flags.patch
+	"${FILESDIR}"/${P}-clang.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac}
+	rm aclocal.m4
+	eautoreconf
+}
+
+src_install() {
+	default
+	newicon bmp/enemy1.bmp ${PN}.bmp
+	make_desktop_entry spacearyarya SpaceAryarya /usr/share/pixmaps/${PN}.bmp
+}
diff --git a/games-action/spacetripper-demo-1-r1 b/games-action/spacetripper-demo-1-r1
deleted file mode 100644
index eaea00e618f8..000000000000
--- a/games-action/spacetripper-demo-1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Hardcore arcade shoot-em-up
-EAPI=6
-HOMEPAGE=http://www.pompomgames.com/
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=POMPOM
-RDEPEND=>=virtual/opengl-7.0-r1[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[abi_x86_32(-),X,video,joystick,opengl,sound]
-RESTRICT=strip
-SLOT=0
-SRC_URI=http://www.btinternet.com/~bongpig/spacetripperdemo.sh
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=156cdfeba3f86afcd131dbf23c31f2ad
diff --git a/games-action/spacetripper-demo/Manifest b/games-action/spacetripper-demo/Manifest
new file mode 100644
index 000000000000..3c33104e7f2b
--- /dev/null
+++ b/games-action/spacetripper-demo/Manifest
@@ -0,0 +1,3 @@
+DIST spacetripperdemo.sh 5179095 BLAKE2B a2d3109c6557df46b2afa221b92983d4a364abe77260c96066bf466682a022832fef2aee80a438b4e07da5bfcb5d868f45429be87b024d0bcd21eb6636a3a100 SHA512 43c0aac805671716816dfba58fe1ccad333886a1a20a3dfdaba7b78512dbe2ca6fbe6c09782e14f81d475c9c9bccb4043bac4c8bd756800fe43596dbee5018a0
+EBUILD spacetripper-demo-1-r1.ebuild 1122 BLAKE2B 645b89ba3dda465c7b9f15e12268070e76add220ec533947baa988a3a1d034cd866974ce2b5f95aec792170d6632965bc59e91a2da9a81809ad309ee6bc9fb4c SHA512 f84cc7d97f13cec694b21e56c52e22ea75d746edbfa42cdf0a9d719761049bac94108ae43257e0481412cfa1fa6ad84aaae333c4905c268f2f7e7e86c98fd7bc
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/spacetripper-demo/metadata.xml b/games-action/spacetripper-demo/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-action/spacetripper-demo/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-action/spacetripper-demo/spacetripper-demo-1-r1.ebuild b/games-action/spacetripper-demo/spacetripper-demo-1-r1.ebuild
new file mode 100644
index 000000000000..40bcbf3485b8
--- /dev/null
+++ b/games-action/spacetripper-demo/spacetripper-demo-1-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils unpacker
+
+MY_P="spacetripperdemo"
+DESCRIPTION="Hardcore arcade shoot-em-up"
+HOMEPAGE="http://www.pompomgames.com/"
+SRC_URI="http://www.btinternet.com/~bongpig/${MY_P}.sh"
+
+LICENSE="POMPOM"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+RESTRICT="strip"
+
+RDEPEND="
+	>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+	>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-),X,video,joystick,opengl,sound]"
+
+S=${WORKDIR}
+
+dir=/opt/${PN}
+Ddir=${D}/${dir}
+
+QA_PREBUILT="${dir}/*"
+
+src_unpack() {
+	unpack_makeself
+}
+
+src_install() {
+	exeinto "${dir}"
+	doexe bin/x86/*
+	# Remove libSDL since we use the system version and our version doesn't
+	# have TEXTRELs in it.
+	rm -f "${Ddir}"/libSDL-1.2.so.0.0.5 || die
+	sed -i -e "s:XYZZY:${dir}:" "${Ddir}/${MY_P}" || die
+
+	insinto "${dir}"
+	doins -r preview run styles README license.txt icon.xpm
+	newicon icon.xpm spacetripper-demo.png
+
+	make_wrapper spacetripper-demo ./spacetripperdemo "${dir}" "${dir}"
+	make_desktop_entry spacetripper-demo spacetripper-demo spacetripper-demo
+}
diff --git a/games-action/super-hexagon-20160217 b/games-action/super-hexagon-20160217
deleted file mode 100644
index 9820890f6f8c..000000000000
--- a/games-action/super-hexagon-20160217
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst unpack
-DEPEND=app-arch/unzip >=sys-apps/sed-4
-DESCRIPTION=A minimal action game by Terry Cavanagh, with music by Chipzel
-EAPI=6
-HOMEPAGE=https://www.superhexagon.com/
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=media-libs/glew:1.6 media-libs/libsdl2[opengl,sound,video] media-libs/libvorbis media-libs/openal virtual/glu virtual/opengl
-RESTRICT=bindist fetch splitdebug
-SLOT=0
-SRC_URI=superhexagon-02172016-bin
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2d840f70659ed17da18ff73178fc9b9d
diff --git a/games-action/super-hexagon/Manifest b/games-action/super-hexagon/Manifest
new file mode 100644
index 000000000000..387d1d5d9235
--- /dev/null
+++ b/games-action/super-hexagon/Manifest
@@ -0,0 +1,3 @@
+DIST superhexagon-02172016-bin 27481878 BLAKE2B bae4d841cd3a03923b92c511a963ea836bf67b79b23dd800fb2731f33344981ad0f8392025173e2840ad3291646427ce42ba6ebd4b4920a29edb68cf9579103b SHA512 ffb54a9c3fd2e78efcdbf491e995f242ea10da40f32d36c17a0e29f6ac5d684426b542abc1dcdc8c281fa62b6a267642f834b8007686c35f54a445568808eb1e
+EBUILD super-hexagon-20160217.ebuild 1371 BLAKE2B f8a7eccd25c322b2f0a66e5f4f774df0d4fbbf0d2496c5ce10b335d7042727b9812f7f5da6e31e45251cdc0eec1365a6fdb7484b3364c5816e9883eb6c71cb8b SHA512 5b5039241bd83a32ee573f85d3300e592ce1c7a1f6beff8b8798aa281b7b44eed4a7e082d9a09159427a0ea95e72514635aeaa6970c346f771718cf8d3381f7f
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-action/super-hexagon/metadata.xml b/games-action/super-hexagon/metadata.xml
new file mode 100644
index 000000000000..26079e608bed
--- /dev/null
+++ b/games-action/super-hexagon/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-action/super-hexagon/super-hexagon-20160217.ebuild b/games-action/super-hexagon/super-hexagon-20160217.ebuild
new file mode 100644
index 000000000000..a985d2bed49c
--- /dev/null
+++ b/games-action/super-hexagon/super-hexagon-20160217.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop eutils gnome2-utils unpacker
+
+TIMESTAMP="${PV:4:2}${PV:6:2}${PV:0:4}"
+DESCRIPTION="A minimal action game by Terry Cavanagh, with music by Chipzel"
+HOMEPAGE="https://www.superhexagon.com/"
+SRC_URI="superhexagon-${TIMESTAMP}-bin"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist fetch splitdebug"
+
+MYGAMEDIR="/opt/${PN}"
+QA_PREBUILT="${MYGAMEDIR#/}/superhexagon"
+
+DEPEND="app-arch/unzip"
+
+RDEPEND="media-libs/glew:1.6
+	media-libs/libsdl2[opengl,sound,video]
+	media-libs/libvorbis
+	media-libs/openal
+	virtual/glu
+	virtual/opengl"
+
+S="${WORKDIR}/data"
+DOCS=( Linux.README )
+
+pkg_nofetch() {
+	einfo "Please buy and download ${SRC_URI} from:"
+	einfo "  ${HOMEPAGE}"
+	einfo "and move it to your distfiles directory."
+}
+
+src_unpack() {
+	unpack_zip ${A}
+}
+
+src_install() {
+	local myarch=$(usex amd64 x86_64 x86)
+
+	exeinto "${MYGAMEDIR}"
+	insinto "${MYGAMEDIR}"
+	newexe ${myarch}/superhexagon.${myarch} superhexagon
+	doins -r data SuperHexagon.png
+
+	make_wrapper ${PN} ./superhexagon "${MYGAMEDIR}"
+	newicon -s 512 SuperHexagon.png ${PN}.png
+	make_desktop_entry ${PN}
+
+	einstalldocs
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/games-action/supermariowar-2.0_beta1-r1 b/games-action/supermariowar-2.0_beta1-r1
deleted file mode 100644
index 01ecbe9ae197..000000000000
--- a/games-action/supermariowar-2.0_beta1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-libs/zlib:= dev-cpp/yaml-cpp net-libs/enet:1.3= media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png,jpeg] app-arch/unzip virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Fan-made multiplayer Super Mario Bros. style deathmatch game
-EAPI=6
-HOMEPAGE=https://github.com/mmatyas/supermariowar
-IUSE=server
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib:= dev-cpp/yaml-cpp net-libs/enet:1.3= media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png,jpeg]
-SLOT=0
-SRC_URI=https://github.com/mmatyas/supermariowar/archive/v2.0-beta.1.tar.gz -> supermariowar-2.0_beta1.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	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7080edb26c5dfaffbd0b0c1d2f20fc72
diff --git a/games-action/supermariowar/Manifest b/games-action/supermariowar/Manifest
new file mode 100644
index 000000000000..5842c1973769
--- /dev/null
+++ b/games-action/supermariowar/Manifest
@@ -0,0 +1,5 @@
+AUX smwd.initd 902 BLAKE2B 51705ecd466e19f809d9a31dd33a20290fd0aa27832fe52514f1eaffb2ddd89787ff41420614773767c85ade56cccf8bcfb7241d07db47fddbea77c3d94d8b02 SHA512 0c3c9efaa9d239899abf754dee6af71b59f4706e057484502e76abbc0b8ae3a620581c0b3eb7a7ef2f2d050676de46854b033c34d87596b18f195fb7d19495a0
+AUX supermariowar-2.0_beta1-yaml-cpp-config.cmake 655 BLAKE2B 036aef4603f0cb91de6ece5c5de86fa8fa0e440398e022e4f560764a38030b9fead1ed127b9aebf6a97948660b2c999b20da3791b08691883b7c6e2c80166191 SHA512 a43d28d12962f23a0689533315415597e046bcb09c28a1457d2320da00e376e39939b89839b60e73f368c044ced42b5ccdb909dcdc40a1a345b70fa313ba0bfa
+DIST supermariowar-2.0_beta1.tar.gz 13545366 BLAKE2B 497f8d4a8b6e7073c07f2da56e1ace71354fc898660ff866f19ff1d8737e56358eb500d0994dfeeea640dc3ac5aa509be7f31daa75305afc72df8f1497cd5211 SHA512 0849d23ea613d69f32c184dd5f470815a4c68b15836e46e40c30c5a3a6ea2216d4d3305f356e8fdd5b42f4008d9b07f0b9fac84b9f801a4b9f888ba188c56e0b
+EBUILD supermariowar-2.0_beta1-r1.ebuild 2490 BLAKE2B 26c7d8c60e8be50f9f88347e785e7f5cd979ca6ef2eadb993e29bec57edcc0ec11a4121d81f4421d3a997a19fea3abf30dead33f0edc2b07a6556f7738e85185 SHA512 0ced196e8f2af31e5ce3d3e4661ff4fcd468d9f3af7d5c2b9fce148fc9d5249d41cd6b5cc45b1f1973fdc341cbc59fc717a04114d4a9eb073c062454f6032a3a
+MISC metadata.xml 430 BLAKE2B 020d88a651b04c55427bd67c3ab8efae38575b634ac31ac8b4be8b1527b4f61dd7adb3eb171457fffc83fec10f1a432e280ebce5b25a8a1e32f86a13db3f83fe SHA512 7f7e6599a60ee829ecc2a7db5d956c6ac23b8e213d2e56d8c414a30e1dc7ea5577c080bb79430287ae6df8cae863c99a268fabc0ca2cc06c7d301cc7d9668df1
diff --git a/games-action/supermariowar/files/smwd.initd b/games-action/supermariowar/files/smwd.initd
new file mode 100644
index 000000000000..da4fa9a87ee4
--- /dev/null
+++ b/games-action/supermariowar/files/smwd.initd
@@ -0,0 +1,39 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/smw-server"
+command_background="true"
+pidfile="/var/run/${RC_SVCNAME}.pid"
+name="Super Mario War server"
+description="The Super Mario War server process is in charge of hosting Super Mario War games"
+smw_serverdir="@SMW_SERVERDIR@"
+
+depend() {
+    use net
+    before logger
+}
+
+start() {
+    if [[ ! -d "${smw_serverdir}" ]]; then
+        eerror "Cannot cd into ${smw_serverdir}"
+        return 1
+    fi
+    cd "${smw_serverdir}" || return 1
+    ebegin "Starting ${name}"
+    start-stop-daemon \
+        --start \
+        --background \
+        --pidfile ${pidfile} \
+        --make-pidfile \
+        --exec ${command}
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping ${name}"
+    start-stop-daemon \
+        --stop \
+        --pidfile ${pidfile}
+    eend $?
+}
diff --git a/games-action/supermariowar/files/supermariowar-2.0_beta1-yaml-cpp-config.cmake b/games-action/supermariowar/files/supermariowar-2.0_beta1-yaml-cpp-config.cmake
new file mode 100644
index 000000000000..03fb190aad65
--- /dev/null
+++ b/games-action/supermariowar/files/supermariowar-2.0_beta1-yaml-cpp-config.cmake
@@ -0,0 +1,21 @@
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(YAML-CPP REQUIRED yaml-cpp)
+find_path(YAML-CPP_INCLUDE_DIRECTORY
+    NAMES yaml.h
+    PATHS ${YAML-CPP_INCLUDE_DIRS} /usr/include/yaml-cpp
+)
+find_library(YAML-CPP_LIBRARY
+    NAMES yaml-cpp
+    PATHS ${YAML-CPP_LIBRARY_DIRS})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(yaml-cpp 
+    FOUND_VAR yaml-cpp_FOUND
+    REQUIRED_VARS YAML-CPP_LIBRARY YAML-CPP_INCLUDE_DIRECTORY
+)
+
+if (yaml-cpp_FOUND)
+    set(yaml-cpp_INCLUDE_DIRS ${YAML-CPP_INCLUDE_DIRECTORY})
+    set(yaml-cpp_LIBRARIES ${YAML-CPP_LIBRARY})
+endif ()
+mark_as_advanced(YAML-CPP_INCLUDE_DIRECTORY YAML-CPP_LIBRARY)
diff --git a/games-action/supermariowar/metadata.xml b/games-action/supermariowar/metadata.xml
new file mode 100644
index 000000000000..bd948f685035
--- /dev/null
+++ b/games-action/supermariowar/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>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+	<use>
+		<flag name="server">Compile and install Super Mario War server files</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">mmatyas/supermariowar</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/supermariowar/supermariowar-2.0_beta1-r1.ebuild b/games-action/supermariowar/supermariowar-2.0_beta1-r1.ebuild
new file mode 100644
index 000000000000..d78992bbd8aa
--- /dev/null
+++ b/games-action/supermariowar/supermariowar-2.0_beta1-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils cmake-utils versionator
+
+MY_PV=$(replace_version_separator 2 '-')
+MY_PV="${MY_PV/beta1/beta.1}"
+MY_PN="smw"
+
+DESCRIPTION="Fan-made multiplayer Super Mario Bros. style deathmatch game"
+HOMEPAGE="https://github.com/mmatyas/supermariowar"
+SRC_URI="https://github.com/mmatyas/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="server"
+
+RDEPEND="
+	sys-libs/zlib:=
+	dev-cpp/yaml-cpp
+	net-libs/enet:1.3=
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-image[png,jpeg]"
+
+DEPEND="
+	${RDEPEND}
+	app-arch/unzip
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}" || die
+	unpack ./data.zip
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	einfo "Copying Findyaml-cpp.cmake"
+	cp "${FILESDIR}/${P}-yaml-cpp-config.cmake" cmake/Findyaml-cpp.cmake || die
+	eend $?
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIBS=OFF
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DSMW_BINDIR="${EPREFIX}/usr/bin"
+		-DSMW_DATADIR="${EPREFIX}/usr/share/${PF}"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	local bin
+	for bin in "${ED}/usr/bin"/*; do
+		chmod 0755 "${bin}" || die
+	done
+
+	local smw_datadir="usr/share/${PF}"
+	local smw_bindir="${smw_datadir}/bin"
+	mkdir -p "${ED}/${smw_bindir}" || die
+
+	einfo "Moving ${PN} binary files to /${smw_bindir}"
+	mv "${ED}/usr/bin"/* "${ED}/${smw_bindir}" || die
+	eend $?
+
+	local base_bin
+	for bin in "${ED}/${smw_bindir}"/*; do
+		base_bin=$(basename "${bin}")
+		einfo "Creating ${base_bin} launcher in /usr/bin"
+		cat << EOF > "${base_bin}" || die
+#!/usr/bin/env bash
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# ${PF} launcher: ${base_bin}
+exec /${smw_bindir}/${base_bin} /${smw_datadir}
+EOF
+		dobin "${base_bin}"
+		eend $?
+	done
+
+	if use server; then
+		local smw_server="${BUILD_DIR}/Binaries/Release/${MY_PN}-server"
+		local smw_serverdir="/${smw_datadir}/server"
+
+		einfo "Installing ${MY_PN}-server files"
+		dosbin "${smw_server}"
+
+		dodir "${smw_serverdir}"
+		insinto "${smw_serverdir}"
+		doins "${S}/src/server/serverconfig"
+
+		dosym "${smw_serverdir}/serverconfig" "/etc/${MY_PN}d.conf"
+
+		newinitd "${FILESDIR}/smwd.initd" "${MY_PN}d"
+		sed -i -e \
+			"s#@SMW_SERVERDIR@#${smw_serverdir}#g;" \
+			"${ED}/etc/init.d/${MY_PN}d" || die
+		eend $?
+	fi
+}
diff --git a/games-action/supertuxkart-0.9.3 b/games-action/supertuxkart-0.9.3
deleted file mode 100644
index 1f6ab752852f..000000000000
--- a/games-action/supertuxkart-0.9.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=media-libs/glew:0= media-libs/libpng:0= media-libs/libvorbis media-libs/openal net-libs/enet:1.3= net-misc/curl sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/libintl virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm fribidi? ( dev-libs/fribidi ) recorder? ( media-libs/libopenglrecorder ) wiimote? ( net-wireless/bluez ) sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=A kart racing game starring Tux, the linux penguin (TuxKart fork)
-EAPI=6
-HOMEPAGE=https://supertuxkart.net/
-IUSE=debug fribidi recorder wiimote
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-2.0 public-domain ZLIB
-RDEPEND=media-libs/glew:0= media-libs/libpng:0= media-libs/libvorbis media-libs/openal net-libs/enet:1.3= net-misc/curl sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/libintl virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm fribidi? ( dev-libs/fribidi ) recorder? ( media-libs/libopenglrecorder ) wiimote? ( net-wireless/bluez )
-SLOT=0
-SRC_URI=mirror://sourceforge/supertuxkart/SuperTuxKart/0.9.3/supertuxkart-0.9.3-src.tar.xz mirror://gentoo/supertuxkart.png
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2e1039401ede3297ca32b7501beeff0b
diff --git a/games-action/supertuxkart/Manifest b/games-action/supertuxkart/Manifest
new file mode 100644
index 000000000000..2595e7268c9c
--- /dev/null
+++ b/games-action/supertuxkart/Manifest
@@ -0,0 +1,11 @@
+AUX supertuxkart-0.9.3-fix-buildsystem.patch 3634 BLAKE2B a6862dab8f1153b0c54880a6fc3151ab4c0cd1083aa170f6dac749c1eda18386045a8fd41ce4ac489a62891c0ad5528db720b2e8bbdc6a1295cbe4902e7850b0 SHA512 c7725e7bf8736782bdd66b3ce0680e5fcdf1a02b469f47f6123f362d985926b9c2d1e2f5555dc5f9b32cc1585397c1ac6e31f7b5ef36cd974e80d20cefc1d59e
+AUX supertuxkart-0.9.3-intrin.patch 1709 BLAKE2B 936cc845bd05c5e340f90d2bdfcb27c0853309133bf1dbbc5a068eb02d0f67e24b3a93339229f9016af5708fa6ece0626c9593d46d052b9f9d68fa77b27d8d32 SHA512 f9a2f1e5b393d67327478a4d24c492a3d7818d2e88e244877f554421bd506aebfe2c4174aad404be77067d76d408feb734ee5d27d787dd10ad148892e51b326c
+AUX supertuxkart-0.9.3-irrlicht-arch-support.patch 1514 BLAKE2B b7daa129e94ddb96a774ce8cbc47d88475ced879efb9ff38029bd36268083c5838d2c03051f8147e3e8068b588bf0325c7c204f1b3b91ec1d58936cdee6cb119 SHA512 e6560b05c37ca95f8c04ac20f109f55a0a2bf00dd10fbe1975daae5f41c0ed2e1612df12fcdf3c4b6d70ecdfbb67f3d5b4a11ec137051592f5fc67114721c03c
+AUX supertuxkart-0.9.3-irrlicht-bundled-libs.patch 1069 BLAKE2B e176361b4bb0df5c6f5a7b1bec24816c2f368470d4cb277830b02abf05d55e31bc7259620f667d704e94d7748e0cf24e53fb4c7fbea6eceae011fd2e6e0be420 SHA512 64d9e8891db76123351f55ceba034a65fd3894d80341c496ff5762678548e18d5aef8d2e71dfb01eef7591dac16685940d5083058aca40aa1d1b9d0550228d9c
+AUX supertuxkart-0.9.3-irrlicht-system-libs.patch 1576 BLAKE2B b252cc0036f41e9bcf02e1bf049f82de7cd94aba981cc7e161aac52306890fc490d2d4b213fcec60f9098573b3cc059a26aa2efe524030034e4a29c15bf36b88 SHA512 55d353d492aafec3ddb801b28bbe4058bc0b348980f631057850915849013ec191658c55dbc41b48402219a13ec5db811d89401d5cfbb27e7bf5c68f2478d5b6
+AUX supertuxkart-0.9.3-unbundle-enet.patch 1591 BLAKE2B 96bd9b9235f5eabfd02939cc76aee1f01e415554e91310f133ff8441fa8243825db66912cafde4c6ce4146a07f2870a5b11e03460a2dee9bf69c8565591239a3 SHA512 fcbae8df0424be0693dbfd71b349a3d81fd046dba2cccf720630ec94b8a575e41eefafe5e602d44e64b3613344e2b473655c2ce004dc32d45fc3e5f9e4965a22
+AUX supertuxkart-0.9.3-unbundle-libs.patch 364 BLAKE2B e83f06bcb976c01a53f80941e94c616af06509cb8c329861c2c6b206f67fadf17b7ca8bbb324b43cad5593090fae58fec5d10332013e4522ed27d1e9ee5d47fe SHA512 0ba80dd7d5b18eba882c38b7522e06d29c11acc6b34500ba29391494e085c72f1c45533c27033d37b44ef7b954339ea313632d3ced718b20294e12a47a1e78f5
+DIST supertuxkart-0.9.3-src.tar.xz 544517772 BLAKE2B 84ab64371a59bf302905181ad98dd12542a9ffda18b9081ecfa6fcbb61d89c6b1f76f3598184459bbb40a42a1c968767837e76bbd0c9b2ade6b4c18831bc61fb SHA512 29eb1d8fb8e336453e590273089af09eac9a563f82c0bc797d43d5e21d5c9d1274a84ea7ee46487b3d127c47e55e3d233ad7e0e8c502c15dbafc1cc0f5c861c9
+DIST supertuxkart.png 4435 BLAKE2B b48b95e1cdebe930837cc784c4c5e9a089a69077e2fcfed15fe5e8c4d649a0f8024769b2f2102bbaea3a94eb21f4b58b5d291b97493266c3c5c8d7335cf69a80 SHA512 a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda
+EBUILD supertuxkart-0.9.3.ebuild 2148 BLAKE2B ca991ebcbde7bf63d12925b0dbf21ec830a66365b9219099a603c69751c6e2d45e688fa5e015f0620759bd0697ec18bfa49b7952d2c794ba24306c07936b9d9d SHA512 1e821d4a659ad7db8a2f1fbe1c7d7622d26f896338276d4eb3cdc08f43ad5edc4b5d8ff8219f5f63e9b1e03f8253af19a750c4bec44d40d07672d545f782a490
+MISC metadata.xml 573 BLAKE2B 6a6ec70954841483c605afdf11e8b6d8e2b1b4eec660597010df8672e6726bf512aa59acd767df7ab53aeb4975a4a3f1650fb745950f078d9abe64a4753cd6d9 SHA512 c321e0f7c53b06f71d61b02185abd4f8901c21b9e59e1bf53a9a1d6f9569483307fdd1666a9a12c603971b16a47dc4780d39f8419f1396239e75cb10b289a3a9
diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.3-fix-buildsystem.patch b/games-action/supertuxkart/files/supertuxkart-0.9.3-fix-buildsystem.patch
new file mode 100644
index 000000000000..def5c80340ba
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.9.3-fix-buildsystem.patch
@@ -0,0 +1,103 @@
+* Unbundle remaining libraries: GLEW, zlib, png, jpeg
+* Add -DAS_DEPRECATED for Angelscript
+* Remove definition of debug macros
+* Build bundled Irrlicht with user flags
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -110,43 +110,11 @@
+ include_directories(${ENET_INCLUDE_DIR})
+ 
+ # Build glew library
+ if(NOT USE_GLES2 AND NOT SERVER_ONLY)
++    find_package(GLEW REQUIRED)
++    include_directories(${GLEW_INCLUDE_DIRS})
+     add_definitions(-DGLEW_NO_GLU)
+-    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/glew")
+-    include_directories("${PROJECT_SOURCE_DIR}/lib/glew/include")
+ endif()
+
+-if(MSVC OR APPLE)
+-    if (NOT APPLE)
+-    # Build zlib library
+-    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/zlib")
+-    include_directories("${PROJECT_SOURCE_DIR}/lib/zlib")
+-
+-    set(ZLIB_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/zlib" "${PROJECT_BINARY_DIR}/lib/zlib/")
+-    set(ZLIB_LIBRARY zlibstatic)
+-    endif()
+-
+-    # Build png library
+-    set(SKIP_INSTALL_ALL TRUE)
+-    set(PNG_STATIC TRUE CACHE BOOL "Build static lib")
+-    set(PNG_TESTS FALSE CACHE BOOL "Build libpng tests")
+-    set(PNG_SHARED FALSE CACHE BOOL "Build shared lib")
+-    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/libpng")
+-    include_directories("${PROJECT_SOURCE_DIR}/lib/libpng")
+-
+-    set(PNG_PNG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/libpng/")
+-    set(PNG_LIBRARY png_static)
+-endif()
+-
+-# Add jpeg library
+-if (APPLE)
+-    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/jpeglib")
+-    include_directories("${PROJECT_SOURCE_DIR}/lib/jpeglib")
+-    set(JPEG_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lib/jpeglib/")
+-    set(JPEG_LIBRARY jpeglib)
+-else()
+-    find_package(JPEG REQUIRED)
+-    include_directories(${JPEG_INCLUDE_DIR})
+-endif()
+ 
+ if (BUILD_RECORDER)
+@@ -206,6 +174,7 @@
+     find_package(Angelscript)
+     if(ANGELSCRIPT_FOUND)
+         include_directories(${Angelscript_INCLUDE_DIRS})
++        add_definitions(-DAS_DEPRECATED)
+     else()
+         message(FATAL_ERROR "Angelscript not found. "
+             "Either install angelscript or use built-in version using "
+@@ -307,14 +276,6 @@
+     # VS will automatically add NDEBUG for release mode, but only _DEBUG in debug mode.
+     # Since STK uses DEBUG, this is added for debug compilation only:
+     set_property(DIRECTORY PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG)
+-else()
+-    # All non VS generators used create only a single compile mode, so
+-    # compile flags can be simplye be added
+-    if(CMAKE_BUILD_TYPE MATCHES Debug)
+-        add_definitions(-DDEBUG)
+-    else()
+-        add_definitions(-DNDEBUG)
+-    endif()
+ endif()
+ 
+ # TODO: remove this switch
+@@ -426,7 +395,7 @@
+ if(NOT SERVER_ONLY)
+     if(NOT USE_GLES2)
+-        target_link_libraries(supertuxkart ${OPENGL_gl_LIBRARY} glew graphics_utils)
++        target_link_libraries(supertuxkart ${OPENGL_gl_LIBRARY} ${GLEW_LIBRARIES} graphics_utils)
+     else()
+         target_link_libraries(supertuxkart GLESv2)
+     endif()
+ endif()
+--- a/lib/irrlicht/CMakeLists.txt
++++ b/lib/irrlicht/CMakeLists.txt
+@@ -68,15 +68,6 @@
+ if(WIN32)
+     add_definitions(-D_IRR_STATIC_LIB_)
+     add_definitions(-D_CRT_SECURE_NO_WARNINGS) # Shut up about unsafe stuff
+-else()
+-    set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wall -pipe -O3  -fno-exceptions  -fstrict-aliasing")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pipe -O3  -fno-exceptions  -fstrict-aliasing")
+-    if(CMAKE_COMPILER_IS_GNUCC)
+-        set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fexpensive-optimizations")
+-    endif()
+-    if(CMAKE_COMPILER_IS_GNUCXX)
+-        set(CMAKE_CXX_FLAGS   "${CMAKE_CXX_FLAGS} -fexpensive-optimizations")
+-    endif()
+ endif()
+ 
+ if(USE_GLES2)
diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.3-intrin.patch b/games-action/supertuxkart/files/supertuxkart-0.9.3-intrin.patch
new file mode 100644
index 000000000000..75830b8ba8f2
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.9.3-intrin.patch
@@ -0,0 +1,56 @@
+From 813b08bc73e4e93714b972ee56c64b4771735e01 Mon Sep 17 00:00:00 2001
+From: Benau <Benau@users.noreply.github.com>
+Date: Sun, 14 Jan 2018 10:19:37 +0800
+Subject: [PATCH] Fix #3091
+
+---
+ lib/graphics_utils/mipmap/cpusimd.h | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/lib/graphics_utils/mipmap/cpusimd.h b/lib/graphics_utils/mipmap/cpusimd.h
+index 1dc2c730b2..5e2cf30e5f 100644
+--- a/lib/graphics_utils/mipmap/cpusimd.h
++++ b/lib/graphics_utils/mipmap/cpusimd.h
+@@ -38,11 +38,11 @@
+  #include <mmintrin.h>
+  #define CPU_MMX_SUPPORT (1)
+ #endif
+-#if __SSE__ || _M_X64 || _M_IX86_FP >= 1  || CPU_ENABLE_SSE
++#if __SSE__ || defined(_M_X64) || ( defined(_M_IX86_FP) && ( _M_IX86_FP >= 1 ) ) || CPU_ENABLE_SSE
+  #include <xmmintrin.h>
+  #define CPU_SSE_SUPPORT (1)
+ #endif
+-#if __SSE2__ || _M_X64 || _M_IX86_FP >= 2  || CPU_ENABLE_SSE2
++#if __SSE2__ || defined(_M_X64) || ( defined(_M_IX86_FP) && ( _M_IX86_FP >= 2 ) ) || CPU_ENABLE_SSE2
+  #include <emmintrin.h>
+  #define CPU_SSE2_SUPPORT (1)
+ #endif
+@@ -95,23 +95,23 @@
+  #define CPU_POPCNT_SUPPORT (1)
+ #endif
+ #if __LZCNT__ || CPU_ENABLE_LZCNT
+- #include <lzcntintrin.h>
++ #include <x86intrin.h>
+  #define CPU_LZCNT_SUPPORT (1)
+ #endif
+ #if __F16C__ || CPU_ENABLE_F16C
+- #include <f16cintrin.h>
++ #include <x86intrin.h>
+  #define CPU_F16C_SUPPORT (1)
+ #endif
+ #if __BMI__ || CPU_ENABLE_BMI
+- #include <bmiintrin.h>
++ #include <x86intrin.h>
+  #define CPU_BMI_SUPPORT (1)
+ #endif
+ #if __BMI2__ || CPU_ENABLE_BMI2
+- #include <bmi2intrin.h>
++ #include <x86intrin.h>
+  #define CPU_BMI2_SUPPORT (1)
+ #endif
+ #if __TBM__ || CPU_ENABLE_TBM
+- #include <tbmintrin.h>
++ #include <x86intrin.h>
+  #define CPU_TBM_SUPPORT (1)
+ #endif
+ 
diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-arch-support.patch b/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-arch-support.patch
new file mode 100644
index 000000000000..66191861a963
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-arch-support.patch
@@ -0,0 +1,47 @@
+From: Christoph Egger <debian@christoph-egger.org>
+Subject: [PATCH] debian/arch-support
+
+Building on non-linux architectures currently fails with unpatched
+irrlicht because irrlicht tries to create Joystick support using
+linux-specific headers. However there's infrastructure to disable
+Joystick support, we just need to activate that on non-linux
+architectures.
+
+Additionally if built on a sparc machine irrlicht assumes wrongly it's
+a solaris system. We fix this wrong assumption as our sparc builds are
+all on linux.
+
+Finally irrlicht exceeds the size constraights for -fpic requiering to
+build with -fPIC. As upstream doesn't do that we need to fix this for
+sparc and s390 builds (powerPC?).
+
+Signed-off-by: Christoph Egger <debian@christoph-egger.org>
+
+---
+ lib/irrlicht/include/IrrCompileConfig.h |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+--- a/lib/irrlicht/include/IrrCompileConfig.h
++++ b/lib/irrlicht/include/IrrCompileConfig.h
+@@ -110,4 +110,8 @@
+ #ifndef _IRR_SOLARIS_PLATFORM_
+ #define _IRR_LINUX_PLATFORM_
++#include <endian.h>
++ #if __BYTE_ORDER == __BIG_ENDIAN
++  #define __BIG_ENDIAN__
++ #endif
+ #endif
+ #define _IRR_POSIX_API_
+@@ -460,11 +464,7 @@
+ 	#undef _IRR_WCHAR_FILESYSTEM
+ #endif
+ 
+-#if defined(__sparc__) || defined(__sun__)
+-#define __BIG_ENDIAN__
+-#endif
+-
+-#if defined(_IRR_SOLARIS_PLATFORM_)
++#if defined(_IRR_SOLARIS_PLATFORM_) || defined(__FreeBSD_kernel__) || defined(__gnu_hurd__)
+ 	#undef _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+ #endif
+ 
diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-bundled-libs.patch b/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-bundled-libs.patch
new file mode 100644
index 000000000000..194f278b958d
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-bundled-libs.patch
@@ -0,0 +1,33 @@
+Description: Remove embedded libraries in Irrlicht source (flagged by lintian)
+ Since removing the subdirectories containing libjpeg/libpng/zlib/bzip2/lzma
+ would make this patch way too large, this patch should be applied on top of
+	rm -rf lib/jpeglib/
+	rm -rf lib/zlib/
+	rm -rf lib/libpng/
+ in debian/rules (e.g. in the clean target).
+Forwarded: no
+Author: Vincent Cheng <vcheng@debian.org>
+Last-Update: 2016-07-07
+
+--- a/lib/irrlicht/CMakeLists.txt
++++ b/lib/irrlicht/CMakeLists.txt
+@@ -2,9 +2,6 @@
+ find_package(PNG REQUIRED)
+ find_package(JPEG REQUIRED)
+ 
+-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/"
+-                    "${JPEG_INCLUDE_DIR}"
+-                    "${PNG_INCLUDE_DIRS}"
+-                    "${ZLIB_INCLUDE_DIR}")
++include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/)
+ 
+ if(MSVC OR APPLE)
+@@ -576,7 +573,7 @@
+ endif()
+ 
+ add_library(stkirrlicht STATIC ${IRRLICHT_SOURCES})
+
+-target_link_libraries(stkirrlicht ${PNG_LIBRARY} ${JPEG_LIBRARY} ${ZLIB_LIBRARY})
++target_link_libraries(stkirrlicht png jpeg z)
+ 
+ if(NOT SERVER_ONLY)
diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-system-libs.patch b/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-system-libs.patch
new file mode 100644
index 000000000000..ce7ce63fa661
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-system-libs.patch
@@ -0,0 +1,56 @@
+Subject: [PATCH] debian/use-system-libs
+
+Path to build irrlicht using the system libraries for png,zlib and
+jpeg as well as the glext family of header files.
+
+Signed-off-by: Christoph Egger <debian@christoph-egger.org
+
+--- a/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
++++ b/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
+@@ -21,7 +21,7 @@
+ 	#endif
+ 	#include <GL/gl.h>
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+-		#include "glext.h"
++		#include <GL/glext.h>
+ 	#endif
+ 	#include "wglext.h"
+ 
+@@ -36,7 +36,7 @@
+ 	#endif
+ 	#include <OpenGL/gl.h>
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+-		#include "glext.h"
++		#include <GL/glext.h>
+ 	#endif
+ #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_)
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+@@ -50,7 +50,7 @@
+ 	#include <SDL/SDL_video.h>
+ 	#include <SDL/SDL_opengl.h>
+         typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+-	#include "glext.h"
++	#include <GL/glext.h>
+ #else
+ 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+ 		#define GL_GLEXT_LEGACY 1
+--- a/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
++++ b/lib/irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
+@@ -12,7 +12,7 @@
+ 	#define WIN32_LEAN_AND_MEAN
+ 	#include <windows.h>
+ 	#include <GL/gl.h>
+-	#include "glext.h"
++	#include <GL/glext.h>
+ #else
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+ 	#define GL_GLEXT_LEGACY 1
+@@ -25,7 +25,7 @@
+ 	#include <GL/gl.h>
+ #endif
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+-	#include "glext.h"
++	#include <GL/glext.h>
+ #endif
+ #endif
+ 
diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.3-unbundle-enet.patch b/games-action/supertuxkart/files/supertuxkart-0.9.3-unbundle-enet.patch
new file mode 100644
index 000000000000..8c00fce7e186
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.9.3-unbundle-enet.patch
@@ -0,0 +1,57 @@
+Description: Build supertuxkart against system enet instead of embedded copy
+Forwarded: not-yet
+Author: Vincent Cheng <vcheng@debian.org>
+Last-Update: 2016-07-17
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -105,9 +105,9 @@
+ add_subdirectory("${PROJECT_SOURCE_DIR}/lib/bullet")
+ include_directories("${PROJECT_SOURCE_DIR}/lib/bullet/src")
+ 
+-# Build the ENet UDP network library
+-add_subdirectory("${PROJECT_SOURCE_DIR}/lib/enet")
+-include_directories("${PROJECT_SOURCE_DIR}/lib/enet/include")
++# ENet
++find_package(ENet REQUIRED)
++include_directories(${ENET_INCLUDE_DIR})
+ 
+ # Build glew library
+ if(NOT USE_GLES2 AND NOT SERVER_ONLY)
+@@ -406,10 +406,10 @@
+     bulletdynamics
+     bulletcollision
+     bulletmath
+-    enet
+     stkirrlicht
+     ${Angelscript_LIBRARIES}
+     ${CURL_LIBRARIES}
++    ${ENET_LIBRARIES}
+     ${OGGVORBIS_LIBRARIES}
+     ${OPENAL_LIBRARY}
+     ${FREETYPE_LIBRARIES}
+--- /dev/null
++++ b/cmake/FindENet.cmake
+@@ -0,0 +1,22 @@
++# - Find ENet
++# Find the ENet includes and libraries
++#
++# Following variables are provided:
++# ENET_FOUND
++#     True if ENet has been found
++# ENET_INCLUDE_DIR
++#     The include directories of ENet
++# ENET_LIBRARIES
++#     ENet library list
++
++
++find_path(ENET_INCLUDE_DIR enet/enet.h /usr/include)
++find_library(ENET_LIBRARY NAMES enet PATHS /usr/lib)
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(ENet DEFAULT_MSG ENET_INCLUDE_DIR ENET_LIBRARY)
++
++# Publish variables
++set(ENET_INCLUDE_DIRS ${ENET_INCLUDE_DIR})
++set(ENET_LIBRARIES ${ENET_LIBRARY})
++mark_as_advanced(ENET_INCLUDE_DIR ENET_LIBRARY)
diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.3-unbundle-libs.patch b/games-action/supertuxkart/files/supertuxkart-0.9.3-unbundle-libs.patch
new file mode 100644
index 000000000000..798a6cdea7ac
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.9.3-unbundle-libs.patch
@@ -0,0 +1,19 @@
+Description: Link against system copies of zlib/libpng/libjpeg/bzip2
+Forwarded: not-yet
+Author: Vincent Cheng <vcheng@debian.org>
+Last-Update: 2016-07-17
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -416,6 +416,11 @@
+     ${JPEG_LIBRARIES}
+     ${TURBOJPEG_LIBRARY}
+     #${VPX_LIBRARIES}
++    X11
++    z
++    png
++    jpeg
++    bz2
+     )
+ 
+ if(NOT SERVER_ONLY)
diff --git a/games-action/supertuxkart/metadata.xml b/games-action/supertuxkart/metadata.xml
new file mode 100644
index 000000000000..a5ee37310257
--- /dev/null
+++ b/games-action/supertuxkart/metadata.xml
@@ -0,0 +1,16 @@
+<?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="fribidi">Support for right-to-left languages</flag>
+		<flag name="recorder">Enable recording with <pkg>media-libs/libopenglrecorder</pkg></flag>
+		<flag name="wiimote">Support for wiimote input devices</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">supertuxkart</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/supertuxkart/supertuxkart-0.9.3.ebuild b/games-action/supertuxkart/supertuxkart-0.9.3.ebuild
new file mode 100644
index 000000000000..cfda52536ec4
--- /dev/null
+++ b/games-action/supertuxkart/supertuxkart-0.9.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils gnome2-utils
+
+DESCRIPTION="A kart racing game starring Tux, the linux penguin (TuxKart fork)"
+HOMEPAGE="https://supertuxkart.net/"
+SRC_URI="mirror://sourceforge/${PN}/SuperTuxKart/${PV}/${P}-src.tar.xz
+	mirror://gentoo/${PN}.png"
+
+LICENSE="GPL-2 GPL-3 CC-BY-SA-3.0 CC-BY-2.0 public-domain ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug fribidi recorder wiimote"
+
+# don't unbundle irrlicht and bullet
+# both are modified and system versions will break the game
+# https://sourceforge.net/p/irrlicht/feature-requests/138/
+
+RDEPEND="
+	media-libs/glew:0=
+	media-libs/libpng:0=
+	media-libs/libvorbis
+	media-libs/openal
+	net-libs/enet:1.3=
+	net-misc/curl
+	sys-libs/zlib
+	virtual/glu
+	virtual/jpeg:0
+	virtual/libintl
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXxf86vm
+	fribidi? ( dev-libs/fribidi )
+	recorder? ( media-libs/libopenglrecorder )
+	wiimote? ( net-wireless/bluez )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.3-intrin.patch
+	"${FILESDIR}"/${PN}-0.9.3-unbundle-enet.patch
+	"${FILESDIR}"/${PN}-0.9.3-unbundle-libs.patch
+	"${FILESDIR}"/${PN}-0.9.3-irrlicht-arch-support.patch
+	"${FILESDIR}"/${PN}-0.9.3-irrlicht-bundled-libs.patch
+	"${FILESDIR}"/${PN}-0.9.3-irrlicht-system-libs.patch
+	"${FILESDIR}"/${PN}-0.9.3-fix-buildsystem.patch
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# remove bundled libraries, just to be sure
+	rm -r lib/{enet,glew,jpeglib,libpng,zlib} || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# system dev-libs/angelscript leads
+		# to failed assert segfaults
+		-DUSE_SYSTEM_ANGELSCRIPT=OFF
+		-DUSE_FRIBIDI=$(usex fribidi)
+		-DBUILD_RECORDER=$(usex recorder)
+		-DUSE_WIIUSE=$(usex wiimote)
+		-DSTK_INSTALL_BINARY_DIR=bin
+		-DSTK_INSTALL_DATA_DIR=share/${PN}
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc CHANGELOG.md
+
+	doicon -s 64 "${DISTDIR}"/${PN}.png
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-action/swordandsworcery-1.02 b/games-action/swordandsworcery-1.02
deleted file mode 100644
index b881506a8bd6..000000000000
--- a/games-action/swordandsworcery-1.02
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
-DESCRIPTION=An exploratory action adventure game with an emphasis on audiovisual style
-EAPI=5
-HOMEPAGE=http://www.swordandsworcery.com/
-IUSE=bundled-libs
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=CAPYBARA-EULA LGPL-3
-RDEPEND=virtual/opengl amd64? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=virtual/glu-9.0-r1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] >=media-libs/flac-1.2.1-r5[abi_x86_32(-)] >=media-libs/libogg-1.3.0[abi_x86_32(-)] >=media-libs/libsndfile-1.0.25[abi_x86_32(-)] >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)] >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)] >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)] >=x11-libs/libxcb-1.9.1[abi_x86_32(-)] >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXi-1.7.2[abi_x86_32(-)] >=x11-libs/libXtst-1.2.1-r1[abi_x86_32(-)] !bundled-libs? ( >=net-misc/curl-7.36.0[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[X,sound,video,opengl,joystick,abi_x86_32(-)] ) ) x86? ( dev-libs/openssl:0= media-libs/alsa-lib media-libs/flac media-libs/libogg media-libs/libsndfile media-libs/libvorbis media-sound/pulseaudio sys-libs/zlib virtual/glu x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXdmcp x11-libs/libXext x11-libs/libXi x11-libs/libXtst !bundled-libs? ( net-misc/curl media-libs/libsdl[X,sound,video,opengl,joystick] ) ) games-misc/games-envd
-RESTRICT=bindist fetch splitdebug
-SLOT=0
-SRC_URI=swordandsworcery_1.02.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8b4045d062d04bb24c8870ba0e4f0d30
diff --git a/games-action/swordandsworcery/Manifest b/games-action/swordandsworcery/Manifest
new file mode 100644
index 000000000000..eac8dc2513e9
--- /dev/null
+++ b/games-action/swordandsworcery/Manifest
@@ -0,0 +1,4 @@
+AUX swordandsworcery-wrapper 641 BLAKE2B 3609da1a899e05c3291ff20f30e75a335ac4aee0b53fac8a59786ce9992cf2b6081a8286ff40384f652e1bf35c4768ed7d9b87e6fcca149afd7ac2a6a8344203 SHA512 a29ff0cfadfd537129f5561fe9fa6acd88630340da49cc754f219aa125d01b8f73be7500dcc636140bbf707d73d8376b229e1897017819614fe6f4f28df1a545
+DIST swordandsworcery_1.02.tar.gz 325277619 BLAKE2B 7e03350b31d2dc68c5ea3643d7e22ec7da1789729201c2e8aec9e06db8c28c0a38bc826de0769dcec78080f17435d90ae3b0441ee230d7b8a9545a66f6e0ec1f SHA512 1178492628e8b8196bbb57b3d4d7526d5545bd31d0da34bcbed92150753fbb768c8682f071e2a473b95f1b6ee7c3efb30ccb9fce2e3e319d76673b79617e47c0
+EBUILD swordandsworcery-1.02.ebuild 2653 BLAKE2B 9a49ca92edb06d3314ccf21911e3aae1963ca6a5493d8f17ceb163fd4f96f1abb98a79b80c9074708c58fce1afe4c950c9a7ced3392868c28ef585d212194750 SHA512 c4307b85c406b9730d0b10386083b4cd9c752c1c628fc202543168a922b1a9de809c109c858534c92d3bb2994a3459de7357bf67aa92e9425d377a765f21edf8
+MISC metadata.xml 355 BLAKE2B 2ebe0923f754bb09445457bb7f266a9fb673682281d31d70b39a05f1cd0beb682fa26e89861c46e9dab0f77428b916f9f99d8324b3780c795f317b6e06efde84 SHA512 78f8cc8f1f1be915da206e4b8be196a21b58a6f209023594755e481136a1b86ee31c8d0dfedd516d756a47db624e89728875b073b71c3b08ac94a5cde8ff3b83
diff --git a/games-action/swordandsworcery/files/swordandsworcery-wrapper b/games-action/swordandsworcery/files/swordandsworcery-wrapper
new file mode 100644
index 000000000000..ce668c71843a
--- /dev/null
+++ b/games-action/swordandsworcery/files/swordandsworcery-wrapper
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Get game directory
+GAMEDIR="@GAMEDIR@"
+LIB=$GAMEDIR/lib
+BIN=$GAMEDIR/bin
+
+# Ensure the log directory exists
+LOGDIR=~/.capy/SwordAndSworcery
+[ -e ~/.capy ] || mkdir ~/.capy
+[ -e ~/.capy/SwordAndSworcery ] || mkdir ~/.capy/SwordAndSworcery
+
+# For multi-monitor displays, choose a screen to display on to avoid having
+# the game be displayed in the middle across both screens in fullscreen mode
+#export SDL_VIDEO_FULLSCREEN_DISPLAY=0
+
+# Modify library paths here
+export LD_LIBRARY_PATH="$LIB:$LD_LIBRARY_PATH"
+
+# Run the game and try to log any errors if any
+cd "$BIN"
+exec ./swordandsworcery $@ 2>&1 | tee -a $LOGDIR/log.txt
+
+exit
diff --git a/games-action/swordandsworcery/metadata.xml b/games-action/swordandsworcery/metadata.xml
new file mode 100644
index 000000000000..b878aaa1812d
--- /dev/null
+++ b/games-action/swordandsworcery/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="bundled-libs">
+			Use the upstream provided bundled libraries.
+		</flag>
+	</use>
+</pkgmetadata>
diff --git a/games-action/swordandsworcery/swordandsworcery-1.02.ebuild b/games-action/swordandsworcery/swordandsworcery-1.02.ebuild
new file mode 100644
index 000000000000..7369ce107ba3
--- /dev/null
+++ b/games-action/swordandsworcery/swordandsworcery-1.02.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: unbundle liblua-5.1 when available for multilib
+
+EAPI=5
+
+inherit eutils games
+
+DESCRIPTION="An exploratory action adventure game with an emphasis on audiovisual style"
+HOMEPAGE="http://www.swordandsworcery.com/"
+SRC_URI="${PN}_${PV}.tar.gz"
+
+LICENSE="CAPYBARA-EULA LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="bundled-libs"
+RESTRICT="bindist fetch splitdebug"
+
+MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
+QA_PREBUILT="${MYGAMEDIR#/}/bin/*
+	${MYGAMEDIR#/}/lib/*"
+
+# linked to pulseaudio
+RDEPEND="
+	virtual/opengl
+	amd64? (
+		>=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)]
+		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
+		>=virtual/glu-9.0-r1[abi_x86_32(-)]
+		>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+		>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+		>=media-libs/flac-1.2.1-r5[abi_x86_32(-)]
+		>=media-libs/libogg-1.3.0[abi_x86_32(-)]
+		>=media-libs/libsndfile-1.0.25[abi_x86_32(-)]
+		>=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)]
+		>=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)]
+		>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
+		>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
+		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+		>=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)]
+		>=x11-libs/libxcb-1.9.1[abi_x86_32(-)]
+		>=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)]
+		>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+		>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+		>=x11-libs/libXtst-1.2.1-r1[abi_x86_32(-)]
+		!bundled-libs? (
+			>=net-misc/curl-7.36.0[abi_x86_32(-)]
+			>=media-libs/libsdl-1.2.15-r4[X,sound,video,opengl,joystick,abi_x86_32(-)]
+		)
+	)
+	x86? (
+		dev-libs/openssl:0=
+		media-libs/alsa-lib
+		media-libs/flac
+		media-libs/libogg
+		media-libs/libsndfile
+		media-libs/libvorbis
+		media-sound/pulseaudio
+		sys-libs/zlib
+		virtual/glu
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libxcb
+		x11-libs/libXdmcp
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXtst
+		!bundled-libs? (
+			net-misc/curl
+			media-libs/libsdl[X,sound,video,opengl,joystick]
+		)
+	)"
+
+S=${WORKDIR}
+
+pkg_nofetch() {
+	einfo "Please buy & download ${SRC_URI} from:"
+	einfo "  ${HOMEPAGE}"
+	einfo "and move it to ${DISTDIR}"
+}
+
+src_prepare() {
+	if ! use bundled-libs ; then
+		einfo "removing bundled libs..."
+		rm -v lib/libcurl.so* lib/libSDL-1.2.so* \
+			lib/libstdc++.so* || die
+	fi
+
+	sed \
+		-e "s#@GAMEDIR@#${MYGAMEDIR}#" \
+		"${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die
+}
+
+src_install() {
+	insinto "${MYGAMEDIR}"
+	doins -r bin lib res
+
+	dogamesbin "${T}"/${PN}
+	make_desktop_entry ${PN}
+
+	dohtml README.html
+
+	fperms +x "${MYGAMEDIR}"/bin/${PN}
+	prepgamesdirs
+}
diff --git a/games-action/teeworlds-0.6.4 b/games-action/teeworlds-0.6.4
deleted file mode 100644
index 476bb64c676d..000000000000
--- a/games-action/teeworlds-0.6.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=!dedicated? ( app-arch/bzip2 media-libs/freetype media-libs/libsdl[X,sound,opengl,video] media-libs/pnglite media-sound/wavpack virtual/glu virtual/opengl x11-libs/libX11 ) sys-libs/zlib || ( >=dev-lang/python-2.7.5-r2:2.7 ) ~dev-util/bam-0.4.0
-DESCRIPTION=Online multi-player platform 2D shooter
-EAPI=6
-HOMEPAGE=https://www.teeworlds.com/
-IUSE=debug dedicated
-KEYWORDS=~amd64 ~x86
-LICENSE=ZLIB
-RDEPEND=!dedicated? ( app-arch/bzip2 media-libs/freetype media-libs/libsdl[X,sound,opengl,video] media-libs/pnglite media-sound/wavpack virtual/glu virtual/opengl x11-libs/libX11 ) sys-libs/zlib
-SLOT=0
-SRC_URI=https://downloads.teeworlds.com/teeworlds-0.6.4-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0c528177eb35a78876c51175e2fabbfa
diff --git a/games-action/teeworlds/Manifest b/games-action/teeworlds/Manifest
new file mode 100644
index 000000000000..60fff8a5150f
--- /dev/null
+++ b/games-action/teeworlds/Manifest
@@ -0,0 +1,11 @@
+AUX 0.6/01-use-system-wavpack.patch 3182 BLAKE2B 814d3876e2657d636b2c9ae59fccfaab45e05918becde06aeba7154bb9a124d51cd6be20381355e73662d227e1d0985d35360ccf6308d1776ebcf3aca35025c0 SHA512 2210a018c3917b78109e31b3fa51a292c5c3714371880d2b9ce10de4cde999f014ff44555fa657fed78d961dbada2511601b3aa8e9356eb34de187f24b16dbad
+AUX 0.6/02-fixed-wavpack-sound-loading.patch 2916 BLAKE2B a2990c8feb143391c317d7b8ba3ef972bcbd8275f5ddec05a150fcefcdd4afd3fb0c3621bfac900b024fbbf85108f9ed7ee0b42ed38044b3e8f6b2142a3963f5 SHA512 9cada7356b588a220dba4a0c104a28738969c7755c80f9e9f10c4bf1f57ae1b6ea64c084aa012410de135fed0267e0e7ab8375137f2f16aba2d81c0441de2e8a
+AUX 0.6/03-use-system-pnglite.patch 5703 BLAKE2B 298668b9f592fbd9c5a6fbb0b1d12f5c13d3433dbb44018c987b1eb4f52b0bf2b4ad5cb0495f28870bf101ca9c5fc0464f85d53d62c2e80c03463ba8071173c2 SHA512 c069fc15de002b9e3f01bf9a36e40396aa62158bec1bb70a2dae6fbbace07299c298854319f80141d26e34b49dd270b9478383c55eb4b7e8873aedd323eb412b
+AUX 0.6/04-dedicated.patch 491 BLAKE2B 26504d5668b94b0e2010b02805f51f608414087e5df8a67d56ad5a5e41d47848fd1e6916137a2a6c12b328020c7592faa404d4c40f933622aef1dc0189faafae SHA512 c292b638e58e69fcf6b273617fc43cc4c8d96ffe4c75ad7911c1b319a129de6c01255f988569a0532b8e6c29f775ececc679274f7f85c6a9933bf713620ab8fb
+AUX 0.6/05-cc-cflags.patch 482 BLAKE2B 03059f30af2e1bc74c141ea0b8a1d0f53d324e29a3e0b1f89c96302abc63710ae35740c430ab234b6a8119d76ef71c753a703c9ee350fe788333294117472fd1 SHA512 92b74845413c20cf4626cb89b8b825bc5cb2f25e9af1d61d2ecabbda3acf024ee0c5e03abf8de2b57d6a8c739a8cf343fcb109a3a72d4baa016711e53368d0f8
+AUX teeworlds-init.d 1000 BLAKE2B 7681574d8e35583ea029b604925fa0ed3af50dafb17993e7315b2c9ff6bb83ecbe788e9745851d7763fd74018ef5ec222ba5b4a65c3b57ed0be2c7ae5b3e8b5a SHA512 01d39e8a0b5991000d336a4d51f8b61e296c0c9fce7b4247d24007b119c9c7a863e284e670b6286923a1e22fd25c4a171d20846feacea34bcc0c4d33120e98bd
+AUX teeworlds.xpm 2785 BLAKE2B 288e6fe273e38d802c102403f5e70d0a2c004bba28c3c1744f0a5f3d77168cc76dccf8039b9eca761d159cf7c1d127755171cc313ef3d614a195d9858426700a SHA512 f8a8a1c3a5675f12b13ddaf9b68bc2757698725d406356c871d58e62f735413b5f4f0bcb3dbf783e0aa6b3ecb0ec7f9eddbcef044506a6a07a374fe46d2616c0
+AUX teeworlds_srv.cfg 193 BLAKE2B dbbad582189f5b098e9f199dc59227ef90485e7a1bc406372d69f9985ee5a7fe39db68c52d8eb394a1c6e1320496925fa8c5474dd91204bf6e93787c2c0ba838 SHA512 d9a55f749f6974caddf96438eb38e490e0e507fbe07ebdac070fe91ab46eed93afb5dd6300a5b7a86b6282c6b97fdd178a00720483c3e71490be816b8c6a73b5
+DIST teeworlds-0.6.4-src.tar.gz 8771622 BLAKE2B 14493fcad458b0e1c749e40bdd6a5a858704bf971d53d11782d52fbe9b5fe2a09235dcac25340e51a3330001d46ee512f2971e8db06eb9f51eec5e6b3cd2a328 SHA512 7546ee358a2126339f6c727bb7b5f49009a8fad0b5e77a796202cba4d8fc5dfcaf79b7e65151d85fead2a70ad61ef3e1888b8c07fe0206f87575d5dd8c9f91ce
+EBUILD teeworlds-0.6.4.ebuild 2391 BLAKE2B 83f8fe3b44e3bc40d93dadbe98aa38fb36e38963dd20394673d197f194ed23a8e6f7c7edc914c1f37ee48d339f7195530e608335aef639d850c64d61261c718a SHA512 214e0c0a4210ab302d48db14424d24c6444d3df6a1dda576ab084d8017a3898fcb6558da320717ca0a679e4e586638f83dfb3710da24dc30d5cfbe69b83cdbb3
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-action/teeworlds/files/0.6/01-use-system-wavpack.patch b/games-action/teeworlds/files/0.6/01-use-system-wavpack.patch
new file mode 100644
index 000000000000..4a11a866511d
--- /dev/null
+++ b/games-action/teeworlds/files/0.6/01-use-system-wavpack.patch
@@ -0,0 +1,101 @@
+commit 7202b142891ee10771af9f1f3063664d75a38bbc
+Author: hasufell <hasufell@gentoo.org>
+Date:   Thu Sep 5 12:28:30 2013 +0200
+
+    Use system wavpack. Based on patch from Gentoo Bugzilla
+    
+    From: Azamat H. Hackimov <azamat.hackimov@gmail.com>
+    
+    https://bugs.gentoo.org/show_bug.cgi?id=363395
+
+diff --git a/bam.lua b/bam.lua
+index 11ac7b9..35c1d8d 100644
+--- a/bam.lua
++++ b/bam.lua
+@@ -11,6 +11,7 @@ config:Add(OptTestCompileC("stackprotector", "int main(){return 0;}", "-fstack-p
+ config:Add(OptTestCompileC("minmacosxsdk", "int main(){return 0;}", "-mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk"))
+ config:Add(OptTestCompileC("macosxppc", "int main(){return 0;}", "-arch ppc"))
+ config:Add(OptLibrary("zlib", "zlib.h", false))
++config:Add(OptLibrary("wavpack", "wavpack/wavpack.h", false))
+ config:Add(SDL.OptFind("sdl", true))
+ config:Add(FreeType.OptFind("freetype", true))
+ config:Finalize("config.lua")
+@@ -187,7 +188,7 @@ function build(settings)
+ 	end
+ 
+ 	-- compile zlib if needed
+-	if config.zlib.value == 1 then
++	if config.zlib.value == true then
+ 		settings.link.libs:Add("z")
+ 		if config.zlib.include_path then
+ 			settings.cc.includes:Add(config.zlib.include_path)
+@@ -198,8 +199,18 @@ function build(settings)
+ 		settings.cc.includes:Add("src/engine/external/zlib")
+ 	end
+ 
++	if config.wavpack.value == true then
++		settings.link.libs:Add("wavpack")
++		if config.wavpack.include_path then
++			settings.cc.includes:Add(config.wavpack.include_path)
++		end
++		wavpack = {}
++	else
++		wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c"))
++		settings.cc.includes:Add("src/engine/external/") --The header is wavpack/wavpack.h so include the external folder
++	end
++
+ 	-- build the small libraries
+-	wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c"))
+ 	pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))
+ 
+ 	-- build game components
+diff --git a/src/engine/client/sound.cpp b/src/engine/client/sound.cpp
+index 343fa2e..e32cac9 100644
+--- a/src/engine/client/sound.cpp
++++ b/src/engine/client/sound.cpp
+@@ -13,7 +13,7 @@
+ #include "sound.h"
+ 
+ extern "C" { // wavpack
+-	#include <engine/external/wavpack/wavpack.h>
++	#include <wavpack/wavpack.h>
+ }
+ #include <math.h>
+ 
+@@ -351,19 +351,25 @@ int CSound::LoadWV(const char *pFilename)
+ 	if(!m_pStorage)
+ 		return -1;
+ 
++	#ifndef WAVPACK_H
+ 	ms_File = m_pStorage->OpenFile(pFilename, IOFLAG_READ, IStorage::TYPE_ALL);
+ 	if(!ms_File)
+ 	{
+ 		dbg_msg("sound/wv", "failed to open file. filename='%s'", pFilename);
+ 		return -1;
+ 	}
++	#endif
+ 
+ 	SampleID = AllocID();
+ 	if(SampleID < 0)
+ 		return -1;
+ 	pSample = &m_aSamples[SampleID];
+ 
++	#ifndef WAVPACK_H
+ 	pContext = WavpackOpenFileInput(ReadData, aError);
++	#else
++	pContext = WavpackOpenFileInput(pFilename, aError, 0, 0);
++	#endif
+ 	if (pContext)
+ 	{
+ 		int m_aSamples = WavpackGetNumSamples(pContext);
+@@ -419,8 +425,10 @@ int CSound::LoadWV(const char *pFilename)
+ 		dbg_msg("sound/wv", "failed to open %s: %s", pFilename, aError);
+ 	}
+ 
++	#ifndef WAVPACK_H
+ 	io_close(ms_File);
+ 	ms_File = NULL;
++	#endif
+ 
+ 	if(g_Config.m_Debug)
+ 		dbg_msg("sound/wv", "loaded %s", pFilename);
diff --git a/games-action/teeworlds/files/0.6/02-fixed-wavpack-sound-loading.patch b/games-action/teeworlds/files/0.6/02-fixed-wavpack-sound-loading.patch
new file mode 100644
index 000000000000..e207a4a354bf
--- /dev/null
+++ b/games-action/teeworlds/files/0.6/02-fixed-wavpack-sound-loading.patch
@@ -0,0 +1,109 @@
+commit b96981f5f23b4269108afb465f29a23abbd32ae2
+Author: hasufell <hasufell@gentoo.org>
+Date:   Thu Sep 5 12:31:19 2013 +0200
+
+    Fixing wavpack sound loading. Based on Gentoo Bugzilla
+    
+    From: Azamat H. Hackimov <azamat.hackimov@gmail.com>
+    
+    https://bugs.gentoo.org/show_bug.cgi?id=363395
+
+diff --git a/src/engine/client/sound.cpp b/src/engine/client/sound.cpp
+index e32cac9..2a4c653 100644
+--- a/src/engine/client/sound.cpp
++++ b/src/engine/client/sound.cpp
+@@ -51,6 +51,55 @@ struct CVoice
+ 	int m_X, m_Y;
+ } ;
+ 
++#ifdef WAVPACK_H
++static int32_t ReadBytes(void *pFile, void *pBuffer, int32_t Size)
++{
++	return (int32_t)io_read((IOHANDLE)pFile, pBuffer, Size);
++}
++static uint32_t GetPos(void *pFile)
++{
++	return (uint32_t)io_tell((IOHANDLE)pFile);
++}
++static int SetPosAbs(void *pFile, uint32_t Offset)
++{
++	return io_seek((IOHANDLE)pFile, Offset, IOSEEK_START);
++}
++static int SetPosRel(void *pFile, int32_t Offset, int Mode)
++{
++	switch(Mode)
++	{
++	case SEEK_SET:
++		Mode = IOSEEK_START;
++		break;
++	case SEEK_CUR:
++		Mode = IOSEEK_CUR;
++		break;
++	case SEEK_END:
++		Mode = IOSEEK_END;
++	}
++	return io_seek((IOHANDLE)pFile, Offset, Mode);
++}
++
++//TODO: Fix if 'real' functionality is needed by the wavpack header
++static int PushBackByte(void *pFile, int Char)
++{
++	return io_seek((IOHANDLE)pFile, -1, IOSEEK_CUR);
++}
++static uint32_t GetLength(void *pFile)
++{
++	return (uint32_t)io_length((IOHANDLE)pFile);
++}
++// Essentially assuming this to always be true, should fix if this isn't the case
++static int CanSeek(void *pFile)
++{
++	return pFile != NULL;
++}
++static WavpackStreamReader CWavpackReader  = {
++    ReadBytes, GetPos, SetPosAbs, SetPosRel, PushBackByte, GetLength, CanSeek, 0
++};
++#endif
++
++
+ static CSample m_aSamples[NUM_SAMPLES] = { {0} };
+ static CVoice m_aVoices[NUM_VOICES] = { {0} };
+ static CChannel m_aChannels[NUM_CHANNELS] = { {255, 0} };
+@@ -351,14 +400,12 @@ int CSound::LoadWV(const char *pFilename)
+ 	if(!m_pStorage)
+ 		return -1;
+ 
+-	#ifndef WAVPACK_H
+ 	ms_File = m_pStorage->OpenFile(pFilename, IOFLAG_READ, IStorage::TYPE_ALL);
+ 	if(!ms_File)
+ 	{
+ 		dbg_msg("sound/wv", "failed to open file. filename='%s'", pFilename);
+ 		return -1;
+ 	}
+-	#endif
+ 
+ 	SampleID = AllocID();
+ 	if(SampleID < 0)
+@@ -368,7 +415,7 @@ int CSound::LoadWV(const char *pFilename)
+ 	#ifndef WAVPACK_H
+ 	pContext = WavpackOpenFileInput(ReadData, aError);
+ 	#else
+-	pContext = WavpackOpenFileInput(pFilename, aError, 0, 0);
++	pContext = WavpackOpenFileInputEx(&CWavpackReader, ms_File, 0, aError, 0, 0);
+ 	#endif
+ 	if (pContext)
+ 	{
+@@ -422,13 +469,11 @@ int CSound::LoadWV(const char *pFilename)
+ 	}
+ 	else
+ 	{
+-		dbg_msg("sound/wv", "failed to open %s: %s", pFilename, aError);
++		dbg_msg("sound/wv", "failed to open '%s': %s", pFilename, aError);
+ 	}
+ 
+-	#ifndef WAVPACK_H
+ 	io_close(ms_File);
+ 	ms_File = NULL;
+-	#endif
+ 
+ 	if(g_Config.m_Debug)
+ 		dbg_msg("sound/wv", "loaded %s", pFilename);
diff --git a/games-action/teeworlds/files/0.6/03-use-system-pnglite.patch b/games-action/teeworlds/files/0.6/03-use-system-pnglite.patch
new file mode 100644
index 000000000000..81c3d915316b
--- /dev/null
+++ b/games-action/teeworlds/files/0.6/03-use-system-pnglite.patch
@@ -0,0 +1,160 @@
+commit 291a375000ac8d9cd5548a863ea6b49c46cfb1bb
+Author: hasufell <hasufell@gentoo.org>
+Date:   Thu Sep 5 12:36:53 2013 +0200
+
+    Use system pnglite. Based on Gentoo Bugzilla
+    
+    From: Azamat H. Hackimov <azamat.hackimov@gmail.com>
+    
+    https://bugs.gentoo.org/show_bug.cgi?id=363395
+
+diff --git a/bam.lua b/bam.lua
+index 35c1d8d..7902a2c 100644
+--- a/bam.lua
++++ b/bam.lua
+@@ -11,6 +11,7 @@ config:Add(OptTestCompileC("stackprotector", "int main(){return 0;}", "-fstack-p
+ config:Add(OptTestCompileC("minmacosxsdk", "int main(){return 0;}", "-mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk"))
+ config:Add(OptTestCompileC("macosxppc", "int main(){return 0;}", "-arch ppc"))
+ config:Add(OptLibrary("zlib", "zlib.h", false))
++config:Add(OptLibrary("pnglite", "pnglite.h", false))
+ config:Add(OptLibrary("wavpack", "wavpack/wavpack.h", false))
+ config:Add(SDL.OptFind("sdl", true))
+ config:Add(FreeType.OptFind("freetype", true))
+@@ -199,26 +200,34 @@ function build(settings)
+ 		settings.cc.includes:Add("src/engine/external/zlib")
+ 	end
+ 
++	-- build game components
++	engine_settings = settings:Copy()
++	server_settings = engine_settings:Copy()
++	client_settings = engine_settings:Copy()
++	launcher_settings = engine_settings:Copy()
++
++	if config.pnglite.value == true then
++		client_settings.link.libs:Add("pnglite")
++		if config.pnglite.include_path then
++			client_settings.cc.includes:Add(config.pnglite.include_path)
++		end
++		pnglite = {}
++	else
++		pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))
++		client_settings.cc.includes:Add("src/engine/external/pnglite")
++	end
++
+ 	if config.wavpack.value == true then
+-		settings.link.libs:Add("wavpack")
++		client_settings.link.libs:Add("wavpack")
+ 		if config.wavpack.include_path then
+-			settings.cc.includes:Add(config.wavpack.include_path)
++			client_settings.cc.includes:Add(config.wavpack.include_path)
+ 		end
+ 		wavpack = {}
+ 	else
+ 		wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c"))
+-		settings.cc.includes:Add("src/engine/external/") --The header is wavpack/wavpack.h so include the external folder
++		client_settings.cc.includes:Add("src/engine/external/") --The header is wavpack/wavpack.h so include the external folder
+ 	end
+ 
+-	-- build the small libraries
+-	pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))
+-
+-	-- build game components
+-	engine_settings = settings:Copy()
+-	server_settings = engine_settings:Copy()
+-	client_settings = engine_settings:Copy()
+-	launcher_settings = engine_settings:Copy()
+-
+ 	if family == "unix" then
+ 		if platform == "macosx" then
+ 			client_settings.link.frameworks:Add("OpenGL")
+diff --git a/src/engine/client/graphics.cpp b/src/engine/client/graphics.cpp
+index 2e8a855..97e4fd7 100644
+--- a/src/engine/client/graphics.cpp
++++ b/src/engine/client/graphics.cpp
+@@ -9,7 +9,7 @@
+ #include "SDL_opengl.h"
+ 
+ #include <base/system.h>
+-#include <engine/external/pnglite/pnglite.h>
++#include <pnglite.h>
+ 
+ #include <engine/shared/config.h>
+ #include <engine/graphics.h>
+diff --git a/src/engine/client/graphics_threaded.cpp b/src/engine/client/graphics_threaded.cpp
+index e34b725..60246d1 100644
+--- a/src/engine/client/graphics_threaded.cpp
++++ b/src/engine/client/graphics_threaded.cpp
+@@ -6,7 +6,7 @@
+ #include <base/tl/threading.h>
+ 
+ #include <base/system.h>
+-#include <engine/external/pnglite/pnglite.h>
++#include <pnglite.h>
+ 
+ #include <engine/shared/config.h>
+ #include <engine/graphics.h>
+diff --git a/src/tools/dilate.cpp b/src/tools/dilate.cpp
+index 55094a5..42a5b83 100644
+--- a/src/tools/dilate.cpp
++++ b/src/tools/dilate.cpp
+@@ -2,7 +2,7 @@
+ /* If you are missing that file, acquire a complete release at teeworlds.com.                */
+ #include <base/system.h>
+ #include <base/math.h>
+-#include <engine/external/pnglite/pnglite.h>
++#include <pnglite.h>
+ 
+ typedef struct
+ {
+diff --git a/src/tools/tileset_borderadd.cpp b/src/tools/tileset_borderadd.cpp
+index 25e2fa5..88f760a 100644
+--- a/src/tools/tileset_borderadd.cpp
++++ b/src/tools/tileset_borderadd.cpp
+@@ -2,7 +2,7 @@
+ /* If you are missing that file, acquire a complete release at teeworlds.com.                */
+ #include <base/math.h>
+ #include <base/system.h>
+-#include <engine/external/pnglite/pnglite.h>
++#include <pnglite.h>
+ 
+ typedef struct
+ {
+diff --git a/src/tools/tileset_borderfix.cpp b/src/tools/tileset_borderfix.cpp
+index 0facb9a..ab36292 100644
+--- a/src/tools/tileset_borderfix.cpp
++++ b/src/tools/tileset_borderfix.cpp
+@@ -1,7 +1,7 @@
+ /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
+ /* If you are missing that file, acquire a complete release at teeworlds.com.                */
+ #include <base/system.h>
+-#include <engine/external/pnglite/pnglite.h>
++#include <pnglite.h>
+ 
+ typedef struct
+ {
+diff --git a/src/tools/tileset_borderrem.cpp b/src/tools/tileset_borderrem.cpp
+index d604ecb..8673e41 100644
+--- a/src/tools/tileset_borderrem.cpp
++++ b/src/tools/tileset_borderrem.cpp
+@@ -2,7 +2,7 @@
+ /* If you are missing that file, acquire a complete release at teeworlds.com.                */
+ #include <base/math.h>
+ #include <base/system.h>
+-#include <engine/external/pnglite/pnglite.h>
++#include <pnglite.h>
+ 
+ typedef struct
+ {
+diff --git a/src/tools/tileset_borderset.cpp b/src/tools/tileset_borderset.cpp
+index 8b3e299..c762ee2 100644
+--- a/src/tools/tileset_borderset.cpp
++++ b/src/tools/tileset_borderset.cpp
+@@ -2,7 +2,7 @@
+ /* If you are missing that file, acquire a complete release at teeworlds.com.                */
+ #include <base/math.h>
+ #include <base/system.h>
+-#include <engine/external/pnglite/pnglite.h>
++#include <pnglite.h>
+ 
+ typedef struct
+ {
diff --git a/games-action/teeworlds/files/0.6/04-dedicated.patch b/games-action/teeworlds/files/0.6/04-dedicated.patch
new file mode 100644
index 000000000000..fc61b71283b6
--- /dev/null
+++ b/games-action/teeworlds/files/0.6/04-dedicated.patch
@@ -0,0 +1,15 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun Sep  8 11:05:26 UTC 2013
+Subject: fix DATADIR detection for minimal setups
+
+--- a/src/engine/shared/storage.cpp
++++ b/src/engine/shared/storage.cpp
+@@ -208,7 +208,7 @@
+ 			for (i = 0; i < DirsCount; i++)
+ 			{
+ 				char aBuf[128];
+-				str_format(aBuf, sizeof(aBuf), "%s/mapres", aDirs[i]);
++				str_format(aBuf, sizeof(aBuf), "%s/maps", aDirs[i]);
+ 				if(fs_is_dir(aBuf))
+ 				{
+ 					str_copy(m_aDatadir, aDirs[i], sizeof(m_aDatadir));
diff --git a/games-action/teeworlds/files/0.6/05-cc-cflags.patch b/games-action/teeworlds/files/0.6/05-cc-cflags.patch
new file mode 100644
index 000000000000..dec6b8d306fc
--- /dev/null
+++ b/games-action/teeworlds/files/0.6/05-cc-cflags.patch
@@ -0,0 +1,18 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun Sep  8 12:25:19 UTC 2013
+Subject: respect our gentoo settings
+
+	this has to be at this place or later
+	otherwise some of our settings would be overwritten
+
+--- a/bam.lua
++++ b/bam.lua
+@@ -168,6 +168,8 @@
+ 	-- set some platform specific settings
+ 	settings.cc.includes:Add("src")
+ 
++	dofile("gentoo.lua") addSettings(settings)
++
+ 	if family == "unix" then
+ 		if platform == "macosx" then
+ 			settings.link.frameworks:Add("Carbon")
diff --git a/games-action/teeworlds/files/teeworlds-init.d b/games-action/teeworlds/files/teeworlds-init.d
new file mode 100644
index 000000000000..fa1a95831ff5
--- /dev/null
+++ b/games-action/teeworlds/files/teeworlds-init.d
@@ -0,0 +1,40 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PIDFILE=/var/run/teeworlds.pid
+GAME_DIRECTORY=/usr/games/bin
+CONFIG=/etc/teeworlds/teeworlds_srv.cfg
+
+depend() {
+	use dns logger net
+}
+
+checkconfig() {
+        if [ ! -e ${CONFIG} ] ; then
+                eerror "You need an ${CONFIG} config file to run TeeWorlds"
+                return 1
+        fi
+}
+
+start() {
+	ebegin "Starting TeeWorlds"
+	start-stop-daemon --start --background --pidfile "${PIDFILE}" \
+		--make-pidfile -d ${GAME_DIRECTORY} --user games \
+		--exec ${GAME_DIRECTORY}/teeworlds_srv -- -f ${CONFIG}
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading TeeWorlds configs and restarting processes"
+	start-stop-daemon --stop --oknodo --user games \
+    		--pidfile "${PIDFILE}" --signal HUP \
+		--exec ${GAME_DIRECTORY}/teeworlds_srv -- -f ${CONFIG}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping TeeWorlds"
+	start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
+	eend $?
+}
diff --git a/games-action/teeworlds/files/teeworlds.xpm b/games-action/teeworlds/files/teeworlds.xpm
new file mode 100644
index 000000000000..76e30166dd35
--- /dev/null
+++ b/games-action/teeworlds/files/teeworlds.xpm
@@ -0,0 +1,66 @@
+/* XPM */
+static char *teeworlds__[] = {
+/* columns rows colors chars-per-pixel */
+"48 48 12 1",
+"  c #000000",
+". c #800000",
+"X c #FF0000",
+"o c #008000",
+"O c #808000",
+"+ c #FFFF00",
+"@ c #000080",
+"# c #800080",
+"$ c #008080",
+"% c #808080",
+"& c #C0C0C0",
+"* c None",
+/* pixels */
+"*********************%%.%%%*********************",
+"*****************%            %*****************",
+"***************     .%O%OOO.     ***************",
+"*************   ..%+&++++++++&O   @*************",
+"***********%   O&&++++++++++++++%   ************",
+"**********O  .+&&+++++++++++++++++O  %**********",
+"*********@  O&&&+++++++++++++++++++%  %*********",
+"********  .O&+++++++++++++++++++++++%  %********",
+"*******%  O+&++++++++++++++++++++++++%  ********",
+"*******  O+&&+++++++++++++++++++++++++%  *******",
+"******  O+X&+++++++++++++++++++++++++++O .******",
+"*****% .OX++++++++++++++++++++++++++++++  ******",
+"*****  .++++++++++++   +++++O@ ++++++++++  *****",
+"****%  ++X+++++++++     +++O  . +++++++++  *****",
+"****  O+X++++++++++     +++     +++++++++O %****",
+"****  X++X+++++++++     +++     ++++++++++  ****",
+"****  ++X+&++++++++     +++     ++++++++++  ****",
+"***% .+X+O+++++++++     +++     ++++++++++O ****",
+"***% O++X+&++++++++     +++     ++++++++++% %***",
+"***  O+X+++++++++++     +++O    ++++++++++O %***",
+"***  OX+X+X+++++++++   +++++   +++++++++++& .***",
+"***  ++++X+&++++++++++++++++++++++++++++++O $***",
+"***  OX+X++%++++++++++++++++++++++++++++++% .***",
+"***  O+O++X+++++++++++++++++++++++++++++++% %***",
+"***  O+X+X+++++++++++++++++++++++++++++++&O %***",
+"***% .+O++X+X+++++++++++++++++++++++++++++  ****",
+"****  +X+X+++%+++++++++++++++++++++++++++&  ****",
+"****  O++O+OX+&++++++++++++++++++++++++++%  ****",
+"****% .+X+X++++&+++++++++++++++++++++++++. %****",
+"*****  O+O+X+OX+&+++++++++++++++++++++++%  *****",
+"*****  O+X++X+++++++++++++++++++++++++++@ %*****",
+"******  OO+X++X+X++++++++++++++++++++++%  ******",
+"******%  ++O+X++O+++++++++++++++++++++&  %******",
+"*******  .O o   .O.O+&+++++++++++++++&. %*******",
+"******%    O.OOO#o.  OO+&+++++++++++&.  ********",
+"*****%  .O+X&X+X+X%+.  OX++&+&+&X+X+     *******",
+"*****  .%OX+O+%O+&+X&+O oO+X+X++++O .OO   ******",
+"****% .OO+%+&X+&+X+%+X&X .+O++X+O. #%+X+.  *****",
+"****  O+X+X+X+%+X&++%+O+% O+X+OO .O+X+&OO. *****",
+"****  OX+%+O%+%+%+&X+&X+XO OO  .O%+%+%X+%O $****",
+"****  +OOX+X+X+X+X+%+X+%+.  ..O%X+X+X+%+X% .****",
+"****  OX+%+%+%+%+%+%+%+X+. O+%+O+%+%+%+X+O  ****",
+"****  OOX+X+X+X+OX+X+X+OO.OX+X+XOX+X+X+OO  %****",
+"****%  OOOOOOO+XO+OOOOO.  OOOOOO+OOOOOO.   %****",
+"*****                                     %*****",
+"*******                                .%*******",
+"***********%%%%%%%%%%%**%%%%%%%%%%%%************",
+"************************************************"
+};
diff --git a/games-action/teeworlds/files/teeworlds_srv.cfg b/games-action/teeworlds/files/teeworlds_srv.cfg
new file mode 100644
index 000000000000..dc675622c78b
--- /dev/null
+++ b/games-action/teeworlds/files/teeworlds_srv.cfg
@@ -0,0 +1,7 @@
+# sample Teeworlds server config file
+# see http://www.teeworlds.com/?page=docs&wiki=ServerSettings for details
+sv_gametype dm
+sv_map dm1
+sv_name gentoo-teeworlds
+sv_register 1
+sv_scorelimit 20
+\ No newline at end of file
diff --git a/games-action/teeworlds/metadata.xml b/games-action/teeworlds/metadata.xml
new file mode 100644
index 000000000000..26079e608bed
--- /dev/null
+++ b/games-action/teeworlds/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-action/teeworlds/teeworlds-0.6.4.ebuild b/games-action/teeworlds/teeworlds-0.6.4.ebuild
new file mode 100644
index 000000000000..e0a278459205
--- /dev/null
+++ b/games-action/teeworlds/teeworlds-0.6.4.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit eutils multiprocessing python-any-r1 toolchain-funcs versionator
+
+REVISION="b177-rff25472"
+
+DESCRIPTION="Online multi-player platform 2D shooter"
+HOMEPAGE="https://www.teeworlds.com/"
+SRC_URI="https://downloads.teeworlds.com/${P}-src.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug dedicated"
+
+RDEPEND="
+	!dedicated? (
+		app-arch/bzip2
+		media-libs/freetype
+		media-libs/libsdl[X,sound,opengl,video]
+		media-libs/pnglite
+		media-sound/wavpack
+		virtual/glu
+		virtual/opengl
+		x11-libs/libX11 )
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	~dev-util/bam-0.4.0"
+
+S=${WORKDIR}/${P}-src
+MY_PV=$(get_version_component_range 1-2)
+
+PATCHES=(
+	"${FILESDIR}/${MY_PV}/01-use-system-wavpack.patch"
+	"${FILESDIR}/${MY_PV}/02-fixed-wavpack-sound-loading.patch"
+	"${FILESDIR}/${MY_PV}/03-use-system-pnglite.patch"
+	"${FILESDIR}/${MY_PV}/04-dedicated.patch"
+	"${FILESDIR}/${MY_PV}/05-cc-cflags.patch"
+)
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	rm -r src/engine/external/* || die
+
+	cat <<- __EOF__ > "${S}/gentoo.lua"
+		function addSettings(settings)
+			print("Adding Gentoo settings")
+			settings.optimize = 0
+			settings.cc.exe_c = "$(tc-getCC)"
+			settings.cc.exe_cxx = "$(tc-getCXX)"
+			settings.cc.flags_c:Add("${CFLAGS}")
+			settings.cc.flags_cxx:Add("${CXXFLAGS}")
+			settings.link.exe = "$(tc-getCXX)"
+			settings.link.flags:Add("${LDFLAGS}")
+		end
+	__EOF__
+}
+
+src_configure() {
+	bam -v config || die
+}
+
+src_compile() {
+	local myopt
+
+	if use debug; then
+		myopt=" server_debug"
+	else
+		myopt=" server_release"
+	fi
+	if ! use dedicated; then
+		if use debug; then
+			myopt+=" client_debug"
+		else
+			myopt+=" client_release"
+		fi
+	fi
+
+	bam -v -a -j $(makeopts_jobs) ${myopt} || die
+}
+
+src_install() {
+	if use debug; then
+		newbin ${PN}_srv_d ${PN}_srv
+	else
+		dobin ${PN}_srv
+	fi
+	if ! use dedicated; then
+		if use debug; then
+			newbin ${PN}_d ${PN}
+		else
+			dobin ${PN}
+		fi
+
+		doicon "${FILESDIR}"/${PN}.xpm
+		make_desktop_entry ${PN} Teeworlds
+
+		insinto /usr/share/${PN}/data
+		doins -r data/*
+	else
+		insinto /usr/share/${PN}/data/maps
+		doins -r data/maps/*
+	fi
+	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
+	insinto "/etc/${PN}"
+	doins "${FILESDIR}"/teeworlds_srv.cfg
+
+	dodoc readme.txt
+}
diff --git a/games-action/towbowl-tactics-0.5 b/games-action/towbowl-tactics-0.5
deleted file mode 100644
index 1c3846a8814c..000000000000
--- a/games-action/towbowl-tactics-0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-libs/libxml2 media-libs/smpeg media-libs/libsdl[sound,video] media-libs/sdl-net media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer app-arch/unzip
-DESCRIPTION=Tow Bowl Tactics is a game based on Games Workshop's Blood Bowl
-EAPI=5
-HOMEPAGE=http://www.towbowltactics.com/index_en.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libxml2 media-libs/smpeg media-libs/libsdl[sound,video] media-libs/sdl-net media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer games-misc/games-envd
-SLOT=0
-SRC_URI=http://www.towbowltactics.com/download/tbt.0.5.src.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e2746b0fe435d327ed8055b605dbefb9
diff --git a/games-action/towbowl-tactics/Manifest b/games-action/towbowl-tactics/Manifest
new file mode 100644
index 000000000000..975ae76685ba
--- /dev/null
+++ b/games-action/towbowl-tactics/Manifest
@@ -0,0 +1,4 @@
+AUX towbowl-tactics-0.5-gentoo.patch 1731 BLAKE2B e7049005e54fb6f10f29fca09d42705f787dbb6c440b2b939b694b050219efaec8aaa8149c3247f8ffe1943bd678cb9b2d035eb86bda08f6496af7e32710e74e SHA512 3292a83b642f23f1549acdb53586a5ea0860b7ace4643cf42bb0248bdbf5a7c5b9f66fcd62e5d2432fb1ba5a029061215657a9d65932523e3dbd51f54843295d
+DIST tbt.0.5.src.zip 5321239 BLAKE2B 3391b2b0dd3a88eebfcec722d256720f262fde4ff64111467b53e02911f356cc7f388aad64c1a13bb1e64a59be8065259cd2fe0a1ea79366828a0c19456bb924 SHA512 930d7ba78210e0ad566989279e6d77235c61c641c18da36618de36fcd82d28dd8ca40516ce1384c2a000e4efe86584928cf9c7d2da5fb455f89d358653089f97
+EBUILD towbowl-tactics-0.5.ebuild 1260 BLAKE2B bfc2c1b8854244d95386b05d8f6fe0b671b7e7decfd83a4a640e04bb3a6fc1ee3126ba4971b4432b3f70572236a8e4c2d4cfb8a081a0e34379a0429a8ac0d52e SHA512 b413fd71b1eef923d8df547c3703cdd65a78a28a1a0e56f859f126e4de05656b97e1384af0051f3962bf644a12e3b5b536ffa4ee4336ee6e9f726af985cdf680
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/towbowl-tactics/files/towbowl-tactics-0.5-gentoo.patch b/games-action/towbowl-tactics/files/towbowl-tactics-0.5-gentoo.patch
new file mode 100644
index 000000000000..aa6a950e9a07
--- /dev/null
+++ b/games-action/towbowl-tactics/files/towbowl-tactics-0.5-gentoo.patch
@@ -0,0 +1,42 @@
+diff -ru tbt.orig/config.xml tbt/config.xml
+--- tbt.orig/config.xml	2003-02-01 15:14:56.000000000 -0500
++++ tbt/config.xml	2011-01-10 12:08:01.564649048 -0500
+@@ -5,5 +5,5 @@
+ <screen_h>600</screen_h>
+ <sound_enabled>1</sound_enabled>
+ <video_enabled>1</video_enabled>
+-<language>0</language>
++<language>1</language>
+ </config>
+diff -ru tbt.orig/src/Makefile tbt/src/Makefile
+--- tbt.orig/src/Makefile	2003-02-01 15:07:40.000000000 -0500
++++ tbt/src/Makefile	2011-01-10 12:07:29.075274834 -0500
+@@ -1,24 +1,20 @@
+ TBTHOME = /usr/local/games/tbt
+ INCDIR = -I /usr/include/smpeg -I /usr/include/libxml2 -I /usr/include/SDL/ 
+-CFLAGS = -O2 -g -fno-strength-reduce -Wall -W -DTBTHOME=\"$(TBTHOME)\" 
+-LFLAGS = -L. -lm -lSDL -lSDL_net -lSDL_image -lSDL_mixer -ldl -pthread -lxml2 -lsmpeg
+-CC     = g++
++CXXFLAGS += -DTBTHOME=\"$(TBTHOME)\"
++LIBS = -lm -lSDL -lSDL_net -lSDL_image -lSDL_mixer -ldl -pthread -lxml2 -lsmpeg
+ SOURCES = movies.cpp sounds.cpp SFont.cpp Ball.cpp CON_console.cpp CON_consolecommands.cpp CON_internal.cpp Config.cpp Console.cpp DT_drawtext.cpp DialogBox.cpp Dice.cpp Formation.cpp Main.cpp MoviePlayer.cpp NetClient.cpp NetServer.cpp Network.cpp Path.cpp Player.cpp ProgressBar.cpp Public.cpp Screen.cpp Shared.cpp SoundPlayer.cpp Square.cpp State.cpp Team.cpp Transformation.cpp Translator.cpp XmlParser.cpp dir_func.cpp 
+ OBJS = $(patsubst %.c,%.o,$(SOURCES:%.cpp=%.o))
+ PRGM = tbt
+ 
+ .SUFFIXES: .cpp .c
+ 
+-.c.o: 
+-	$(CC) -c $< $(CFLAGS) $(INCDIR) -o $@
+-
+ .cpp.o: 
+-	$(CC) -c $< $(CFLAGS) $(INCDIR) -o $@
++	$(CXX) -c $< $(CXXFLAGS) $(INCDIR) -o $@
+ 
+ all: $(PRGM)
+ 
+ $(PRGM): $(OBJS)
+-	$(CC) $(OBJS) -o $(PRGM) $(LFLAGS)
++	$(CXX) $(OBJS) -o $(PRGM) $(LDFLAGS) $(LIBS)
+ 
+ clean:
+ 	-rm -f $(PRGM) *core *~ *.o
diff --git a/games-action/towbowl-tactics/metadata.xml b/games-action/towbowl-tactics/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-action/towbowl-tactics/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-action/towbowl-tactics/towbowl-tactics-0.5.ebuild b/games-action/towbowl-tactics/towbowl-tactics-0.5.ebuild
new file mode 100644
index 000000000000..68970fe0ac94
--- /dev/null
+++ b/games-action/towbowl-tactics/towbowl-tactics-0.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils games
+
+DESCRIPTION="Tow Bowl Tactics is a game based on Games Workshop's Blood Bowl"
+HOMEPAGE="http://www.towbowltactics.com/index_en.html"
+SRC_URI="http://www.towbowltactics.com/download/tbt.${PV}.src.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/libxml2
+	media-libs/smpeg
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-net
+	media-libs/sdl-image[jpeg,png]
+	media-libs/sdl-mixer"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/tbt/src
+
+src_prepare() {
+	cd  ..
+	edos2unix $(find src -type f) config.xml
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	sed -i \
+	    -e "/^TBTHOME/ s:/.*:${GAMES_DATADIR}/tbt:" \
+		src/Makefile || die
+	sed -i \
+		-e "/tbt.ico/ s:\"\./:TBTHOME \"/:" \
+		src/Main.cpp || die
+	sed -i \
+		-e "s:TBTHOME \"/config.xml:\"${GAMES_SYSCONFDIR}/tbt/config.xml:g" \
+		src/global.h || die
+}
+
+src_install() {
+	dogamesbin tbt
+	dodir "${GAMES_DATADIR}/tbt"
+	cp -r ../data ../tbt.ico "${D}${GAMES_DATADIR}/tbt" || die
+	insinto "${GAMES_SYSCONFDIR}/tbt"
+	doins ../config.xml
+	newicon ../data/images/panel/turn.png ${PN}.png
+	make_desktop_entry tbt "Tow Bowl Tactics"
+	prepgamesdirs
+}
diff --git a/games-action/transcend-0.3-r1 b/games-action/transcend-0.3-r1
deleted file mode 100644
index b0bc3ddeba5f..000000000000
--- a/games-action/transcend-0.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=media-libs/freeglut media-libs/portaudio x11-libs/libXi x11-libs/libXmu virtual/glu virtual/opengl
-DESCRIPTION=Retro-style, abstract, 2D shooter
-EAPI=6
-HOMEPAGE=http://transcend.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/freeglut media-libs/portaudio x11-libs/libXi x11-libs/libXmu virtual/glu virtual/opengl
-SLOT=0
-SRC_URI=mirror://sourceforge/transcend/Transcend_0.3_UnixSource.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_=b64e322c82587340dfb3dddd04ad1ec2
diff --git a/games-action/transcend/Manifest b/games-action/transcend/Manifest
new file mode 100644
index 000000000000..d836e1f95a62
--- /dev/null
+++ b/games-action/transcend/Manifest
@@ -0,0 +1,4 @@
+AUX transcend-0.3-sound.patch 3101 BLAKE2B d110ec774487b1f1cf5a794fd9c675ad3dcbcc474cf55f79efde2946626da97d301c580b91089000bc1f0791e1bc98fdd35f2da12b66ba1afd3cf1d96cb15c66 SHA512 aa51287cb46fd55db9d7d213b135a099dd1d2cdf07f033143356571d06ad16dd8ba7dcd71b78e98430c9126ddcb5484fa63c82c9e26e1ca2d6de855cc55a293f
+DIST Transcend_0.3_UnixSource.tar.gz 1847261 BLAKE2B 7efeb33dc96744f20e53985f6704398f21c3a018272b743bb49305f966fb5e6a11c3d138383979fe4d85cd28aee6854971b0723aa106fec7b64fffe64d5d7b78 SHA512 5a2d21256c202ee045f8e2c926705f79885f6efbb5f44d3129e5b05cb1e28f909a32a5d873a9673d5fa48cbe4e79766c44947f147089e988e2fa3f83cde1b91d
+EBUILD transcend-0.3-r1.ebuild 1360 BLAKE2B 1331a5bed18f7daf84e547e1d550d148b654757536598bac95bfb1eac138da1522df9028987bd64df02eb1eea50d8f63b4aaad107aa3a41b087c1eb6e4d9253d SHA512 2f1415de806e104a0e69635b25b7c9549b7a7ec2349d5925fbd66bf23315751efcf431489c2931c0dc2585080249cce58e43e3aeabead00d417232ee8cae615b
+MISC metadata.xml 332 BLAKE2B eb4915a0b90e86986fde6d552bc1a132d5998ddb97bc37f8b597617bc234372797cdf1394dfbf68913fe002daea792108b97b637e1da51cb71f64d1d54814b2e SHA512 3af008eea1264d7db9571d88c2e63b767afb43881ab456844c448eedf9bf68577c4c0a27bb2559691b8c92482af38ead48036c8bd429df7489048053054ccdf9
diff --git a/games-action/transcend/files/transcend-0.3-sound.patch b/games-action/transcend/files/transcend-0.3-sound.patch
new file mode 100644
index 000000000000..836cd03754ad
--- /dev/null
+++ b/games-action/transcend/files/transcend-0.3-sound.patch
@@ -0,0 +1,89 @@
+Author: Barry deFreese <bdefreese@debian.org>
+Description: Build with portaudio19.
+--- a/game/SoundPlayer.h
++++ b/game/SoundPlayer.h
+@@ -204,7 +204,7 @@
+         double mMusicLoudness;
+         
+         
+-        PortAudioStream *mAudioStream;
++        PaStream *mAudioStream;
+ 
+         // realtime sounds that should be mixed into the next to-speaker call
+         SimpleVector<PlayableSound *> *mRealtimeSounds;
+--- a/game/SoundPlayer.cpp
++++ b/game/SoundPlayer.cpp
+@@ -47,9 +47,11 @@
+ 
+ 
+ // callback passed into portaudio
+-static int portaudioCallback( void *inputBuffer, void *outputBuffer,
++int portaudioCallback( const void *inputBuffer, void *outputBuffer,
+                               unsigned long framesPerBuffer,
+-                              PaTimestamp outTime, void *userData ) {
++                              const PaStreamCallbackTimeInfo *outTime,
++                              PaStreamCallbackFlags statusFlags,
++                              void *userData ) {
+ 
+ 
+     SoundPlayer *player = (SoundPlayer *)userData;
+@@ -147,21 +149,13 @@
+ 
+     if( error == paNoError ) {
+     
+-        error = Pa_OpenStream(
++        error = Pa_OpenDefaultStream(
+             &mAudioStream,
+-            paNoDevice,// default input device 
+             0,              // no input 
+-            paFloat32,  // 32 bit floating point input 
+-            NULL,
+-            Pa_GetDefaultOutputDeviceID(),
+             2,          // stereo output 
+             paFloat32,      // 32 bit floating point output 
+-            NULL,
+             mSampleRate,
+             1024,   // frames per buffer
+-            0,    // number of buffers, if zero then use default minimum 
+-            paClipOff, // we won't output out of range samples so
+-                       // don't bother clipping them 
+             portaudioCallback,
+             (void *)this );  // pass self-pointer to callback function
+         
+Description: Link to dynamic portaudio instead of static.
+Author: Miriam Ruiz <miriam@debian.org>
+--- a/Makefile.GnuLinuxX86
++++ b/Makefile.GnuLinuxX86
+@@ -22,7 +22,7 @@
+ 
+ # pthread library needed for linux
+ # also need portaudio library (which in turn needs pthreads)
+-PLATFORM_LINK_FLAGS = -L/usr/X11R6/lib -lGL -lglut -lGLU -lX11 -lXi -lXext -lXmu ${ROOT_PATH}/Transcend/portaudio/lib/libportaudio.a -lpthread
++PLATFORM_LINK_FLAGS = -L/usr/X11R6/lib -lGL -lglut -lGLU -lX11 -lXi -lXext -lXmu $(shell pkg-config portaudio-2.0 --libs)
+ 
+ 
+ # All platforms but OSX support g++ and need no linker hacks
+--- a/game/SoundPlayer.h
++++ b/game/SoundPlayer.h
+@@ -46,8 +46,7 @@
+ #include "SoundFilter.h"
+ #include "PlayableSound.h"
+ 
+-#include "Transcend/portaudio/pa_common/portaudio.h"
+-#include "Transcend/portaudio/pablio/pablio.h"
++#include <portaudio.h>
+ 
+ 
+ #include "minorGems/util/SimpleVector.h"
+--- a/game/SoundPlayerActive.h
++++ b/game/SoundPlayerActive.h
+@@ -16,8 +16,7 @@
+ 
+ #include "SoundSamples.h"
+ 
+-#include "Transcend/portaudio/pa_common/portaudio.h"
+-#include "Transcend/portaudio/pablio/pablio.h"
++#include <portaudio.h>
+ 
+ 
+ #include "minorGems/util/SimpleVector.h"
diff --git a/games-action/transcend/metadata.xml b/games-action/transcend/metadata.xml
new file mode 100644
index 000000000000..af830ea1122e
--- /dev/null
+++ b/games-action/transcend/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">transcend</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/transcend/transcend-0.3-r1.ebuild b/games-action/transcend/transcend-0.3-r1.ebuild
new file mode 100644
index 000000000000..5f95cff17b5f
--- /dev/null
+++ b/games-action/transcend/transcend-0.3-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="Retro-style, abstract, 2D shooter"
+HOMEPAGE="http://transcend.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/Transcend_${PV}_UnixSource.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	media-libs/freeglut
+	media-libs/portaudio
+	x11-libs/libXi
+	x11-libs/libXmu
+	virtual/glu
+	virtual/opengl"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/Transcend_${PV}_UnixSource/Transcend
+
+# Apply patch from Debian in order to get sound working. bug #372413
+PATCHES=(
+	"${FILESDIR}"/${P}-sound.patch
+)
+
+src_prepare() {
+	default
+
+	rm -rf game/Makefile portaudio/ || die
+	sed \
+		-e '/^GXX=/d' \
+		-e 's/GXX/CXX/' \
+		-e '/^COMPILE_FLAGS =/ s/OPTIMIZE_FLAG/CXXFLAGS/' \
+		-e '/^EXE_LINK =/ s/LINK_FLAGS/LDFLAGS/' \
+		Makefile.GnuLinuxX86 \
+		Makefile.common \
+		Makefile.minorGems \
+		game/Makefile.all \
+		Makefile.minorGems_targets \
+		> game/Makefile || die
+	sed -i \
+		-e "s:\"levels\":\"/usr/share/${PN}/levels\":" \
+		game/LevelDirectoryManager.cpp \
+		game/game.cpp || die
+}
+
+src_configure() { :; }
+
+src_compile() {
+	emake -C game
+}
+
+src_install() {
+	newbin game/Transcend ${PN}
+	insinto /usr/share/${PN}
+	doins -r levels/
+	dodoc doc/{how_to_play.txt,changeLog.txt}
+	make_desktop_entry ${PN} "Transcend"
+}
diff --git a/games-action/trine-1.08-r3 b/games-action/trine-1.08-r3
deleted file mode 100644
index d3607fbcd607..000000000000
--- a/games-action/trine-1.08-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare unpack
-DEPEND=app-admin/chrpath app-arch/unzip >=sys-apps/sed-4
-DESCRIPTION=A physics-based action game with character-dependent solutions to challenges
-EAPI=6
-HOMEPAGE=https://www.frozenbyte.com/games/trine-enchanted-edition
-IUSE=+launcher
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=frozenbyte-eula
-RDEPEND=media-gfx/nvidia-cg-toolkit >=media-libs/libsdl-1.2[opengl,video] >=media-libs/sdl-image-1.2 >=media-libs/sdl-ttf-2.0 >=media-libs/libvorbis-1.3 >=media-libs/openal-1.15 >=sys-devel/gcc-4.3.0 >=sys-libs/glibc-2.4 sys-libs/zlib x11-libs/gtk+:2 launcher? ( dev-libs/glib:2 gnome-base/libglade:2.0 )
-RESTRICT=bindist fetch strip
-SLOT=0
-SRC_URI=TrineUpdate4.64.run
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5f9e04e0f615f5ae156d2f44510e2a69
diff --git a/games-action/trine-enchanted-edition-2.12.508 b/games-action/trine-enchanted-edition-2.12.508
deleted file mode 100644
index 52a804828c94..000000000000
--- a/games-action/trine-enchanted-edition-2.12.508
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst
-DEPEND=app-arch/unzip >=sys-apps/sed-4
-DESCRIPTION=The original sidescrolling action platformer under the Trine 2 engine
-EAPI=6
-HOMEPAGE=https://www.frozenbyte.com/games/trine-enchanted-edition
-IUSE=+launcher
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=media-gfx/nvidia-cg-toolkit[abi_x86_32] media-libs/alsa-lib[abi_x86_32] media-libs/freetype:2[abi_x86_32] media-libs/libogg[abi_x86_32] >=media-libs/libvorbis-1.3[abi_x86_32] >=media-libs/openal-1.15[abi_x86_32] >=sys-devel/gcc-4.6[cxx] >=sys-libs/glibc-2.15 sys-libs/zlib[abi_x86_32] virtual/glu[abi_x86_32] virtual/opengl[abi_x86_32] launcher? ( dev-libs/glib:2[abi_x86_32] media-libs/libpng:1.2[abi_x86_32] x11-libs/gdk-pixbuf:2[abi_x86_32,X] x11-libs/gtk+:2[abi_x86_32] x11-libs/libX11[abi_x86_32] x11-libs/pango[abi_x86_32,X] )
-RESTRICT=bindist fetch splitdebug
-SLOT=0
-SRC_URI=trine_enchanted_edition_v2_12_build_508_humble_linux_full.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fb967e6521fa9fab73d220e7037b70e2
diff --git a/games-action/trine-enchanted-edition/Manifest b/games-action/trine-enchanted-edition/Manifest
new file mode 100644
index 000000000000..5d5d2b7ac2ee
--- /dev/null
+++ b/games-action/trine-enchanted-edition/Manifest
@@ -0,0 +1,3 @@
+DIST trine_enchanted_edition_v2_12_build_508_humble_linux_full.zip 1226749814 BLAKE2B 9803f78279bcf83a2a54f25e2498664b73ba1c0ae5c540bb4479345ae05495cc11527937876fb7c9dbb34d05dbbdb4575cc6c1899923c782ff67ea23bd2cfac9 SHA512 e883763efe89f09a84c2896bfd0a9a13319dd14bb840e67f1812a0bab45bcab7a144f4c9399194e5aabad0435e350c6a903a542c9101a37c602855ebd0884d9d
+EBUILD trine-enchanted-edition-2.12.508.ebuild 2330 BLAKE2B 2905888a064645c399a9386c8bebf131ba7fca480a721214bf2757d8df9f3d0dc930d1d78c181ad2794a11ec5d82c71f57d0a9616768742d2e7a52f1ed832396 SHA512 65559193729a0c16c47d261ba7457e11b97317026c64667d11773e88dac0b2745edf43b92b28a980982bd33463f504f794009ab9eca86adac3e31cbc073f8b30
+MISC metadata.xml 321 BLAKE2B 5aca052a154cd0d9a43b96774253a2999ad36aa01c956961ad0021fa7cc6cbc8b89b7f93c6318308f6310a877ac9cb2b70bf622f25b882cf0c13261a7fae9b9c SHA512 ab5d27c4f1f5760f902abe8829db8732a19206739001dd349ac170bc64e5edb9b10ec4d16ec3d8f52569a05bc90ac08af6724f11206fce2b3506d99555712747
diff --git a/games-action/trine-enchanted-edition/metadata.xml b/games-action/trine-enchanted-edition/metadata.xml
new file mode 100644
index 000000000000..b26a6baa4124
--- /dev/null
+++ b/games-action/trine-enchanted-edition/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="launcher">Install GTK+ launcher</flag>
+	</use>
+</pkgmetadata>
diff --git a/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508.ebuild b/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508.ebuild
new file mode 100644
index 000000000000..fcff32bee8f5
--- /dev/null
+++ b/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop eutils gnome2-utils
+
+MY_P="${PV//./_}"
+MY_P="${PN//-/_}_v${MY_P%_*}_build_${MY_P##*_}"
+MY_PN="Trine Enchanted Edition"
+
+DESCRIPTION="The original sidescrolling action platformer under the Trine 2 engine"
+HOMEPAGE="https://www.frozenbyte.com/games/trine-enchanted-edition"
+SRC_URI="${MY_P}_humble_linux_full.zip"
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+launcher"
+RESTRICT="bindist fetch splitdebug"
+
+QA_PREBUILT="opt/${PN}/${PN}*"
+
+DEPEND="app-arch/unzip"
+
+# SDL 1.3 is bundled but the game appears to be statically linked
+# against SDL 2.0.3. This is unfortunate as there are bugs. For example,
+# it doesn't respect the DISPLAY variable under Zaphod mode.
+
+RDEPEND="
+	media-gfx/nvidia-cg-toolkit[abi_x86_32]
+	media-libs/alsa-lib[abi_x86_32]
+	media-libs/freetype:2[abi_x86_32]
+	media-libs/libogg[abi_x86_32]
+	>=media-libs/libvorbis-1.3[abi_x86_32]
+	>=media-libs/openal-1.15[abi_x86_32]
+	>=sys-devel/gcc-4.6[cxx]
+	>=sys-libs/glibc-2.15
+	sys-libs/zlib[abi_x86_32]
+	virtual/glu[abi_x86_32]
+	virtual/opengl[abi_x86_32]
+	launcher? (
+		dev-libs/glib:2[abi_x86_32]
+		media-libs/libpng:1.2[abi_x86_32]
+		x11-libs/gdk-pixbuf:2[abi_x86_32,X]
+		x11-libs/gtk+:2[abi_x86_32]
+		x11-libs/libX11[abi_x86_32]
+		x11-libs/pango[abi_x86_32,X]
+	)"
+
+S="${WORKDIR}/linux/_enchanted_edition_"
+
+pkg_nofetch() {
+	einfo "Please buy and download ${SRC_URI} from:"
+	einfo "  https://www.humblebundle.com/store/${PN}"
+	einfo "and move it to your distfiles directory."
+}
+
+src_install() {
+	local dir=/opt/${PN}
+
+	insinto "${dir}"
+	doins -r *.fbq data
+
+	exeinto "${dir}"
+	newexe bin/trine1_linux_32bit ${PN}
+
+	make_wrapper ${PN} ./${PN} "${dir}"
+	make_desktop_entry ${PN} "${MY_PN}"
+
+	if use launcher ; then
+		exeinto "${dir}"
+		newexe bin/trine1_linux_launcher_32bit ${PN}-launcher
+
+		make_wrapper ${PN}-launcher ./${PN}-launcher "${dir}"
+		make_desktop_entry ${PN}-launcher "${MY_PN} (launcher)"
+
+		# Launcher binary has hardcoded the game path.
+		dosym ../${PN} "${dir}"/bin/trine1_bin_starter.sh
+	fi
+
+	newicon -s 64 trine1.png ${PN}.png
+	dodoc readme_changelog.txt
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/games-action/trine/Manifest b/games-action/trine/Manifest
new file mode 100644
index 000000000000..7db21e5d4541
--- /dev/null
+++ b/games-action/trine/Manifest
@@ -0,0 +1,3 @@
+DIST TrineUpdate4.64.run 647258173 BLAKE2B b520d1f312b9bd9ef94f32cd5fbe7ceaea0cb1bd839d8a898ac02cac0eb3464d83588f1163949ca2f53d7badb2eca456b8e1438d6f5e96e3c6baa10ca6cb865a SHA512 1255edc90cfd47c4f5a3cf7fa07cebac047f46f9b5f9f6621baff01d9c4295c95204a695127ce4947038c50c80253e7a004ec1c3accff6ac8697605fd25885f9
+EBUILD trine-1.08-r3.ebuild 2401 BLAKE2B c81708cf345a2a67e7ef0e0edc570bcb95946145dc78408aa2d03d5f365efc269df9c8a69c40d97037853f6efa860ba9a6bf0cd2cffe2adb65a592cf6459e715 SHA512 cebbd8d3a103cf6fa5e363b2f504a45b20f2dd3dbf071071fd3b003a45aba2f2f955f16e32d679a8406504eb46f37fbcd85cf06c99bad9d9a2de0eda82f89525
+MISC metadata.xml 321 BLAKE2B 5aca052a154cd0d9a43b96774253a2999ad36aa01c956961ad0021fa7cc6cbc8b89b7f93c6318308f6310a877ac9cb2b70bf622f25b882cf0c13261a7fae9b9c SHA512 ab5d27c4f1f5760f902abe8829db8732a19206739001dd349ac170bc64e5edb9b10ec4d16ec3d8f52569a05bc90ac08af6724f11206fce2b3506d99555712747
diff --git a/games-action/trine/metadata.xml b/games-action/trine/metadata.xml
new file mode 100644
index 000000000000..b26a6baa4124
--- /dev/null
+++ b/games-action/trine/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="launcher">Install GTK+ launcher</flag>
+	</use>
+</pkgmetadata>
diff --git a/games-action/trine/trine-1.08-r3.ebuild b/games-action/trine/trine-1.08-r3.ebuild
new file mode 100644
index 000000000000..f9b9673cdd45
--- /dev/null
+++ b/games-action/trine/trine-1.08-r3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop eutils gnome2-utils unpacker
+
+DESCRIPTION="A physics-based action game with character-dependent solutions to challenges"
+HOMEPAGE="https://www.frozenbyte.com/games/trine-enchanted-edition"
+SRC_URI="TrineUpdate4.64.run"
+LICENSE="frozenbyte-eula"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+launcher"
+RESTRICT="bindist fetch strip"
+
+QA_PREBUILT="opt/${PN}/${PN}*
+	opt/${PN}/lib/*"
+
+DEPEND="
+	app-admin/chrpath
+	app-arch/unzip
+"
+
+RDEPEND="
+	media-gfx/nvidia-cg-toolkit
+	>=media-libs/libsdl-1.2[opengl,video]
+	>=media-libs/sdl-image-1.2
+	>=media-libs/sdl-ttf-2.0
+	>=media-libs/libvorbis-1.3
+	>=media-libs/openal-1.15
+	>=sys-devel/gcc-4.3.0
+	>=sys-libs/glibc-2.4
+	sys-libs/zlib
+	x11-libs/gtk+:2
+	launcher? (
+		dev-libs/glib:2
+		gnome-base/libglade:2.0
+	)"
+
+S="${WORKDIR}"
+dir="/opt/${PN}"
+
+pkg_nofetch() {
+	einfo "Fetch ${SRC_URI} and put it into your distfiles directory."
+	einfo "It is no longer available to purchase but you can still download it"
+	einfo "from https://www.humblebundle.com if you bought it previously."
+	einfo "Otherwise install ${CATEGORY}/trine-enchanted-edition instead."
+}
+
+src_unpack() {
+	unpack_zip ${A}
+}
+
+src_prepare() {
+	default
+	use launcher || rm -v lib*/lib{boost*,icu*}.* || die
+	rm -v lib*/lib{Cg*,direct*,fusion*,gcc_s,jpeg,m,ogg,openal,png*,rt,SDL*,selinux,stdc++,tiff,vga,vorbis*}.* || die
+	chrpath --replace "${EPREFIX}${dir}"/lib trine-{bin,launcher}$(usex x86 32 64) || die
+}
+
+src_install() {
+	local sfx=$(usex x86 32 64)
+
+	insinto "${dir}"
+	doins -r binds config data dev profiles *.fbz *.glade trine-logo.png
+
+	exeinto "${dir}/lib"
+	doexe lib${sfx}/*
+
+	exeinto "${dir}"
+	newexe trine-bin${sfx} ${PN}
+
+	make_wrapper ${PN} ./${PN} "${dir}"
+	make_desktop_entry ${PN} "Trine"
+
+	# Compatibility with trine-bin.
+	dosym ${PN} /usr/bin/${PN}-bin
+
+	if use launcher ; then
+		exeinto "${dir}"
+		newexe trine-launcher${sfx} ${PN}-launcher
+
+		dosym {"../..${dir}",/usr/bin}/${PN}-launcher
+		make_desktop_entry ${PN}-launcher "Trine (launcher)"
+
+		# Launcher binary has hardcoded the game path.
+		dosym ${PN} "${dir}"/${PN}-bin
+	fi
+
+	newicon -s 512 Trine.xpm ${PN}.xpm
+	dodoc Trine_Manual_linux.pdf Trine_updates.txt
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/games-action/trine2-2.01.425 b/games-action/trine2-2.01.425
deleted file mode 100644
index 4dc4e54039e1..000000000000
--- a/games-action/trine2-2.01.425
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst prepare
-DEPEND=app-arch/unzip >=sys-apps/sed-4
-DESCRIPTION=Sidescrolling game of action, puzzles and platforming, Complete Story edition
-EAPI=6
-HOMEPAGE=http://www.trine2.com/
-IUSE=+launcher
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=all-rights-reserved
-RDEPEND=media-gfx/nvidia-cg-toolkit[abi_x86_32] media-libs/alsa-lib[abi_x86_32] media-libs/freetype:2[abi_x86_32] media-libs/libogg[abi_x86_32] >=media-libs/libvorbis-1.3[abi_x86_32] >=media-libs/openal-1.15[abi_x86_32] >=sys-devel/gcc-4.6[cxx] >=sys-libs/glibc-2.15 sys-libs/zlib[abi_x86_32] virtual/glu[abi_x86_32] virtual/opengl[abi_x86_32] launcher? ( dev-libs/expat[abi_x86_32] dev-libs/glib:2[abi_x86_32] media-libs/libpng:1.2[abi_x86_32] sys-apps/dbus[abi_x86_32] sys-apps/util-linux[abi_x86_32] x11-libs/gdk-pixbuf:2[abi_x86_32,X] x11-libs/gtk+:2[abi_x86_32] x11-libs/libX11[abi_x86_32] x11-libs/pango[abi_x86_32,X] )
-RESTRICT=bindist fetch splitdebug
-SLOT=0
-SRC_URI=trine2_complete_story_v2_01_build_425_humble_linux_full.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ed3f3d5b32c95dae94599c9980880e01
diff --git a/games-action/trine2/Manifest b/games-action/trine2/Manifest
new file mode 100644
index 000000000000..85d97d8698d8
--- /dev/null
+++ b/games-action/trine2/Manifest
@@ -0,0 +1,3 @@
+DIST trine2_complete_story_v2_01_build_425_humble_linux_full.zip 3243286878 BLAKE2B a9032d6043ac9623a254c1ebe69c30e5f173de91e3cc0552c4ff60275c11601c7708c37d2d7b9eb789290e24569967fc82b56f143110306642b28d5e21cb62ee SHA512 e59aaa6da7d4cae96d361f7f80d857e4102b23fe9584b88af9163407d4f1a34b9e0e79a9337c133e9d60e31ac8ead3a7f9b02b47f9797df05f998666c9219c15
+EBUILD trine2-2.01.425.ebuild 2620 BLAKE2B c0b4a6279a97ee29b926275439accad1ceb63adf32ea7f45842df1e7d2d2b8c9719012db9e1fa58ea948917a4826f15bb737d46286552f720ff8342b931bc357 SHA512 4e6382935cf268e89a85c7ca9fc4340d498cf83407bfdec2ba1fcd4d7b9da3905d440f7dbb172cea3a79cf15ebd55bc16dc895814d34a3a13f10ae8da3aedd14
+MISC metadata.xml 321 BLAKE2B 5aca052a154cd0d9a43b96774253a2999ad36aa01c956961ad0021fa7cc6cbc8b89b7f93c6318308f6310a877ac9cb2b70bf622f25b882cf0c13261a7fae9b9c SHA512 ab5d27c4f1f5760f902abe8829db8732a19206739001dd349ac170bc64e5edb9b10ec4d16ec3d8f52569a05bc90ac08af6724f11206fce2b3506d99555712747
diff --git a/games-action/trine2/metadata.xml b/games-action/trine2/metadata.xml
new file mode 100644
index 000000000000..b26a6baa4124
--- /dev/null
+++ b/games-action/trine2/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="launcher">Install GTK+ launcher</flag>
+	</use>
+</pkgmetadata>
diff --git a/games-action/trine2/trine2-2.01.425.ebuild b/games-action/trine2/trine2-2.01.425.ebuild
new file mode 100644
index 000000000000..1b49131fab0c
--- /dev/null
+++ b/games-action/trine2/trine2-2.01.425.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop eutils gnome2-utils
+
+MY_P="${PV//./_}"
+MY_P="${PN}_complete_story_v${MY_P%_*}_build_${MY_P##*_}"
+MY_PN="Trine 2"
+
+DESCRIPTION="Sidescrolling game of action, puzzles and platforming, Complete Story edition"
+HOMEPAGE="http://www.trine2.com/"
+SRC_URI="${MY_P}_humble_linux_full.zip"
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+launcher"
+RESTRICT="bindist fetch splitdebug"
+
+QA_PREBUILT="opt/${PN}/${PN}*
+	opt/${PN}/lib/*"
+
+DEPEND="app-arch/unzip"
+
+RDEPEND="
+	media-gfx/nvidia-cg-toolkit[abi_x86_32]
+	media-libs/alsa-lib[abi_x86_32]
+	media-libs/freetype:2[abi_x86_32]
+	media-libs/libogg[abi_x86_32]
+	>=media-libs/libvorbis-1.3[abi_x86_32]
+	>=media-libs/openal-1.15[abi_x86_32]
+	>=sys-devel/gcc-4.6[cxx]
+	>=sys-libs/glibc-2.15
+	sys-libs/zlib[abi_x86_32]
+	virtual/glu[abi_x86_32]
+	virtual/opengl[abi_x86_32]
+	launcher? (
+		dev-libs/expat[abi_x86_32]
+		dev-libs/glib:2[abi_x86_32]
+		media-libs/libpng:1.2[abi_x86_32]
+		sys-apps/dbus[abi_x86_32]
+		sys-apps/util-linux[abi_x86_32]
+		x11-libs/gdk-pixbuf:2[abi_x86_32,X]
+		x11-libs/gtk+:2[abi_x86_32]
+		x11-libs/libX11[abi_x86_32]
+		x11-libs/pango[abi_x86_32,X]
+	)"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	einfo "Please buy and download ${SRC_URI} from:"
+	einfo "  https://www.humblebundle.com/store/trine-2-complete-story"
+	einfo "and move it to your distfiles directory."
+}
+
+src_prepare() {
+	default
+
+	# SDL 1.3 is very special and crashes when fullscreen if
+	# /usr/bin/gnome-screensaver-command is missing. XD
+	sed -i 's:/usr/bin/gnome-screensaver-command:/bin/true\x0                        :g' \
+		lib/lib32/libSDL-1.3.so.0 || die
+}
+
+src_install() {
+	local dir=/opt/${PN}
+
+	insinto "${dir}"
+	doins -r *.fbq data
+
+	exeinto "${dir}"
+	newexe bin/${PN}_linux_32bit ${PN}
+
+	exeinto "${dir}"/lib
+	doexe lib/lib32/lib{{SDL-1.3,PhysXLoader}.so.*,PhysX{Cooking,Core}.so} # Avoid duplicates.
+
+	make_wrapper ${PN} ./${PN} "${dir}" "${dir}"/lib
+	make_desktop_entry ${PN} "${MY_PN}"
+
+	if use launcher ; then
+		exeinto "${dir}"
+		newexe bin/${PN}_linux_launcher_32bit ${PN}-launcher
+
+		make_wrapper ${PN}-launcher ./${PN}-launcher "${dir}" "${dir}"/lib
+		make_desktop_entry ${PN}-launcher "${MY_PN} (launcher)"
+
+		# Launcher binary has hardcoded the game path.
+		dosym ../${PN} "${dir}"/bin/${PN}_bin_starter.sh
+	fi
+
+	doicon -s 64 ${PN}.png
+	dodoc readme_changelog.txt readme/{KNOWN_LINUX_ISSUES,README}
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/games-action/trosh-20-r1 b/games-action/trosh-20-r1
deleted file mode 100644
index e0f41d5e4d81..000000000000
--- a/games-action/trosh-20-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=app-arch/unzip >=sys-apps/sed-4
-DESCRIPTION=A game made in 20 hours for a friend. It has explosions
-EAPI=6
-HOMEPAGE=http://stabyourself.net/trosh/
-KEYWORDS=~amd64 ~x86
-LICENSE=WTFPL-2
-RDEPEND=>=games-engines/love-0.8.0:0 media-libs/devil[png]
-SLOT=0
-SRC_URI=http://stabyourself.net/dl.php?file=trosh/trosh-linux.zip -> trosh-20.zip https://dev.gentoo.org/~hasufell/distfiles/trosh.png
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=787d82ae817a0ead28d7716b73b280e9
diff --git a/games-action/trosh/Manifest b/games-action/trosh/Manifest
new file mode 100644
index 000000000000..3fa4440520cf
--- /dev/null
+++ b/games-action/trosh/Manifest
@@ -0,0 +1,4 @@
+DIST trosh-20.zip 5182303 BLAKE2B b22d0e5138c5d5ce3bbbe8e3fe8cdc732b9002d67ceccf636b93c6c48acc8a32898de978ccb752742a3be0e8e1bdee97507a469d87d30af8a493ad4104fc657c SHA512 2a8988f5715340850a61acde54403c968947d41d5f0a1ac098c4cc3959f69f150cee567933fd5148a2c23c237210c10dc58005de1bd949d6db59cd794a0003ec
+DIST trosh.png 242 BLAKE2B 3f9a2fcd08669004f40f5ade1c4f119d18b1983b2d0ff73fb61fdd9764aa9903c5b053267507ec5cc3f4a8dd5d2246df6830b96fbfaa3f536fd7cad458f09436 SHA512 85ff46c8c75b018a59a8e7dace85fc5ccf2439babedb0e4d134301eb9f7edfe5d7f4f3af1329f04257c16d978f27df38f10cb3ffbc4b424808a5f3c5c78bfc69
+EBUILD trosh-20-r1.ebuild 894 BLAKE2B 8ab22d1c6d681307a9526359c1bc7dfed3fc5a8021682c805f578ac6d2d6f1ff2309f8c03ba75554adea7b96732c67b5f88f0e46dbf06def50c6d0b87e133f5b SHA512 40a2075d54ac3b6e334c8e8e4562637c3bfb3e3cef5b071dd691341ad56f818146c77877b0e0654e91fd66b4d49f6b06f4f71ca3e671ebf93c29bbbf1e8158f9
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-action/trosh/metadata.xml b/games-action/trosh/metadata.xml
new file mode 100644
index 000000000000..26079e608bed
--- /dev/null
+++ b/games-action/trosh/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-action/trosh/trosh-20-r1.ebuild b/games-action/trosh/trosh-20-r1.ebuild
new file mode 100644
index 000000000000..5de7abfdbbc1
--- /dev/null
+++ b/games-action/trosh/trosh-20-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils gnome2-utils
+
+DESCRIPTION="A game made in 20 hours for a friend. It has explosions"
+HOMEPAGE="http://stabyourself.net/trosh/"
+SRC_URI="http://stabyourself.net/dl.php?file=trosh/trosh-linux.zip -> ${P}.zip
+	https://dev.gentoo.org/~hasufell/distfiles/${PN}.png"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=games-engines/love-0.8.0:0
+	 media-libs/devil[png]
+"
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+src_install() {
+	local dir=/usr/share/love/${PN}
+
+	exeinto "${dir}"
+	doexe ${PN}.love
+
+	einstalldocs
+
+	doicon -s 32 "${DISTDIR}"/${PN}.png
+	make_wrapper ${PN} "love ${PN}.love" "${dir}"
+	make_desktop_entry ${PN}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-action/tuxkart-0.4.0-r1 b/games-action/tuxkart-0.4.0-r1
deleted file mode 100644
index d16a5c1d26df..000000000000
--- a/games-action/tuxkart-0.4.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=media-libs/plib-1.8.0 x11-libs/libX11 x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXi x11-libs/libXmu virtual/opengl x11-libs/libXt
-DESCRIPTION=A racing game starring Tux, the Linux penguin
-EAPI=6
-HOMEPAGE=http://tuxkart.sourceforge.net/
-KEYWORDS=~alpha ~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/plib-1.8.0 x11-libs/libX11 x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXi x11-libs/libXmu virtual/opengl
-SLOT=0
-SRC_URI=mirror://sourceforge/tuxkart/tuxkart-0.4.0.tar.gz
-_md5_=cdb48fe718c7a16dcc2695a4845442fa
diff --git a/games-action/tuxkart/Manifest b/games-action/tuxkart/Manifest
new file mode 100644
index 000000000000..297525039528
--- /dev/null
+++ b/games-action/tuxkart/Manifest
@@ -0,0 +1,3 @@
+DIST tuxkart-0.4.0.tar.gz 4932535 BLAKE2B 36b188cbba2f6bee07b3c2e32da13dfb0372b291d47e10d15049571ad2e9114bec79e5418353928b76fb85f7d4ba36a3a8612f1acf7e0b8e454e7f4410cf5fb5 SHA512 5c49b417a1e582d0151a79c0ee5f746ff22c118ce7ed6d243ae43c9d465cb23891736afd10db771cd1f133414f34fce7747e63dafbbe8ebe4f3997ab77ec31a9
+EBUILD tuxkart-0.4.0-r1.ebuild 958 BLAKE2B 59305cad0ca9e5e085b450b92f7f7ccacb4aa4d6788022655f7042fdecb90e52f5ed248944573bface55a01b58315f1ee8d22c3e02eb1e1901849877e22b7e60 SHA512 062fbd50900eefe69a79e741ede394c17d8e61e23dc34ca620340f69a955cda75876374aec907a32e8fe0aff890792e33ca5894a9b89d993ed2c59e0ebfd7686
+MISC metadata.xml 330 BLAKE2B dd597158f9edbe7eaf360d35d3a7f3f27ac16ad654a67b18062abce86e770023d7a9c0a7e37b3cee34695b488dde28271329aa348a10eab126560dde2544920b SHA512 c9f7ed02c9b379ea9a73974dcbf03d601ef34b58c8aa957167da59d223eaecb262fcaaa6042a8dd54bfac5397a60c1452ac5855c044e048e12f1c00fd9fe2df0
diff --git a/games-action/tuxkart/metadata.xml b/games-action/tuxkart/metadata.xml
new file mode 100644
index 000000000000..36527bbe0db8
--- /dev/null
+++ b/games-action/tuxkart/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">tuxkart</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/tuxkart/tuxkart-0.4.0-r1.ebuild b/games-action/tuxkart/tuxkart-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..4591388145c1
--- /dev/null
+++ b/games-action/tuxkart/tuxkart-0.4.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A racing game starring Tux, the Linux penguin"
+HOMEPAGE="http://tuxkart.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tuxkart/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/plib-1.8.0
+	x11-libs/libX11
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXmu
+	virtual/opengl"
+DEPEND="${RDEPEND}
+	x11-libs/libXt"
+
+src_prepare() {
+	default
+
+	# apparently <sys/perm.h> doesn't exist on alpha
+	if use alpha; then
+		sed -i \
+			-e '/#include <sys\/perm.h>/d' src/gfx.cxx || die
+	fi
+	sed -i \
+		-e "/^plib_suffix/ s/-lplibul/-lplibul -lplibjs/" \
+		-e "s/-malign-double//; s/-O6//" configure || die
+	sed -i \
+		-e "/^bindir/s/=.*/=@bindir@/" src/Makefile.in || die
+}
+
+src_install() {
+	default
+	dodoc doc/*.html
+	rm -rf "${D}/usr/share/tuxkart/" || die
+}
diff --git a/games-action/violetland-0.4.3-r1 b/games-action/violetland-0.4.3-r1
deleted file mode 100644
index aae0f00cd990..000000000000
--- a/games-action/violetland-0.4.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads(+)] media-libs/libsdl[sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf virtual/glu virtual/opengl sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Help a girl named Violet in the struggle with hordes of monsters
-EAPI=6
-HOMEPAGE=https://violetland.github.io/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 CC-BY-SA-3.0
-RDEPEND=dev-libs/boost:=[threads(+)] media-libs/libsdl[sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf virtual/glu virtual/opengl
-SLOT=0
-SRC_URI=https://github.com/ooxi/violetland/archive/0.4.3.tar.gz -> violetland-0.4.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_=85079a9ac0aa95331812e6b10f2b7aa2
diff --git a/games-action/violetland/Manifest b/games-action/violetland/Manifest
new file mode 100644
index 000000000000..b4d2eca0538c
--- /dev/null
+++ b/games-action/violetland/Manifest
@@ -0,0 +1,4 @@
+AUX violetland-0.4.3-boost150.patch 1431 BLAKE2B 389d34120891715c27cbd298223add3510f90ae87ad5ec27dc6b897a9e2b7688a8e5f74b572852fb40902e4ef2163d5e7c8f551c876a563108081edbe7bf2e5d SHA512 1cff30cc2cab843f52b37bf3e5d52de0fdc81f1a24c713a133d557cc72fbd050ff4512a71badb9f3d536838fccbe6e737719ae87345f2dcc7f719433eecd1d58
+DIST violetland-0.4.3.tar.gz 9257919 BLAKE2B 255c9c13a49db576a37dbd4aa863306f0778f9528173426b26934a674dd0145574ff96242577feff8a4566571eebd97d0cb7a1d8a9718ac84fcd6c4492230fd5 SHA512 678e1aea42c9358794c6b8b83bdd113baf26e16db4cb815c756cb6c1d268b8210d18a47d1a98a019556633b4db62cd8cf7fc6a1e1ec3b7e3647a9d8353020fae
+EBUILD violetland-0.4.3-r1.ebuild 1047 BLAKE2B 1a6c200d3ded4c442e04e6740d0427845dd4c452aa48c1e0bf040a4a2f6809d74400d3a89b37667693ae0175d202c36699e57f3b836dabe8cecfaea311affe17 SHA512 595ae6a1ae5b6f16a5bf256a69aa835b4e752af8d958b99e1816e6f997152a7ca0507a67a85d35a1b21b3f4636adc27927869bf236424f98477745cc8d5046c7
+MISC metadata.xml 328 BLAKE2B fd9922713b8600517ee67c777214e2ba3c92571b077e90fab4ce1940fff0234c58737ee5ead0797dc0668a96f853bb6a272c7ae1c1db63db26936a82ef90325c SHA512 b19362a0378f6fe898217e14002f5d55c16f79924e2b152e16224c7873cb5910e343e0d2be6a31767f26c51a354c050d42175dfbbe428911b6985c0495ad9f5f
diff --git a/games-action/violetland/files/violetland-0.4.3-boost150.patch b/games-action/violetland/files/violetland-0.4.3-boost150.patch
new file mode 100644
index 000000000000..5ddd5e8445b8
--- /dev/null
+++ b/games-action/violetland/files/violetland-0.4.3-boost150.patch
@@ -0,0 +1,41 @@
+--- a/CMakeLists.txt	2012-11-05 15:19:11.501044743 +0100
++++ b/CMakeLists.txt	2012-11-05 15:19:25.415250207 +0100
+@@ -8,7 +8,6 @@
+ find_package(SDL_mixer REQUIRED)
+ find_package(OpenGL REQUIRED)
+ find_package(Boost COMPONENTS filesystem system REQUIRED)
+-add_definitions(-DBOOST_FILESYSTEM_VERSION=2)
+ 
+ if(${MINGW})
+ 	set(INTL_LIBRARY intl)
+--- a/src/system/utility/FileUtility.cpp	2012-11-05 21:26:07.865488297 +0100
++++ b/src/system/utility/FileUtility.cpp	2012-11-05 21:30:44.881208230 +0100
+@@ -20,7 +20,7 @@
+ 
+ 	while (dir_it != boost::filesystem::directory_iterator()) {
+ 		if (boost::filesystem::is_regular_file(*dir_it))
+-			files.push_back(dir_it->filename());
++			files.push_back(dir_it->path().filename().string());
+ 		++dir_it;
+ 	}
+ 	return files;
+@@ -32,8 +32,8 @@
+ 
+ 	while (dir_it != boost::filesystem::directory_iterator()) {
+ 		if (boost::filesystem::is_directory(*dir_it))
+-			if (dir_it->path().filename()[0] != '.')
+-				subDirs.push_back(dir_it->path().filename());
++			if (dir_it->path().filename().string()[0] != '.')
++				subDirs.push_back(dir_it->path().filename().string());
+ 		++dir_it;
+ 	}
+ 	return subDirs;
+@@ -45,7 +45,7 @@
+ 
+ 	while (dir_it != boost::filesystem::directory_iterator()) {
+ 		if (boost::filesystem::is_directory(*dir_it))
+-			if (dir_it->path().filename()[0] != '.')
++			if (dir_it->path().filename().string()[0] != '.')
+ 				++count;
+ 		++dir_it;
+ 	}
diff --git a/games-action/violetland/metadata.xml b/games-action/violetland/metadata.xml
new file mode 100644
index 000000000000..21c980e6339f
--- /dev/null
+++ b/games-action/violetland/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">violetland</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/violetland/violetland-0.4.3-r1.ebuild b/games-action/violetland/violetland-0.4.3-r1.ebuild
new file mode 100644
index 000000000000..d277b84a643c
--- /dev/null
+++ b/games-action/violetland/violetland-0.4.3-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils cmake-utils
+
+DESCRIPTION="Help a girl named Violet in the struggle with hordes of monsters"
+HOMEPAGE="https://violetland.github.io/"
+SRC_URI="https://github.com/ooxi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads(+)]
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-ttf
+	virtual/glu
+	virtual/opengl"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-boost150.patch )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i \
+		-e "/README_EN.TXT/d" \
+		-e "/README_RU.TXT/d" \
+		CMakeLists.txt || die "sed failed"
+	rm README_RU.TXT || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDATA_INSTALL_DIR=share/${PN}
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newicon icon-light.png ${PN}.png
+	make_desktop_entry ${PN} VioletLand
+}
diff --git a/games-action/wordwarvi-1.00-r1 b/games-action/wordwarvi-1.00-r1
deleted file mode 100644
index 4f9352e56b45..000000000000
--- a/games-action/wordwarvi-1.00-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/gtk+:2 portaudio? ( media-libs/libvorbis >=media-libs/portaudio-19_pre1 ) virtual/pkgconfig
-DESCRIPTION=A retro side-scrolling shoot'em up based on the editor war story
-EAPI=6
-HOMEPAGE=http://wordwarvi.sourceforge.net
-IUSE=portaudio
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 CC-BY-2.0 CC-BY-SA-3.0
-RDEPEND=x11-libs/gtk+:2 portaudio? ( media-libs/libvorbis >=media-libs/portaudio-19_pre1 )
-SLOT=0
-SRC_URI=mirror://sourceforge/wordwarvi/wordwarvi-1.00.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_=80665c1bdf16b8ac09862ead6abc0b9a
diff --git a/games-action/wordwarvi/Manifest b/games-action/wordwarvi/Manifest
new file mode 100644
index 000000000000..b2f3dd522a70
--- /dev/null
+++ b/games-action/wordwarvi/Manifest
@@ -0,0 +1,4 @@
+AUX wordwarvi-1.00-sound.patch 2869 BLAKE2B e7319854f5b4bf8adfe2a121d64a928467012959f4cfe869dfc1196424219445abeddd9ed21d8367a3818fa4e04b4d8757c4d6a44d3d23b74ca9d2f420e3c5bc SHA512 df90b18dedb7280e3789c276411e3d11c7b5096906d53ba3f16cbc297f939116a030898d00c87f8e8b5d3dcf08910ab249f62d7b99feeb881960f8742a4c1878
+DIST wordwarvi-1.00.tar.gz 8828099 BLAKE2B 769b0e86ba6ac1956862e7375141f31fde20e99710a0719a57062334cfd24064c89b2b50c477ff9272efa2471ed4c768add2148c00cc6f91619b46eef54d23ad SHA512 e8f8609300fa2f9bd2ff763fee11699c5f30e96ccb3a5d531456134e983148227bb12fb6421b4ad00bcac46cddcdb5a036d416b8e55aedf037d1c3f0b5e04fa9
+EBUILD wordwarvi-1.00-r1.ebuild 1239 BLAKE2B b106b30eb0df65ccb9b7032664b71ed7f350accd73cee3ad439539b99eb1f23830bc8b610a50b4dc5c5eab31f2cb74a7db6732f5cc2171baf295f86b6acb9be0 SHA512 133c80268c899eaff58cc8c5a36ef3d5eaa74b4db797836d7278d43001c74c0dac8e418b9f2c5ae9ae25a633dd932c2f4daa2ceb9ce6a02b85458ce5bff9d7ec
+MISC metadata.xml 332 BLAKE2B cef889355232bef91e44638d32fbfd52f95b5d5e79b288f87146f7668f1248734bacb97fffb3076b215ced5981a7bd2d14982b8bc9c02d1b237b5605f77b5c92 SHA512 50b4b9f74a0629d49db7c041b965ae31b425803b667be69e5304ce8df2e49dca66d923f44df209ca02299ac088728d059724ff1ea325a2bb249a49a520037efe
diff --git a/games-action/wordwarvi/files/wordwarvi-1.00-sound.patch b/games-action/wordwarvi/files/wordwarvi-1.00-sound.patch
new file mode 100644
index 000000000000..5ad7bc8440b9
--- /dev/null
+++ b/games-action/wordwarvi/files/wordwarvi-1.00-sound.patch
@@ -0,0 +1,80 @@
+diff -ru wordwarvi-1.00.orig/Makefile wordwarvi-1.00/Makefile
+--- wordwarvi-1.00.orig/Makefile	2011-06-09 00:06:22.000000000 -0400
++++ wordwarvi-1.00/Makefile	2011-06-11 19:57:55.609619777 -0400
+@@ -1,5 +1,5 @@
+ PREFIX=/usr
+-DATADIR=${PREFIX}/share/wordwarvi
++DATADIR?=${PREFIX}/share/wordwarvi
+ MANDIR?=${PREFIX}/share/man
+ MANPAGEDIR=${MANDIR}/man6
+ 
+@@ -24,18 +24,6 @@
+ CC ?= gcc
+ BUILD_CC ?= gcc
+ 
+-# DEBUG=-g
+-# DEBUG=
+-# PROFILE_FLAG=-pg
+-#PROFILE_FLAG=
+-#OPTIMIZE_FLAG=
+-# OPTIMIZE_FLAG=-O3
+-#OPTIMIZE_FLAG=-O3 -pedantic -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security
+-OPTIMIZE_FLAG=-O3 -pedantic
+-
+-
+-LDFLAGS=${PROFILE_FLAG}
+-
+ DEFINES=${SNDFLAGS} -DDATADIR=\"${DATADIR}/\"
+ 
+ all:	wordwarvi wordwarvi.6.gz
+@@ -53,24 +41,24 @@
+ endif
+ 
+ joystick.o:	joystick.c joystick.h Makefile
+-	$(CC) ${DEBUG} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} -pthread -Wall -c joystick.c
++	$(CC) ${DEBUG} ${PROFILE_FLAG} ${CFLAGS} -pthread -Wall -c joystick.c
+ 
+ ogg_to_pcm.o:	ogg_to_pcm.c ogg_to_pcm.h Makefile
+-	$(CC) ${DEBUG} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} `pkg-config --cflags vorbisfile` \
++	$(CC) ${DEBUG} ${PROFILE_FLAG} ${CFLAGS} `pkg-config --cflags vorbisfile` \
+ 		-pthread -Wall -c ogg_to_pcm.c
+ 
+ wwviaudio.o:	wwviaudio.c wwviaudio.h ogg_to_pcm.h my_point.h Makefile
+-	$(CC) -Wall ${DEBUG} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} \
++	$(CC) -Wall ${DEBUG} ${PROFILE_FLAG} ${CFLAGS} \
+ 		${DEFINES} \
+ 		-pthread `pkg-config --cflags vorbisfile` \
+ 		-c wwviaudio.c
+ 
+ rumble.o:	rumble.c rumble.h Makefile
+-	$(CC) ${DEBUG} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} `pkg-config --cflags vorbisfile` \
++	$(CC) ${DEBUG} ${PROFILE_FLAG} ${CFLAGS} `pkg-config --cflags vorbisfile` \
+ 		-pthread -Wall -c rumble.c
+ 
+ wwvi_font.o:	wwvi_font.c wwvi_font.h my_point.h Makefile
+-	$(CC) ${DEBUG} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} -pthread -Wall -c wwvi_font.c
++	$(CC) ${DEBUG} ${PROFILE_FLAG} ${CFLAGS} -pthread -Wall -c wwvi_font.c
+ 
+ stamp:	stamp.c
+ 	$(BUILD_CC) -o stamp stamp.c
+@@ -78,7 +66,7 @@
+ wordwarvi:	wordwarvi.c joystick.o rumble.o ${OGGOBJ} wwviaudio.o wwvi_font.o \
+ 		Makefile version.h stamp levels.h rumble.h
+ 	./stamp > stamp.h
+-	$(CC) ${DEBUG} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} ${SCREENSAVERFLAG} -pthread -Wall  ${DEFINES} \
++	$(CC) $(LDFLAGS) ${DEBUG} ${PROFILE_FLAG} ${CFLAGS} ${SCREENSAVERFLAG} -pthread -Wall  ${DEFINES} \
+ 		joystick.o \
+ 		rumble.o \
+ 		wwvi_font.o \
+diff -ru wordwarvi-1.00.orig/wwviaudio.c wordwarvi-1.00/wwviaudio.c
+--- wordwarvi-1.00.orig/wwviaudio.c	2011-06-09 00:06:22.000000000 -0400
++++ wordwarvi-1.00/wwviaudio.c	2011-06-11 19:57:17.394274660 -0400
+@@ -121,7 +121,7 @@
+ 	if (clipnum >= max_sound_clips || clipnum < 0)
+ 		return -1;
+ 
+-	snprintf(filebuf, PATH_MAX, "%s/%s", DATADIR, filename);
++	snprintf(filebuf, PATH_MAX, "GENTOO_DATADIR/%s", DATADIR, filename);
+ 	rc = stat(filebuf, &statbuf);
+ 	if (rc != 0) {
+ 		strncpy(filebuf, filename, PATH_MAX);
diff --git a/games-action/wordwarvi/metadata.xml b/games-action/wordwarvi/metadata.xml
new file mode 100644
index 000000000000..594ad45f07b0
--- /dev/null
+++ b/games-action/wordwarvi/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">wordwarvi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/wordwarvi/wordwarvi-1.00-r1.ebuild b/games-action/wordwarvi/wordwarvi-1.00-r1.ebuild
new file mode 100644
index 000000000000..df7ee9102eb8
--- /dev/null
+++ b/games-action/wordwarvi/wordwarvi-1.00-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils
+
+DESCRIPTION="A retro side-scrolling shoot'em up based on the editor war story"
+HOMEPAGE="http://wordwarvi.sourceforge.net"
+SRC_URI="mirror://sourceforge/wordwarvi/${P}.tar.gz"
+
+LICENSE="GPL-2 CC-BY-2.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="portaudio"
+
+RDEPEND="x11-libs/gtk+:2
+	portaudio? ( media-libs/libvorbis
+		>=media-libs/portaudio-19_pre1 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-sound.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "/^WITHAUDIO/s/yes/$(use portaudio && echo yes || echo no)/" \
+		Makefile || die
+	sed -i \
+		-e "s:GENTOO_DATADIR:/usr/share/${PN}:" \
+		wwviaudio.c || die
+}
+
+src_compile() {
+	emake \
+		PREFIX="/usr" \
+		DATADIR="/usr/share/${PN}" \
+		MANDIR="/usr/share/man"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="/usr" \
+		DATADIR="/usr/share/${PN}" \
+		MANDIR="/usr/share/man" \
+		install
+
+	if ! use portaudio ; then
+		rm -rf "${D}/usr/share" || die
+	fi
+
+	dodoc README AUTHORS changelog.txt AAA_HOW_TO_MAKE_NEW_LEVELS.txt
+	newicon icons/wordwarvi_icon_128x128.png ${PN}.png
+	make_desktop_entry ${PN} "Word War vi"
+}
diff --git a/games-action/xblast-2.10.4-r1 b/games-action/xblast-2.10.4-r1
deleted file mode 100644
index 711f3df3d4f1..000000000000
--- a/games-action/xblast-2.10.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=media-libs/libpng:0 x11-libs/libICE x11-libs/libX11 x11-libs/libXt >=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=Bomberman clone w/network support for up to 6 players
-EAPI=6
-HOMEPAGE=http://xblast.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libpng:0 x11-libs/libICE x11-libs/libX11
-SLOT=0
-SRC_URI=mirror://sourceforge/xblast/xblast-2.10.4.tar.gz mirror://sourceforge/xblast/images-2005-01-06.tar.gz mirror://sourceforge/xblast/levels-2005-01-06.tar.gz mirror://sourceforge/xblast/models-2005-01-06.tar.gz mirror://sourceforge/xblast/musics-2005-01-06.tar.gz mirror://sourceforge/xblast/sounds.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=74e67c10d6173ff166a1b2fa6a42d21e
diff --git a/games-action/xblast/Manifest b/games-action/xblast/Manifest
new file mode 100644
index 000000000000..2a57f286f8ba
--- /dev/null
+++ b/games-action/xblast/Manifest
@@ -0,0 +1,8 @@
+DIST images-2005-01-06.tar.gz 860830 BLAKE2B 193c748178f8e24fa5b3b00918344cfc9939ff07f537f27d0bde6dafd5720fdef9ecc7884364ca6e3fd77297689a07640f5feeb1ca4309afc3237c8db30569ea SHA512 7254acc664997af5dae8c906a7b90570103c17295e463e8c313f5531810734241fa6485625a7a48a4859f92dbbf2b94332348a1bc85c8930ad6688e5f56be588
+DIST levels-2005-01-06.tar.gz 283353 BLAKE2B fcb380f6a61b656e30b72efa3a567f1ffae6de8f819e5e7e13840ee28c904de3f435976b9f40e6baa711b05f84bdafd8aaed1e87f551570b3dd0077b8ec9c000 SHA512 ece07564fbdf6c21b3b65f3345929c65612f3bf8ed17d4d78e1fe1e2c25f83eb174a086c66fcb891c173f56a24625f8a53623beaaea7013e536f577380680031
+DIST models-2005-01-06.tar.gz 1738564 BLAKE2B 7dfd87e47bf4555d6f01c59e83d1a341513eec61c591166bb2583865c6723b44b2ebf1c9ed9267874e2bb9a2c6cc492c2ac4e870301f13668c1719bd16848fa5 SHA512 20925bf6b0a5bde43df6bab86078e6b7e550a79d1695e3d076254deb3ba556f2c09afa5847c0b3a12f09f3b4386df2da8256cad09c0ea07d9937b98e0c3438b8
+DIST musics-2005-01-06.tar.gz 5317575 BLAKE2B 583d33535c5e80f691e9be7545038ca5dee602a1522f7749ffde0cbd9691378c9bb06c783548482eb26a61f74e3ad3cfac9166382d0644bd450eca1af0f08ed3 SHA512 885591cf5f32d76bc5bae150b24592c8eccd6f33afa5d40570429371b328671c3902c565446dae24bf949ac67b681e39e46e8d4ea737f52c66d467c09a210ede
+DIST sounds.tar.gz 1612625 BLAKE2B eb1ce96370dfafd254ef50334bd6e296045da6825773704d95f5778e854da4c1460fc0a24ae6c3e0c2c3784723fbce4198dfd7331ca9c18ab0324fef6ef6f3f1 SHA512 69518766ce1cc1bef543964acb077de51c361f1a880ebc11bd0d381fe082af0e013d116aad606a18c94855a08c5a2892cb5d0d5a259b081119bb8d355a94e2b2
+DIST xblast-2.10.4.tar.gz 684965 BLAKE2B e9709f539705b9e14831fa036c540877d0d55ce8c975048c8eac0abbf2e391e36b37e4c119118d73f5bf5e888f3fbef4c1dba361b3ba1874909644f948c57613 SHA512 6b3be0d41d18cf8da721030fa87c00ffed81d29706a20dd254a07b9cc8af79bd09f63ebb7f575c1665b77b9f58f29bec74b84f27fd2106d704c2fe2d5513a835
+EBUILD xblast-2.10.4-r1.ebuild 1502 BLAKE2B ac7176dc595c8ccf528d4f6f1081b3a93e8a62de501a6bfbbde057320808922457e089c3cf17bea6ceec4744f2ad17e445eb96b2f588bb5eec6b1f12de349669 SHA512 d9150e8a8f0d067cb77f9079f84b80f88f5854e48658c8381a52856f170fb0d28b9427a5ae8432b583a5646a35ea303ab811cccc6b0f4995fd08553994f42224
+MISC metadata.xml 329 BLAKE2B 66da783ba5a7a3e13a073e0de391ded501a39c26cf4e3cf47a13fec1f36fcc0305efe5a5524d8814bf23a0424d38358820fe554f5f78af50a72cdc125bb80712 SHA512 6afab2e751e3e0a5a2199915dc2ae3149af070ee43ca200c88514ad783b0801f0e22c1c7a4026079af36d3a9b3deb016f2f57e93867d8a8e989660e744f56744
diff --git a/games-action/xblast/metadata.xml b/games-action/xblast/metadata.xml
new file mode 100644
index 000000000000..c02ee380b861
--- /dev/null
+++ b/games-action/xblast/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">xblast</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/xblast/xblast-2.10.4-r1.ebuild b/games-action/xblast/xblast-2.10.4-r1.ebuild
new file mode 100644
index 000000000000..72666813a3c4
--- /dev/null
+++ b/games-action/xblast/xblast-2.10.4-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+# Change these as releases changes
+IMAGES="images-2005-01-06"
+LEVELS="levels-2005-01-06"
+MODELS="models-2005-01-06"
+MUSICS="musics-2005-01-06"
+SOUNDS="sounds"
+
+DESCRIPTION="Bomberman clone w/network support for up to 6 players"
+HOMEPAGE="http://xblast.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xblast/${P}.tar.gz
+	mirror://sourceforge/xblast/${IMAGES}.tar.gz
+	mirror://sourceforge/xblast/${LEVELS}.tar.gz
+	mirror://sourceforge/xblast/${MODELS}.tar.gz
+	mirror://sourceforge/xblast/${MUSICS}.tar.gz
+	mirror://sourceforge/xblast/${SOUNDS}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/libpng:0
+	x11-libs/libICE
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-libs/libXt"
+
+src_prepare() {
+	default
+
+	eautoreconf #255857
+}
+
+src_configure() {
+	econf \
+		--with-otherdatadir=/usr/share/${PN} \
+		--enable-sound
+}
+
+src_install() {
+	local IMAGE_INSTALL_DIR="/usr/share/${PN}/image"
+
+	default
+
+	# Images
+	dodir "${IMAGE_INSTALL_DIR}"
+	cp -pPR "${WORKDIR}/${IMAGES}"/* "${D}/${IMAGE_INSTALL_DIR}" || die
+
+	# Levels
+	insinto "/usr/share/${PN}/level"
+	doins "${WORKDIR}/${LEVELS}"/*
+
+	# Models
+	insinto "/usr/share/${PN}/image/sprite"
+	doins "${WORKDIR}/${MODELS}"/*
+
+	# Music and sound
+	insinto "/usr/share/${PN}/sounds"
+	doins "${WORKDIR}/${MUSICS}"/* "${WORKDIR}/${SOUNDS}"/*
+
+	# Cleanup
+	find "${D}" -name Imakefile -exec rm \{\} \;
+}
diff --git a/games-action/xbomber-101-r1 b/games-action/xbomber-101-r1
deleted file mode 100644
index 785a1f48d7b1..000000000000
--- a/games-action/xbomber-101-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=x11-libs/libX11
-DESCRIPTION=Bomberman clone w/multiplayer support
-EAPI=6
-HOMEPAGE=http://www.xdr.com/dash/bomber.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sci-biology/emboss x11-libs/libX11
-SLOT=0
-SRC_URI=http://www.xdr.com/dash/xbomber-101.tgz
-_md5_=8f60cb8ba174f56e88e6a8acd69e2067
diff --git a/games-action/xbomber/Manifest b/games-action/xbomber/Manifest
new file mode 100644
index 000000000000..f35b2f043214
--- /dev/null
+++ b/games-action/xbomber/Manifest
@@ -0,0 +1,7 @@
+AUX xbomber-101-clang.patch 2141 BLAKE2B bec55e1d8fcd7d64eb152cf92afd5e8224ce084dd926651e965c03b39d8fe95aedfcbadb1737a92930b8aa713adf6a1a849d3f547b7830887fd1f3fe61ccd1aa SHA512 3954bcf1793e2acf0213861920b0831935e3c3224090c1430bd085603ea1acca59ec542df64f09b4165d06ee2f1264a3add308a2d3f472be0a7200b640d44bef
+AUX xbomber-101-gcc4.patch 368 BLAKE2B d8173579f686648835424e520b6a7383c5b80be2331a9693e32323031583cd0e75757655710f3d7901a4cb09fdcf44dbc3881df98236747fca98e6584e855390 SHA512 06cfd4e13f42d6669fb96db5c207bbb035510155f9e1b0de5ab741585300e6c9afb8e9ecc0c7a326baf34527fa4af87243dada7fb86bcf0587f6cf67648ec688
+AUX xbomber-101-ldflags.patch 454 BLAKE2B a6b2b5b7f8b8987ae5765df7a1891ce6d0d5da178474ec6bb30079542d0b477c8abfa2eaf5d3fd61a9e64c96291dd00210d4288ca5ba4d8c6512f9ee60f3f90a SHA512 8fe9a9b934ab9bc624a8b18a199947b98c6abfd9e3c748a2de54b46f557710121ea0c0179ea565f57c469186afaf11e0bd0d389f42f0df346809f114ef02a109
+AUX xbomber-101-va_list.patch 904 BLAKE2B bad11c1e3ccc9cf4ac423fee8b67ce2ab2a8d4d5606e358f060661e9a7e6880792fe89fa28d75122fe47c8449111cc049ab17f3c8ca14b916f71c190a879b2ae SHA512 87a7a4c5decb5e406521b2b5401a7c9053700f026df6aee936e6d1accf0c82c2468cb6e03483d0e2f8e551685d5f2edaa35d81df23b2e42ca11a2b305748f5b1
+DIST xbomber-101.tgz 396707 BLAKE2B 15120c28a0e2e00203b2a532f88e682ed56c3a85ed463819aab88942843ed13fc83edf0f26fc06666e017c34a02daec2611e4bb11f29f0b8f3663119cf8c9116 SHA512 3f7259ad7f4bf3ec15997c187e354a5cb91cd19743003f480b4900caa2a888d977aa3d6f1e96411666bb0a971fcf17593b76fde9804bb6e1e1b0dab9d4b6abb2
+EBUILD xbomber-101-r1.ebuild 942 BLAKE2B 6392fabce0cb3b50ccae2d713b8fc99f380e66bd5f7be4cc66b52a41726c0964c612b525b1066e9f10f25a8a080727d435585b02f2e6400e3e5686c75d57c0c7 SHA512 f3f5e4f0c16f7f44fbf3bbfee1a08eb8030e30c66ec93f99d23ecb6899f83c34e1ffef4b67ecb24a8d3dbb78c591ed384cc610e163bbcb7f37e490e9831c1ac4
+MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/xbomber/files/xbomber-101-clang.patch b/games-action/xbomber/files/xbomber-101-clang.patch
new file mode 100644
index 000000000000..1771f15abc5e
--- /dev/null
+++ b/games-action/xbomber/files/xbomber-101-clang.patch
@@ -0,0 +1,123 @@
+--- a/bomber.c	2016-07-13 16:35:34.596802964 -0500
++++ b/bomber.c	2016-07-13 16:40:43.110797439 -0500
+@@ -350,7 +350,7 @@
+ 			inform1(i);
+ }
+ 
+-networktraffic()
++void networktraffic()
+ {
+ int i,j,k;
+ int length;
+@@ -1252,7 +1252,7 @@
+ 	}
+ }
+ 
+-addsprite(int x,int y,figure *fig)
++void addsprite(int x,int y,figure *fig)
+ {
+ sprite *sp;
+ 	if(spritesused==MAXSPRITES) return;
+@@ -1262,7 +1262,7 @@
+ 	sp->ypos=y;
+ 	sp->fig=fig;
+ }
+-adddamage(int xpos,int ypos,int xsize,int ysize)
++void adddamage(int xpos,int ypos,int xsize,int ysize)
+ {
+ damage *dm;
+ 	if(damageused==MAXDAMAGES) return;
+@@ -1375,7 +1375,7 @@
+ 	return (y>>FRACTION)+arraystarty;
+ }
+ 
+-int trymove(player *pl,int dx,int dy)
++void trymove(player *pl,int dx,int dy)
+ {
+ int wx,wy;
+ int sx,sy;
+@@ -1520,7 +1520,7 @@
+ 	}
+ }
+ 
+-doplayer(player *pl)
++void doplayer(player *pl)
+ {
+ int last;
+ int color;
+@@ -1640,7 +1640,7 @@
+ 8,14,4,
+ };
+ 
+-initplayers()
++void initplayers()
+ {
+ int i;
+ unsigned char *p;
+@@ -1794,7 +1794,7 @@
+ 	copyup();
+ }
+ 
+-pulseon()
++void pulseon()
+ {
+ 	if(havepulse) return;
+ 	havepulse=1;
+@@ -1803,7 +1803,7 @@
+ 	thandler(0);
+ 	setitimer(ITIMER_REAL,&itval,NULL);
+ }
+-pulseoff()
++void pulseoff()
+ {
+ 	if(!havepulse) return;
+ 	havepulse=0;
+@@ -2235,7 +2235,7 @@
+ failure(char *str,...)
+ {
+ 	gamemode=0;
+-	return;
++	return 1;
+ }
+ drawmode3()
+ {
+@@ -2261,7 +2261,7 @@
+ }
+ 
+ 
+-domode3()
++void domode3()
+ {
+ int size;
+ int i,j;
+@@ -2351,7 +2351,7 @@
+ 
+ 	gamemode=0;
+ }
+-domode4()
++void domode4()
+ {
+ unsigned char querystr[16];
+ long now;
+--- a/bomber.h	2016-07-13 16:35:34.596802964 -0500
++++ b/bomber.h	2016-07-13 16:40:26.797797731 -0500
+@@ -210,6 +210,8 @@
+ extern void scrprintf(char *str, ...);
+ extern int textx,texty,fontxsize,fontysize;
+ extern void texthome(void);
++extern void adddamage(int xpos,int ypos,int xsize,int ysize);
++extern void addsprite(int x,int y,figure *fig);
+ 
+ extern unsigned char field[32][32];
+ extern void *info[32][32];
+--- a/sound.c	2016-07-13 16:35:34.596802964 -0500
++++ b/sound.c	2016-07-13 16:40:57.702797177 -0500
+@@ -44,7 +44,7 @@
+ 
+ 
+ 
+-soundinit(char *name)
++void soundinit(char *name)
+ {
+ int fd[2];
+ char devname[256];
diff --git a/games-action/xbomber/files/xbomber-101-gcc4.patch b/games-action/xbomber/files/xbomber-101-gcc4.patch
new file mode 100644
index 000000000000..0ee82d81801b
--- /dev/null
+++ b/games-action/xbomber/files/xbomber-101-gcc4.patch
@@ -0,0 +1,11 @@
+--- a/bomber.c	2006-01-28 12:06:34.000000000 -0700
++++ b/bomber.c	2006-01-28 12:06:46.000000000 -0700
+@@ -1699,7 +1699,7 @@
+ }
+ void addtail(void *header,void *entry)
+ {
+-	while(((list *)header)->next) ((list *)header)=((list *)header)->next;
++	while(((list *)header)->next) header=((list *)header)->next;
+ 	((list *)header)->next=entry;
+ 	((list *)entry)->next=0;
+ }
diff --git a/games-action/xbomber/files/xbomber-101-ldflags.patch b/games-action/xbomber/files/xbomber-101-ldflags.patch
new file mode 100644
index 000000000000..a0bf2f89d735
--- /dev/null
+++ b/games-action/xbomber/files/xbomber-101-ldflags.patch
@@ -0,0 +1,15 @@
+--- a/Makefile	2010-10-19 09:17:43.000000000 +0200
++++ b/Makefile	2010-10-19 09:18:12.000000000 +0200
+@@ -1,10 +1,8 @@
+-CFLAGS	= -O3
+-
+ bomber:	bomber.o x.o sound.o matcher
+-	$(CC) -o bomber bomber.o x.o sound.o -lX11 -L/usr/X11R6/lib/
++	$(CC) $(CFLAGS) $(LDFLAGS) -o bomber bomber.o x.o sound.o -lX11 -L/usr/X11R6/lib/
+ 
+ matcher: matcher.c
+-	$(CC) matcher.c -o matcher
++	$(CC) $(CFLAGS) $(LDFLAGS) matcher.c -o matcher
+ 
+ bomber.o: bomber.c bomber.h
+ 
diff --git a/games-action/xbomber/files/xbomber-101-va_list.patch b/games-action/xbomber/files/xbomber-101-va_list.patch
new file mode 100644
index 000000000000..5a1691a65ad8
--- /dev/null
+++ b/games-action/xbomber/files/xbomber-101-va_list.patch
@@ -0,0 +1,48 @@
+--- a/bomber.c	2005-11-06 16:50:04.000000000 +0100
++++ b/bomber.c	2005-11-06 16:47:35.000000000 +0100
+@@ -1,5 +1,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdarg.h>
+ #include <unistd.h>
+ #include <string.h>
+ #include <sys/uio.h>
+@@ -626,8 +627,11 @@
+ void scrprintf(char *str,...)
+ {
+ char output[256],*p,*p2;
++va_list ap;
+ 
+-	vsprintf(output,str,&str+1);
++	va_start(ap, str);
++	vsprintf(output,str,ap);
++	va_end(ap);
+ 	p=output;
+ 	for(;;)
+ 	{
+@@ -653,8 +657,11 @@
+ void bigscrprintf(char *str,...)
+ {
+ char output[256],*p,*p2;
++va_list ap;
+ 
+-	vsprintf(output,str,&str+1);
++	va_start(ap, str);
++	vsprintf(output,str,ap);
++	va_end(ap);
+ 	p=output;
+ 	for(;;)
+ 	{
+@@ -1873,8 +1880,11 @@
+ additem(char *item,...)
+ {
+ char output[256];
++va_list ap;
+ 
+-	vsprintf(output,item,&item+1);
++	va_start(ap, item);
++	vsprintf(output,item,ap);
++	va_end(ap);
+ 	if(menunum<0)
+ 		menutitle=menuput;
+ 	else
diff --git a/games-action/xbomber/metadata.xml b/games-action/xbomber/metadata.xml
new file mode 100644
index 000000000000..78274e0fa550
--- /dev/null
+++ b/games-action/xbomber/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-action/xbomber/xbomber-101-r1.ebuild b/games-action/xbomber/xbomber-101-r1.ebuild
new file mode 100644
index 000000000000..2757b322f5db
--- /dev/null
+++ b/games-action/xbomber/xbomber-101-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Bomberman clone w/multiplayer support"
+HOMEPAGE="http://www.xdr.com/dash/bomber.html"
+SRC_URI="http://www.xdr.com/dash/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="x11-libs/libX11"
+RDEPEND="!sci-biology/emboss
+	${DEPEND}"
+
+PATCHES=(
+		"${FILESDIR}"/${P}-va_list.patch
+		"${FILESDIR}"/${P}-gcc4.patch
+		"${FILESDIR}"/${P}-ldflags.patch
+		"${FILESDIR}"/${P}-clang.patch
+)
+
+src_prepare() {
+	sed -i \
+		-e "/^CC/d" \
+		-e 's/gcc/$(CC)/g' \
+		-e "s:X386:X11R6:" \
+		Makefile || die
+
+	# ${P}-ldflags.patch depends on the munged Makefile
+	default
+
+	sed -i \
+		-e "s:data/%s:/usr/share/${PN}/%s:" bomber.c || die
+	sed -i \
+		-e "s:=\"data\":=\"/usr/share/${PN}\":" sound.c || die
+}
+
+src_install() {
+	dobin matcher bomber
+	insinto /usr/share/${PN}
+	doins -r data/*
+	dodoc README Changelog
+}
diff --git a/games-action/xpilot-4.5.5-r1 b/games-action/xpilot-4.5.5-r1
deleted file mode 100644
index 98d47aa37ed7..000000000000
--- a/games-action/xpilot-4.5.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext app-text/rman x11-base/xorg-proto x11-misc/gccmakedep x11-misc/imake
-DESCRIPTION=A multi-player 2D client/server space game
-EAPI=6
-HOMEPAGE=http://www.xpilot.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext
-SLOT=0
-SRC_URI=mirror://sourceforge/xpilotgame/xpilot-4.5.5.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_=0a710f12c8efb52164266834de1ba49d
diff --git a/games-action/xpilot/Manifest b/games-action/xpilot/Manifest
new file mode 100644
index 000000000000..78900ee9abb3
--- /dev/null
+++ b/games-action/xpilot/Manifest
@@ -0,0 +1,3 @@
+DIST xpilot-4.5.5.tar.bz2 1115502 BLAKE2B 9f7758dabc834f9ffad602e2ba215e1e08ff3f33b21480eae0176775d6c55df3e3238652e0cbbbc688acbab9e23395f46d853ee52fd55d177fdace5138621335 SHA512 002fbdbee3035e21f441d749d68ac41da2816a691e1c0d1cf9de9cddaa479c92da57eb36081884b9908a6ae83454f6f532c24c89280d27e2cbf9570442ef301c
+EBUILD xpilot-4.5.5-r1.ebuild 1174 BLAKE2B 4d3a4f23c68eb9d92dcee083a3df857240a97a8b87d04da9f68541e12148cb6faf52f3a12658d94df4ed592ec9f88fa7afcc968d7e216871819b16a0eb6dd857 SHA512 b4ab6b1b30754d099b6ba9fbf3e37cc1146ba46095eb0c9a60da45f2516aa3d89cdcb9666be6fa5ada2b8910715d9d7f8470f4bec13b42fc8fad71dc02bcf01c
+MISC metadata.xml 333 BLAKE2B 2c8f9dc52fcf4780ad3da4ee828dad3ef62731f0d2f399da8ade242756b6929a58a6b60347ed753f19dbbf6cf2146dadeb88fa20be6d035ae3fc41ca581bacdb SHA512 b6a52a4afe7804b04646d42366ef3812a70fba44d44e9da662a70c7c646aba015792fd8bef65da9c5abdc4b5188cf0657ba80ab1d1920b6b692606274c3afca4
diff --git a/games-action/xpilot/metadata.xml b/games-action/xpilot/metadata.xml
new file mode 100644
index 000000000000..8276088f013b
--- /dev/null
+++ b/games-action/xpilot/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">xpilotgame</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/games-action/xpilot/xpilot-4.5.5-r1.ebuild b/games-action/xpilot/xpilot-4.5.5-r1.ebuild
new file mode 100644
index 000000000000..ecc92dce8706
--- /dev/null
+++ b/games-action/xpilot/xpilot-4.5.5-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A multi-player 2D client/server space game"
+HOMEPAGE="http://www.xpilot.org/"
+SRC_URI="mirror://sourceforge/xpilotgame/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	app-text/rman
+	x11-base/xorg-proto
+	x11-misc/gccmakedep
+	x11-misc/imake"
+
+src_prepare() {
+	#default
+	eapply_user
+
+	sed -i \
+		-e '/^INSTMAN/s:=.*:=/usr/share/man/man6:' \
+		-e "/^INSTLIB/s:=.*:=/usr/share/${PN}:" \
+		-e "/^INSTBIN/s:=.*:=/usr/bin:" \
+		Local.config || die
+
+	# work with glibc-2.20
+	sed -i \
+		-e 's/getline/lgetline/' \
+		src/client/textinterface.c || die
+}
+
+src_compile() {
+	xmkmf || die
+	emake Makefiles
+	emake includes
+	emake depend
+	emake CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install.man
+	newicon lib/textures/logo.ppm ${PN}.ppm
+	make_desktop_entry ${PN} XPilot /usr/share/pixmaps/${PN}.ppm
+	dodoc README.txt doc/{ChangeLog,CREDITS,FAQ,README*,TODO}
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 21:03:06 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 21:03:06 +0100
commit	8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree	7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /games-action
parent	30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)